From 27ad4f7d5d42a0ef550c4ddd939dc96fb48991eb Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 2 Mar 2018 14:10:44 +0100 Subject: [PATCH] Move ProtoBuf classes to package org.jetbrains.kotlin.metadata --- build-common/src/java_descriptors.proto | 2 +- .../kotlin/incremental/ChangesCollector.kt | 2 +- .../incremental/IncrementalCacheCommon.kt | 2 +- .../kotlin/incremental/IncrementalJsCache.kt | 4 +- .../JavaClassesSerializerExtension.kt | 4 +- .../incremental/JavaClassesTrackerImpl.kt | 6 +- .../incremental/ProtoCompareGenerated.kt | 10 +- .../incremental/protoDifferenceUtils.kt | 2 +- .../java/JavaClassProtoBuf.java | 50 +- .../testingUtils/classFilesComparison.kt | 5 +- .../DebugExtOptionsProtoBuf.java | 28 +- .../DebugProtoBuf.java | 8330 ++++++++--------- .../builtins/DebugBuiltInsProtoBuf.java | 200 + .../java/DebugJavaClassProtoBuf.java | 71 +- .../js/DebugJsProtoBuf.java | 1388 ++- .../jvm/DebugJvmModuleProtoBuf.java | 735 +- .../jvm/DebugJvmProtoBuf.java | 1156 ++- .../builtins/DebugBuiltInsProtoBuf.java | 203 - .../jvm/DebugModuleProtoBuf.java | 3424 ------- .../kotlin/codegen/ClassFileFactory.java | 4 +- .../kotlin/codegen/ClosureCodegen.java | 2 +- .../kotlin/codegen/MemberCodegen.java | 2 +- .../kotlin/codegen/PackagePartCodegen.java | 2 +- .../kotlin/codegen/classFileUtils.kt | 2 +- .../inline/AnonymousObjectTransformer.kt | 2 +- .../serialization/JvmSerializerExtension.java | 8 +- .../codegen/serialization/JvmStringTable.kt | 4 +- .../builtins/BuiltInsSerializerExtension.kt | 2 +- .../kotlin/cli/metadata/MetadataSerializer.kt | 4 +- .../org/jetbrains/kotlin/inline/inlineUtil.kt | 6 +- .../kotlin/load/kotlin/moduleName.kt | 2 +- .../contracts/ContractDeserializerImpl.kt | 2 +- .../kotlin/resolve/deprecationUtil.kt | 2 +- .../serialization/AnnotationSerializer.kt | 5 +- .../serialization/ContractSerializer.kt | 1 + .../serialization/DescriptorSerializer.kt | 1 + .../kotlin/serialization/MutableTable.kt | 1 + .../serialization/SerializerExtension.kt | 1 + .../serialization/SerializerExtensionBase.kt | 1 + .../kotlin/serialization/StringTableImpl.kt | 3 +- .../kotlin/checkers/LazyOperationsLog.kt | 2 +- .../serialization/VersionRequirementTest.kt | 1 + .../serialization/jvm/JvmNameResolverTest.kt | 5 +- ...tBinaryClassAnnotationAndConstantLoader.kt | 6 +- ...aryClassAnnotationAndConstantLoaderImpl.kt | 2 +- .../kotlin/JavaFlexibleTypeDeserializer.kt | 4 +- .../kotlin/load/kotlin/JvmNameResolver.kt | 6 +- .../load/kotlin/JvmPackagePartSource.kt | 2 +- .../kotlin/load/kotlin/MemberSignature.kt | 2 +- .../kotlin/load/kotlin/ModuleMapping.kt | 2 +- .../serialization/jvm/JvmProtoBufUtil.kt | 3 +- .../builtins/BuiltInSerializerProtocol.kt | 2 +- .../builtins/BuiltInsPackageFragmentImpl.kt | 2 +- .../jetbrains/kotlin/serialization/Flags.java | 1 + .../kotlin/serialization/ProtoDatas.kt | 1 + .../SerializerExtensionProtocol.kt | 1 + .../AnnotationAndConstantLoader.kt | 2 +- .../AnnotationAndConstantLoaderImpl.kt | 2 +- .../deserialization/AnnotationDeserializer.kt | 8 +- .../deserialization/ContractDeserializer.kt | 2 +- .../DeserializedPackageFragmentImpl.kt | 2 +- .../FlexibleTypeDeserializer.kt | 2 +- .../deserialization/MemberDeserializer.kt | 2 +- .../MetadataPackageFragmentProvider.kt | 2 +- .../deserialization/NameResolverImpl.kt | 4 +- .../ProtoBasedClassDataFinder.kt | 2 +- .../deserialization/ProtoContainer.kt | 2 +- .../deserialization/ProtoEnumFlags.kt | 4 +- .../deserialization/TypeDeserializer.kt | 2 +- .../deserialization/TypeTable.kt | 2 +- .../serialization/deserialization/context.kt | 2 +- .../DeserializedClassDescriptor.kt | 2 +- .../DeserializedMemberDescriptor.kt | 38 +- .../descriptors/DeserializedMemberScope.kt | 2 +- .../DeserializedPackageMemberScope.kt | 2 +- .../DeserializedTypeParameterDescriptor.kt | 2 +- .../descriptors/VersionRequirement.kt | 2 +- .../deserialization/protoTypeTableUtil.kt | 2 +- core/metadata.jvm/src/jvm_metadata.proto | 2 +- core/metadata.jvm/src/jvm_module.proto | 2 +- .../jvm/JvmModuleProtoBuf.java | 466 +- .../jvm/JvmProtoBuf.java | 776 +- core/metadata/src/builtins.proto | 2 +- core/metadata/src/ext_options.proto | 2 +- core/metadata/src/metadata.proto | 2 +- .../{serialization => metadata}/ProtoBuf.java | 5450 +++++------ .../metadata/builtins/BuiltInsProtoBuf.java | 186 + .../builtins/BuiltInsProtoBuf.java | 186 - .../kotlin/reflect/jvm/internal/KClassImpl.kt | 2 +- .../reflect/jvm/internal/KPackageImpl.kt | 2 +- .../reflect/jvm/internal/RuntimeTypeMapper.kt | 4 +- .../src/kotlin/reflect/jvm/internal/util.kt | 4 +- .../protobuf/GenerateProtoBufCompare.kt | 22 +- .../LightMemberOriginForCompiledElement.kt | 2 +- .../builtIns/KotlinBuiltInDecompiler.kt | 2 +- .../classFile/KotlinClsStubBuilder.kt | 2 +- .../AnnotationLoaderForStubBuilderImpl.kt | 2 +- .../common/KotlinMetadataDecompiler.kt | 2 +- ...KotlinMetadataDeserializerForDecompiler.kt | 2 +- .../js/KotlinJavaScriptMetaFileDecompiler.kt | 4 +- .../stubBuilder/CallableClsStubBuilder.kt | 6 +- .../stubBuilder/ClassClsStubBuilder.kt | 2 +- .../stubBuilder/ClsStubBuilderContext.kt | 2 +- .../stubBuilder/TypeClsStubBuilder.kt | 8 +- .../decompiler/stubBuilder/clsStubBuilding.kt | 2 +- .../decompiler/stubBuilder/flags/flags.kt | 2 +- .../stubBuilder/typeAliasClsStubBuilding.kt | 2 +- .../kotlin/idea/vfilefinder/fileIndexes.kt | 2 +- .../AbstractJsProtoComparisonTest.kt | 4 +- js/js.serializer/src/js.proto | 2 +- .../js/JsProtoBuf.java | 948 +- .../js/DynamicTypeDeserializer.kt | 2 +- .../js/KotlinJavascriptPackageFragment.kt | 3 +- .../js/KotlinJavascriptSerializationUtil.kt | 3 +- .../js/KotlinJavascriptSerializerExtension.kt | 3 +- ...kotlinJavascriptPackageFragmentProvider.kt | 3 +- .../jetbrains/kotlin/js/test/BasicBoxTest.kt | 2 +- .../kotlin/js/facade/K2JSTranslator.java | 2 +- 118 files changed, 10254 insertions(+), 13679 deletions(-) rename build-common/src/org/jetbrains/kotlin/{serialization => metadata}/java/JavaClassProtoBuf.java (62%) rename build-common/test/org/jetbrains/kotlin/{serialization => metadata}/DebugExtOptionsProtoBuf.java (79%) rename build-common/test/org/jetbrains/kotlin/{serialization => metadata}/DebugProtoBuf.java (68%) create mode 100644 build-common/test/org/jetbrains/kotlin/metadata/builtins/DebugBuiltInsProtoBuf.java rename build-common/test/org/jetbrains/kotlin/{serialization => metadata}/java/DebugJavaClassProtoBuf.java (60%) rename build-common/test/org/jetbrains/kotlin/{serialization => metadata}/js/DebugJsProtoBuf.java (66%) rename build-common/test/org/jetbrains/kotlin/{serialization => metadata}/jvm/DebugJvmModuleProtoBuf.java (78%) rename build-common/test/org/jetbrains/kotlin/{serialization => metadata}/jvm/DebugJvmProtoBuf.java (68%) delete mode 100644 build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java delete mode 100644 build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugModuleProtoBuf.java rename core/metadata.jvm/src/org/jetbrains/kotlin/{serialization => metadata}/jvm/JvmModuleProtoBuf.java (84%) rename core/metadata.jvm/src/org/jetbrains/kotlin/{serialization => metadata}/jvm/JvmProtoBuf.java (75%) rename core/metadata/src/org/jetbrains/kotlin/{serialization => metadata}/ProtoBuf.java (73%) create mode 100644 core/metadata/src/org/jetbrains/kotlin/metadata/builtins/BuiltInsProtoBuf.java delete mode 100644 core/metadata/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java rename js/js.serializer/src/org/jetbrains/kotlin/{serialization => metadata}/js/JsProtoBuf.java (70%) diff --git a/build-common/src/java_descriptors.proto b/build-common/src/java_descriptors.proto index df0c902fdd8..8dbf70c574c 100644 --- a/build-common/src/java_descriptors.proto +++ b/build-common/src/java_descriptors.proto @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.serialization.java; +package org.jetbrains.kotlin.metadata.java; import "core/metadata/src/metadata.proto"; diff --git a/build-common/src/org/jetbrains/kotlin/incremental/ChangesCollector.kt b/build-common/src/org/jetbrains/kotlin/incremental/ChangesCollector.kt index 1d8054ed070..7e03d508cef 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/ChangesCollector.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/ChangesCollector.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.incremental +import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.protobuf.MessageLite import org.jetbrains.kotlin.serialization.Flags -import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.NameResolver class ChangesCollector { diff --git a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheCommon.kt b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheCommon.kt index 3e6f7ed3b3f..d332d3c55db 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheCommon.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalCacheCommon.kt @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.incremental import com.intellij.util.io.EnumeratorStringDescriptor import org.jetbrains.kotlin.incremental.storage.* +import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.kotlin.serialization.deserialization.TypeTable import org.jetbrains.kotlin.serialization.deserialization.supertypes diff --git a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt index 47b3a8d618b..e79d6c17bba 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt @@ -23,13 +23,13 @@ import org.jetbrains.kotlin.incremental.storage.BasicStringMap import org.jetbrains.kotlin.incremental.storage.DirtyClassesFqNameMap import org.jetbrains.kotlin.incremental.storage.SourceToFqNameMap import org.jetbrains.kotlin.incremental.storage.StringToLongMapExternalizer +import org.jetbrains.kotlin.metadata.ProtoBuf +import org.jetbrains.kotlin.metadata.js.JsProtoBuf import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl import org.jetbrains.kotlin.serialization.deserialization.getExtensionOrNull -import org.jetbrains.kotlin.serialization.js.JsProtoBuf import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol import java.io.DataInput import java.io.DataOutput diff --git a/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesSerializerExtension.kt b/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesSerializerExtension.kt index 9c1ef527a13..f245e103fe3 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesSerializerExtension.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesSerializerExtension.kt @@ -19,12 +19,12 @@ package org.jetbrains.kotlin.incremental import org.jetbrains.kotlin.builtins.BuiltInSerializerProtocol import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.metadata.ProtoBuf +import org.jetbrains.kotlin.metadata.java.JavaClassProtoBuf import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.serialization.DescriptorSerializer import org.jetbrains.kotlin.serialization.KotlinSerializerExtensionBase -import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.kotlin.serialization.java.JavaClassProtoBuf // It uses BuiltInSerializerProtocol for annotations serialization class JavaClassesSerializerExtension : KotlinSerializerExtensionBase(BuiltInSerializerProtocol) { diff --git a/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesTrackerImpl.kt b/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesTrackerImpl.kt index 99b1713664a..eb82475fd0e 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesTrackerImpl.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/JavaClassesTrackerImpl.kt @@ -23,15 +23,15 @@ import org.jetbrains.kotlin.descriptors.findClassAcrossModuleDependencies import org.jetbrains.kotlin.load.java.JavaClassesTracker import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaClassDescriptor +import org.jetbrains.kotlin.metadata.ProtoBuf +import org.jetbrains.kotlin.metadata.builtins.BuiltInsProtoBuf +import org.jetbrains.kotlin.metadata.java.JavaClassProtoBuf import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite import org.jetbrains.kotlin.resolve.descriptorUtil.classId import org.jetbrains.kotlin.resolve.source.PsiSourceElement import org.jetbrains.kotlin.serialization.DescriptorSerializer -import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl -import org.jetbrains.kotlin.serialization.java.JavaClassProtoBuf import org.jetbrains.kotlin.util.PerformanceCounter import org.jetbrains.kotlin.utils.addToStdlib.safeAs import org.jetbrains.kotlin.utils.sure diff --git a/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt b/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt index 713a5e2bf80..2101c8724f7 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/ProtoCompareGenerated.kt @@ -16,13 +16,13 @@ package org.jetbrains.kotlin.incremental +import org.jetbrains.kotlin.metadata.ProtoBuf +import org.jetbrains.kotlin.metadata.builtins.BuiltInsProtoBuf +import org.jetbrains.kotlin.metadata.java.JavaClassProtoBuf +import org.jetbrains.kotlin.metadata.js.JsProtoBuf +import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.NameResolver -import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf -import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf -import org.jetbrains.kotlin.serialization.js.JsProtoBuf -import org.jetbrains.kotlin.serialization.java.JavaClassProtoBuf import org.jetbrains.kotlin.utils.Interner import java.util.* diff --git a/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt b/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt index 608e4d0bdb8..cae4e885261 100644 --- a/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt @@ -20,10 +20,10 @@ import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.incremental.ProtoCompareGenerated.ProtoBufClassKind import org.jetbrains.kotlin.incremental.ProtoCompareGenerated.ProtoBufPackageKind import org.jetbrains.kotlin.incremental.storage.ProtoMapValue +import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.protobuf.MessageLite import org.jetbrains.kotlin.serialization.Flags -import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.kotlin.serialization.deserialization.ProtoEnumFlags import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil diff --git a/build-common/src/org/jetbrains/kotlin/serialization/java/JavaClassProtoBuf.java b/build-common/src/org/jetbrains/kotlin/metadata/java/JavaClassProtoBuf.java similarity index 62% rename from build-common/src/org/jetbrains/kotlin/serialization/java/JavaClassProtoBuf.java rename to build-common/src/org/jetbrains/kotlin/metadata/java/JavaClassProtoBuf.java index a8b2aef2664..f618709e8fe 100644 --- a/build-common/src/org/jetbrains/kotlin/serialization/java/JavaClassProtoBuf.java +++ b/build-common/src/org/jetbrains/kotlin/metadata/java/JavaClassProtoBuf.java @@ -1,29 +1,29 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: build-common/src/java_descriptors.proto -package org.jetbrains.kotlin.serialization.java; +package org.jetbrains.kotlin.metadata.java; public final class JavaClassProtoBuf { private JavaClassProtoBuf() {} public static void registerAllExtensions( org.jetbrains.kotlin.protobuf.ExtensionRegistryLite registry) { - registry.add(org.jetbrains.kotlin.serialization.java.JavaClassProtoBuf.isStaticMethod); - registry.add(org.jetbrains.kotlin.serialization.java.JavaClassProtoBuf.isPackagePrivateMethod); - registry.add(org.jetbrains.kotlin.serialization.java.JavaClassProtoBuf.isStaticField); - registry.add(org.jetbrains.kotlin.serialization.java.JavaClassProtoBuf.isPackagePrivateField); - registry.add(org.jetbrains.kotlin.serialization.java.JavaClassProtoBuf.isPackagePrivateClass); - registry.add(org.jetbrains.kotlin.serialization.java.JavaClassProtoBuf.isPackagePrivateConstructor); + registry.add(org.jetbrains.kotlin.metadata.java.JavaClassProtoBuf.isStaticMethod); + registry.add(org.jetbrains.kotlin.metadata.java.JavaClassProtoBuf.isPackagePrivateMethod); + registry.add(org.jetbrains.kotlin.metadata.java.JavaClassProtoBuf.isStaticField); + registry.add(org.jetbrains.kotlin.metadata.java.JavaClassProtoBuf.isPackagePrivateField); + registry.add(org.jetbrains.kotlin.metadata.java.JavaClassProtoBuf.isPackagePrivateClass); + registry.add(org.jetbrains.kotlin.metadata.java.JavaClassProtoBuf.isPackagePrivateConstructor); } public static final int IS_STATIC_METHOD_FIELD_NUMBER = 1000; /** - * extend .org.jetbrains.kotlin.serialization.Function { ... } + * extend .org.jetbrains.kotlin.metadata.Function { ... } */ public static final org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension< - org.jetbrains.kotlin.serialization.ProtoBuf.Function, + org.jetbrains.kotlin.metadata.ProtoBuf.Function, java.lang.Boolean> isStaticMethod = org.jetbrains.kotlin.protobuf.GeneratedMessageLite .newSingularGeneratedExtension( - org.jetbrains.kotlin.serialization.ProtoBuf.Function.getDefaultInstance(), + org.jetbrains.kotlin.metadata.ProtoBuf.Function.getDefaultInstance(), false, null, null, @@ -32,14 +32,14 @@ public final class JavaClassProtoBuf { java.lang.Boolean.class); public static final int IS_PACKAGE_PRIVATE_METHOD_FIELD_NUMBER = 1001; /** - * extend .org.jetbrains.kotlin.serialization.Function { ... } + * extend .org.jetbrains.kotlin.metadata.Function { ... } */ public static final org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension< - org.jetbrains.kotlin.serialization.ProtoBuf.Function, + org.jetbrains.kotlin.metadata.ProtoBuf.Function, java.lang.Boolean> isPackagePrivateMethod = org.jetbrains.kotlin.protobuf.GeneratedMessageLite .newSingularGeneratedExtension( - org.jetbrains.kotlin.serialization.ProtoBuf.Function.getDefaultInstance(), + org.jetbrains.kotlin.metadata.ProtoBuf.Function.getDefaultInstance(), false, null, null, @@ -48,14 +48,14 @@ public final class JavaClassProtoBuf { java.lang.Boolean.class); public static final int IS_STATIC_FIELD_FIELD_NUMBER = 1000; /** - * extend .org.jetbrains.kotlin.serialization.Property { ... } + * extend .org.jetbrains.kotlin.metadata.Property { ... } */ public static final org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension< - org.jetbrains.kotlin.serialization.ProtoBuf.Property, + org.jetbrains.kotlin.metadata.ProtoBuf.Property, java.lang.Boolean> isStaticField = org.jetbrains.kotlin.protobuf.GeneratedMessageLite .newSingularGeneratedExtension( - org.jetbrains.kotlin.serialization.ProtoBuf.Property.getDefaultInstance(), + org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(), false, null, null, @@ -64,14 +64,14 @@ public final class JavaClassProtoBuf { java.lang.Boolean.class); public static final int IS_PACKAGE_PRIVATE_FIELD_FIELD_NUMBER = 1001; /** - * extend .org.jetbrains.kotlin.serialization.Property { ... } + * extend .org.jetbrains.kotlin.metadata.Property { ... } */ public static final org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension< - org.jetbrains.kotlin.serialization.ProtoBuf.Property, + org.jetbrains.kotlin.metadata.ProtoBuf.Property, java.lang.Boolean> isPackagePrivateField = org.jetbrains.kotlin.protobuf.GeneratedMessageLite .newSingularGeneratedExtension( - org.jetbrains.kotlin.serialization.ProtoBuf.Property.getDefaultInstance(), + org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(), false, null, null, @@ -80,14 +80,14 @@ public final class JavaClassProtoBuf { java.lang.Boolean.class); public static final int IS_PACKAGE_PRIVATE_CLASS_FIELD_NUMBER = 1000; /** - * extend .org.jetbrains.kotlin.serialization.Class { ... } + * extend .org.jetbrains.kotlin.metadata.Class { ... } */ public static final org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension< - org.jetbrains.kotlin.serialization.ProtoBuf.Class, + org.jetbrains.kotlin.metadata.ProtoBuf.Class, java.lang.Boolean> isPackagePrivateClass = org.jetbrains.kotlin.protobuf.GeneratedMessageLite .newSingularGeneratedExtension( - org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance(), + org.jetbrains.kotlin.metadata.ProtoBuf.Class.getDefaultInstance(), false, null, null, @@ -96,14 +96,14 @@ public final class JavaClassProtoBuf { java.lang.Boolean.class); public static final int IS_PACKAGE_PRIVATE_CONSTRUCTOR_FIELD_NUMBER = 1000; /** - * extend .org.jetbrains.kotlin.serialization.Constructor { ... } + * extend .org.jetbrains.kotlin.metadata.Constructor { ... } */ public static final org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension< - org.jetbrains.kotlin.serialization.ProtoBuf.Constructor, + org.jetbrains.kotlin.metadata.ProtoBuf.Constructor, java.lang.Boolean> isPackagePrivateConstructor = org.jetbrains.kotlin.protobuf.GeneratedMessageLite .newSingularGeneratedExtension( - org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.getDefaultInstance(), + org.jetbrains.kotlin.metadata.ProtoBuf.Constructor.getDefaultInstance(), false, null, null, diff --git a/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/classFilesComparison.kt b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/classFilesComparison.kt index 7b6634b106d..4203e8f0eb5 100644 --- a/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/classFilesComparison.kt +++ b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/classFilesComparison.kt @@ -19,10 +19,10 @@ package org.jetbrains.kotlin.incremental.testingUtils import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.incremental.LocalFileKotlinClass import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader +import org.jetbrains.kotlin.metadata.DebugProtoBuf +import org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf import org.jetbrains.kotlin.protobuf.ExtensionRegistry -import org.jetbrains.kotlin.serialization.DebugProtoBuf import org.jetbrains.kotlin.serialization.jvm.BitEncoding -import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf import org.jetbrains.kotlin.utils.Printer import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.org.objectweb.asm.util.TraceClassVisitor @@ -34,7 +34,6 @@ import java.io.PrintWriter import java.io.StringWriter import java.util.* import java.util.zip.CRC32 -import kotlin.comparisons.compareBy // Set this to true if you want to dump all bytecode (test will fail in this case) private val DUMP_ALL = System.getProperty("comparison.dump.all") == "true" diff --git a/build-common/test/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java b/build-common/test/org/jetbrains/kotlin/metadata/DebugExtOptionsProtoBuf.java similarity index 79% rename from build-common/test/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java rename to build-common/test/org/jetbrains/kotlin/metadata/DebugExtOptionsProtoBuf.java index 221b709695c..41630e35a41 100644 --- a/build-common/test/org/jetbrains/kotlin/serialization/DebugExtOptionsProtoBuf.java +++ b/build-common/test/org/jetbrains/kotlin/metadata/DebugExtOptionsProtoBuf.java @@ -1,16 +1,16 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: core/metadata/src/ext_options.debug.proto -package org.jetbrains.kotlin.serialization; +package org.jetbrains.kotlin.metadata; public final class DebugExtOptionsProtoBuf { private DebugExtOptionsProtoBuf() {} public static void registerAllExtensions( org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) { - registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.skipInComparison); - registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable); - registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable); - registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable); + registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.skipInComparison); + registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable); + registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.fqNameIdInTable); + registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.stringIdInTable); } public static final int SKIP_IN_COMPARISON_FIELD_NUMBER = 50000; /** @@ -66,15 +66,15 @@ public final class DebugExtOptionsProtoBuf { static { java.lang.String[] descriptorData = { "\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" + "oto\022\035org.jetbrains.kotlin.metadata\032 goog" + + "le/protobuf/descriptor.proto:;\n\022skip_in_" + + "comparison\022\035.google.protobuf.FieldOption" + + "s\030\320\206\003 \001(\010:9\n\020name_id_in_table\022\035.google.p" + + "rotobuf.FieldOptions\030\321\206\003 \001(\010:<\n\023fq_name_" + + "id_in_table\022\035.google.protobuf.FieldOptio" + + "ns\030\322\206\003 \001(\010:;\n\022string_id_in_table\022\035.googl" + + "e.protobuf.FieldOptions\030\323\206\003 \001(\010B\031B\027Debug" + + "ExtOptionsProtoBuf" }; 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/metadata/DebugProtoBuf.java similarity index 68% rename from build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java rename to build-common/test/org/jetbrains/kotlin/metadata/DebugProtoBuf.java index d256c0d05ce..da2a1685e98 100644 --- a/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java +++ b/build-common/test/org/jetbrains/kotlin/metadata/DebugProtoBuf.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: core/metadata/src/metadata.debug.proto -package org.jetbrains.kotlin.serialization; +package org.jetbrains.kotlin.metadata; public final class DebugProtoBuf { private DebugProtoBuf() {} @@ -9,7 +9,7 @@ public final class DebugProtoBuf { org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) { } /** - * Protobuf enum {@code org.jetbrains.kotlin.serialization.Modality} + * Protobuf enum {@code org.jetbrains.kotlin.metadata.Modality} */ public enum Modality implements org.jetbrains.kotlin.protobuf.ProtocolMessageEnum { @@ -91,7 +91,7 @@ public final class DebugProtoBuf { } public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor().getEnumTypes().get(0); + return org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor().getEnumTypes().get(0); } private static final Modality[] VALUES = values(); @@ -113,11 +113,11 @@ public final class DebugProtoBuf { this.value = value; } - // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Modality) + // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Modality) } /** - * Protobuf enum {@code org.jetbrains.kotlin.serialization.Visibility} + * Protobuf enum {@code org.jetbrains.kotlin.metadata.Visibility} */ public enum Visibility implements org.jetbrains.kotlin.protobuf.ProtocolMessageEnum { @@ -217,7 +217,7 @@ public final class DebugProtoBuf { } public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor().getEnumTypes().get(1); + return org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor().getEnumTypes().get(1); } private static final Visibility[] VALUES = values(); @@ -239,11 +239,11 @@ public final class DebugProtoBuf { this.value = value; } - // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Visibility) + // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Visibility) } /** - * Protobuf enum {@code org.jetbrains.kotlin.serialization.MemberKind} + * Protobuf enum {@code org.jetbrains.kotlin.metadata.MemberKind} */ public enum MemberKind implements org.jetbrains.kotlin.protobuf.ProtocolMessageEnum { @@ -325,7 +325,7 @@ public final class DebugProtoBuf { } public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor().getEnumTypes().get(2); + return org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor().getEnumTypes().get(2); } private static final MemberKind[] VALUES = values(); @@ -347,11 +347,11 @@ public final class DebugProtoBuf { this.value = value; } - // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.MemberKind) + // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.MemberKind) } public interface StringTableOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.StringTable) + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.StringTable) org.jetbrains.kotlin.protobuf.MessageOrBuilder { /** @@ -374,11 +374,11 @@ public final class DebugProtoBuf { getStringBytes(int index); } /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.StringTable} + * Protobuf type {@code org.jetbrains.kotlin.metadata.StringTable} */ public static final class StringTable extends org.jetbrains.kotlin.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.StringTable) + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.StringTable) StringTableOrBuilder { // Use StringTable.newBuilder() to construct. private StringTable(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) { @@ -451,14 +451,14 @@ public final class DebugProtoBuf { } public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor; + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_StringTable_descriptor; } protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_StringTable_fieldAccessorTable + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_StringTable_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder.class); + org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder.class); } public static org.jetbrains.kotlin.protobuf.Parser PARSER = @@ -554,53 +554,53 @@ public final class DebugProtoBuf { return super.writeReplace(); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable parseFrom( org.jetbrains.kotlin.protobuf.ByteString data) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable parseFrom( org.jetbrains.kotlin.protobuf.ByteString data, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseFrom(byte[] data) + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable parseFrom(byte[] data) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable parseFrom( byte[] data, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable parseFrom( java.io.InputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseDelimitedFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable parseDelimitedFrom( java.io.InputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -609,7 +609,7 @@ public final class DebugProtoBuf { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable prototype) { + public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -621,25 +621,25 @@ public final class DebugProtoBuf { return builder; } /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.StringTable} + * Protobuf type {@code org.jetbrains.kotlin.metadata.StringTable} */ public static final class Builder extends org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.StringTable) - org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder { + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.StringTable) + org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder { public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor; + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_StringTable_descriptor; } protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_StringTable_fieldAccessorTable + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_StringTable_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder.class); + org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder.class); } - // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.newBuilder() + // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -670,23 +670,23 @@ public final class DebugProtoBuf { public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor; + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_StringTable_descriptor; } - public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable getDefaultInstanceForType() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance(); + public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable getDefaultInstanceForType() { + return org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance(); } - public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable build() { - org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable result = buildPartial(); + public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable build() { + org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable buildPartial() { - org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable(this); + public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable buildPartial() { + org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable(this); int from_bitField0_ = bitField0_; if (((bitField0_ & 0x00000001) == 0x00000001)) { string_ = string_.getUnmodifiableView(); @@ -698,16 +698,16 @@ public final class DebugProtoBuf { } public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) { - if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable) { - return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable)other); + if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable) { + return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable other) { - if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable other) { + if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance()) return this; if (!other.string_.isEmpty()) { if (string_.isEmpty()) { string_ = other.string_; @@ -730,11 +730,11 @@ public final class DebugProtoBuf { org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable parsedMessage = null; + org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable) e.getUnfinishedMessage(); + parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -838,7 +838,7 @@ public final class DebugProtoBuf { return this; } - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.StringTable) + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.StringTable) } static { @@ -846,43 +846,43 @@ public final class DebugProtoBuf { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.StringTable) + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.StringTable) } public interface QualifiedNameTableOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.QualifiedNameTable) + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.QualifiedNameTable) org.jetbrains.kotlin.protobuf.MessageOrBuilder { /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - java.util.List + java.util.List getQualifiedNameList(); /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index); + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index); /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ int getQualifiedNameCount(); /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - java.util.List + java.util.List getQualifiedNameOrBuilderList(); /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( int index); } /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable} + * Protobuf type {@code org.jetbrains.kotlin.metadata.QualifiedNameTable} */ public static final class QualifiedNameTable extends org.jetbrains.kotlin.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.QualifiedNameTable) + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.QualifiedNameTable) QualifiedNameTableOrBuilder { // Use QualifiedNameTable.newBuilder() to construct. private QualifiedNameTable(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) { @@ -931,10 +931,10 @@ public final class DebugProtoBuf { } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - qualifiedName_ = new java.util.ArrayList(); + qualifiedName_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - qualifiedName_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.PARSER, extensionRegistry)); + qualifiedName_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.PARSER, extensionRegistry)); break; } } @@ -954,14 +954,14 @@ public final class DebugProtoBuf { } public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor; + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_descriptor; } protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_fieldAccessorTable + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder.class); + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder.class); } public static org.jetbrains.kotlin.protobuf.Parser PARSER = @@ -980,7 +980,7 @@ public final class DebugProtoBuf { } public interface QualifiedNameOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName) + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName) org.jetbrains.kotlin.protobuf.MessageOrBuilder { /** @@ -1010,20 +1010,20 @@ public final class DebugProtoBuf { int getShortName(); /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ boolean hasKind(); /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind(); + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind(); } /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName} + * Protobuf type {@code org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName} */ public static final class QualifiedName extends org.jetbrains.kotlin.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName) + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName) QualifiedNameOrBuilder { // Use QualifiedName.newBuilder() to construct. private QualifiedName(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) { @@ -1082,7 +1082,7 @@ public final class DebugProtoBuf { } case 24: { int rawValue = input.readEnum(); - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind value = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.valueOf(rawValue); + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind value = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(3, rawValue); } else { @@ -1105,14 +1105,14 @@ public final class DebugProtoBuf { } public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor; + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_QualifiedName_descriptor; } protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_QualifiedName_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder.class); + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder.class); } public static org.jetbrains.kotlin.protobuf.Parser PARSER = @@ -1131,7 +1131,7 @@ public final class DebugProtoBuf { } /** - * Protobuf enum {@code org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind} + * Protobuf enum {@code org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind} */ public enum Kind implements org.jetbrains.kotlin.protobuf.ProtocolMessageEnum { @@ -1196,7 +1196,7 @@ public final class DebugProtoBuf { } public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDescriptor().getEnumTypes().get(0); + return org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDescriptor().getEnumTypes().get(0); } private static final Kind[] VALUES = values(); @@ -1218,7 +1218,7 @@ public final class DebugProtoBuf { this.value = value; } - // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind) + // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind) } private int bitField0_; @@ -1261,24 +1261,24 @@ public final class DebugProtoBuf { } public static final int KIND_FIELD_NUMBER = 3; - private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_; + private org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_; /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ public boolean hasKind() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() { + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() { return kind_; } private void initFields() { parentQualifiedName_ = -1; shortName_ = 0; - kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; + kind_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -1339,53 +1339,53 @@ public final class DebugProtoBuf { return super.writeReplace(); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( org.jetbrains.kotlin.protobuf.ByteString data) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( org.jetbrains.kotlin.protobuf.ByteString data, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom(byte[] data) + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom(byte[] data) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( byte[] data, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( java.io.InputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom( java.io.InputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1394,7 +1394,7 @@ public final class DebugProtoBuf { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName prototype) { + public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1406,25 +1406,25 @@ public final class DebugProtoBuf { return builder; } /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName} + * Protobuf type {@code org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName} */ public static final class Builder extends org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName) - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder { + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName) + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder { public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor; + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_QualifiedName_descriptor; } protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_QualifiedName_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder.class); + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder.class); } - // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.newBuilder() + // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1448,7 +1448,7 @@ public final class DebugProtoBuf { bitField0_ = (bitField0_ & ~0x00000001); shortName_ = 0; bitField0_ = (bitField0_ & ~0x00000002); - kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; + kind_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -1459,23 +1459,23 @@ public final class DebugProtoBuf { public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor; + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_QualifiedName_descriptor; } - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getDefaultInstanceForType() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance(); + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName getDefaultInstanceForType() { + return org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance(); } - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName build() { - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName result = buildPartial(); + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName build() { + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName buildPartial() { - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName(this); + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName buildPartial() { + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1496,16 +1496,16 @@ public final class DebugProtoBuf { } public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) { - if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName) { - return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName)other); + if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName) { + return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName other) { - if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName other) { + if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()) return this; if (other.hasParentQualifiedName()) { setParentQualifiedName(other.getParentQualifiedName()); } @@ -1531,11 +1531,11 @@ public final class DebugProtoBuf { org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parsedMessage = null; + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName) e.getUnfinishedMessage(); + parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1626,23 +1626,23 @@ public final class DebugProtoBuf { return this; } - private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; + private org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ public boolean hasKind() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() { + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() { return kind_; } /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ - public Builder setKind(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind value) { + public Builder setKind(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind value) { if (value == null) { throw new NullPointerException(); } @@ -1652,16 +1652,16 @@ public final class DebugProtoBuf { return this; } /** - * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; */ public Builder clearKind() { bitField0_ = (bitField0_ & ~0x00000004); - kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; + kind_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; onChanged(); return this; } - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName) + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName) } static { @@ -1669,40 +1669,40 @@ public final class DebugProtoBuf { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName) + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName) } public static final int QUALIFIED_NAME_FIELD_NUMBER = 1; - private java.util.List qualifiedName_; + private java.util.List qualifiedName_; /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public java.util.List getQualifiedNameList() { + public java.util.List getQualifiedNameList() { return qualifiedName_; } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public java.util.List + public java.util.List getQualifiedNameOrBuilderList() { return qualifiedName_; } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ public int getQualifiedNameCount() { return qualifiedName_.size(); } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) { + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) { return qualifiedName_.get(index); } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( int index) { return qualifiedName_.get(index); } @@ -1757,53 +1757,53 @@ public final class DebugProtoBuf { return super.writeReplace(); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable parseFrom( org.jetbrains.kotlin.protobuf.ByteString data) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable parseFrom( org.jetbrains.kotlin.protobuf.ByteString data, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseFrom(byte[] data) + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable parseFrom(byte[] data) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable parseFrom( byte[] data, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable parseFrom( java.io.InputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseDelimitedFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable parseDelimitedFrom( java.io.InputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + public static org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1812,7 +1812,7 @@ public final class DebugProtoBuf { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable prototype) { + public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1824,25 +1824,25 @@ public final class DebugProtoBuf { return builder; } /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable} + * Protobuf type {@code org.jetbrains.kotlin.metadata.QualifiedNameTable} */ public static final class Builder extends org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.QualifiedNameTable) - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder { + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.QualifiedNameTable) + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder { public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor; + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_descriptor; } protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_fieldAccessorTable + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder.class); + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder.class); } - // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.newBuilder() + // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1878,23 +1878,23 @@ public final class DebugProtoBuf { public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor; + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_descriptor; } - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable getDefaultInstanceForType() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance(); + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable getDefaultInstanceForType() { + return org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance(); } - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable build() { - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable result = buildPartial(); + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable build() { + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable buildPartial() { - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable(this); + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable buildPartial() { + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable(this); int from_bitField0_ = bitField0_; if (qualifiedNameBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001)) { @@ -1910,16 +1910,16 @@ public final class DebugProtoBuf { } public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) { - if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable) { - return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable)other); + if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable) { + return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable other) { - if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable other) { + if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance()) return this; if (qualifiedNameBuilder_ == null) { if (!other.qualifiedName_.isEmpty()) { if (qualifiedName_.isEmpty()) { @@ -1964,11 +1964,11 @@ public final class DebugProtoBuf { org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable parsedMessage = null; + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable) e.getUnfinishedMessage(); + parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1979,22 +1979,22 @@ public final class DebugProtoBuf { } private int bitField0_; - private java.util.List qualifiedName_ = + private java.util.List qualifiedName_ = java.util.Collections.emptyList(); private void ensureQualifiedNameIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - qualifiedName_ = new java.util.ArrayList(qualifiedName_); + qualifiedName_ = new java.util.ArrayList(qualifiedName_); bitField0_ |= 0x00000001; } } private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder> qualifiedNameBuilder_; + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder> qualifiedNameBuilder_; /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public java.util.List getQualifiedNameList() { + public java.util.List getQualifiedNameList() { if (qualifiedNameBuilder_ == null) { return java.util.Collections.unmodifiableList(qualifiedName_); } else { @@ -2002,7 +2002,7 @@ public final class DebugProtoBuf { } } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ public int getQualifiedNameCount() { if (qualifiedNameBuilder_ == null) { @@ -2012,9 +2012,9 @@ public final class DebugProtoBuf { } } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) { + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) { if (qualifiedNameBuilder_ == null) { return qualifiedName_.get(index); } else { @@ -2022,10 +2022,10 @@ public final class DebugProtoBuf { } } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder setQualifiedName( - int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { + int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { if (qualifiedNameBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2039,10 +2039,10 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder setQualifiedName( - int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { + int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { if (qualifiedNameBuilder_ == null) { ensureQualifiedNameIsMutable(); qualifiedName_.set(index, builderForValue.build()); @@ -2053,9 +2053,9 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public Builder addQualifiedName(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { + public Builder addQualifiedName(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { if (qualifiedNameBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2069,10 +2069,10 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder addQualifiedName( - int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { + int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { if (qualifiedNameBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2086,10 +2086,10 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder addQualifiedName( - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { if (qualifiedNameBuilder_ == null) { ensureQualifiedNameIsMutable(); qualifiedName_.add(builderForValue.build()); @@ -2100,10 +2100,10 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder addQualifiedName( - int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { + int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { if (qualifiedNameBuilder_ == null) { ensureQualifiedNameIsMutable(); qualifiedName_.add(index, builderForValue.build()); @@ -2114,10 +2114,10 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder addAllQualifiedName( - java.lang.Iterable values) { + java.lang.Iterable values) { if (qualifiedNameBuilder_ == null) { ensureQualifiedNameIsMutable(); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( @@ -2129,7 +2129,7 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder clearQualifiedName() { if (qualifiedNameBuilder_ == null) { @@ -2142,7 +2142,7 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ public Builder removeQualifiedName(int index) { if (qualifiedNameBuilder_ == null) { @@ -2155,16 +2155,16 @@ public final class DebugProtoBuf { return this; } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder getQualifiedNameBuilder( + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder getQualifiedNameBuilder( int index) { return getQualifiedNameFieldBuilder().getBuilder(index); } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( int index) { if (qualifiedNameBuilder_ == null) { return qualifiedName_.get(index); } else { @@ -2172,9 +2172,9 @@ public final class DebugProtoBuf { } } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public java.util.List + public java.util.List getQualifiedNameOrBuilderList() { if (qualifiedNameBuilder_ != null) { return qualifiedNameBuilder_.getMessageOrBuilderList(); @@ -2183,33 +2183,33 @@ public final class DebugProtoBuf { } } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder addQualifiedNameBuilder() { + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder addQualifiedNameBuilder() { return getQualifiedNameFieldBuilder().addBuilder( - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()); + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()); } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder addQualifiedNameBuilder( + public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder addQualifiedNameBuilder( int index) { return getQualifiedNameFieldBuilder().addBuilder( - index, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()); + index, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()); } /** - * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1; */ - public java.util.List + public java.util.List getQualifiedNameBuilderList() { return getQualifiedNameFieldBuilder().getBuilderList(); } private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder> + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder> getQualifiedNameFieldBuilder() { if (qualifiedNameBuilder_ == null) { qualifiedNameBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder< - org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder>( + org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder>( qualifiedName_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -2219,7 +2219,7 @@ public final class DebugProtoBuf { return qualifiedNameBuilder_; } - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable) + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.QualifiedNameTable) } static { @@ -2227,11 +2227,11 @@ public final class DebugProtoBuf { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable) + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.QualifiedNameTable) } public interface AnnotationOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Annotation) + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Annotation) org.jetbrains.kotlin.protobuf.MessageOrBuilder { /** @@ -2244,35 +2244,35 @@ public final class DebugProtoBuf { int getId(); /** - * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2; + * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2; */ - java.util.List + java.util.List getArgumentList(); /** - * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2; + * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2; */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument getArgument(int index); + org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument getArgument(int index); /** - * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2; + * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2; */ int getArgumentCount(); /** - * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2; + * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2; */ - java.util.List + java.util.List getArgumentOrBuilderList(); /** - * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2; + * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2; */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder( + org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder( int index); } /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation} + * Protobuf type {@code org.jetbrains.kotlin.metadata.Annotation} */ public static final class Annotation extends org.jetbrains.kotlin.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Annotation) + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Annotation) AnnotationOrBuilder { // Use Annotation.newBuilder() to construct. private Annotation(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) { @@ -2326,10 +2326,10 @@ public final class DebugProtoBuf { } case 18: { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - argument_ = new java.util.ArrayList(); + argument_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } - argument_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.PARSER, extensionRegistry)); + argument_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.PARSER, extensionRegistry)); break; } } @@ -2349,14 +2349,14 @@ public final class DebugProtoBuf { } public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor; + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_descriptor; } protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_fieldAccessorTable + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder.class); + org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder.class); } public static org.jetbrains.kotlin.protobuf.Parser PARSER = @@ -2375,7 +2375,7 @@ public final class DebugProtoBuf { } public interface ArgumentOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Annotation.Argument) + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Annotation.Argument) org.jetbrains.kotlin.protobuf.MessageOrBuilder { /** @@ -2388,24 +2388,24 @@ public final class DebugProtoBuf { int getNameId(); /** - * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2; + * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2; */ boolean hasValue(); /** - * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2; + * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2; */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value getValue(); + org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value getValue(); /** - * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2; + * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2; */ - org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getValueOrBuilder(); + org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getValueOrBuilder(); } /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument} + * Protobuf type {@code org.jetbrains.kotlin.metadata.Annotation.Argument} */ public static final class Argument extends org.jetbrains.kotlin.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Annotation.Argument) + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Annotation.Argument) ArgumentOrBuilder { // Use Argument.newBuilder() to construct. private Argument(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) { @@ -2458,11 +2458,11 @@ public final class DebugProtoBuf { break; } case 18: { - org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder subBuilder = null; + org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = value_.toBuilder(); } - value_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry); + value_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(value_); value_ = subBuilder.buildPartial(); @@ -2484,14 +2484,14 @@ public final class DebugProtoBuf { } public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor; + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_descriptor; } protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_fieldAccessorTable + return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder.class); + org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Builder.class); } public static org.jetbrains.kotlin.protobuf.Parser PARSER = @@ -2510,11 +2510,11 @@ public final class DebugProtoBuf { } public interface ValueOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Annotation.Argument.Value) + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Annotation.Argument.Value) org.jetbrains.kotlin.protobuf.MessageOrBuilder { /** - * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1; + * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1; * * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2524,7 +2524,7 @@ public final class DebugProtoBuf {
          */
         boolean hasType();
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+         * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
          *
          * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2532,7 +2532,7 @@ public final class DebugProtoBuf {
          * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
          * 

          */
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type getType();
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Type getType();
 
         /**
          * optional sint64 int_value = 2;
@@ -2597,48 +2597,48 @@ public final class DebugProtoBuf {
         int getEnumValueId();
 
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
          */
         boolean hasAnnotation();
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
          */
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation();
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation();
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
          */
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder();
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder();
 
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
-        java.util.List 
+        java.util.List 
             getArrayElementList();
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value getArrayElement(int index);
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value getArrayElement(int index);
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
         int getArrayElementCount();
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
-        java.util.List 
+        java.util.List 
             getArrayElementOrBuilderList();
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
             int index);
       }
       /**
-       * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument.Value}
+       * Protobuf type {@code org.jetbrains.kotlin.metadata.Annotation.Argument.Value}
        */
       public static final class Value extends
           org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-          // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
+          // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Annotation.Argument.Value)
           ValueOrBuilder {
         // Use Value.newBuilder() to construct.
         private Value(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -2687,7 +2687,7 @@ public final class DebugProtoBuf {
                 }
                 case 8: {
                   int rawValue = input.readEnum();
-                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type value = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.valueOf(rawValue);
+                  org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Type value = org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Type.valueOf(rawValue);
                   if (value == null) {
                     unknownFields.mergeVarintField(1, rawValue);
                   } else {
@@ -2727,11 +2727,11 @@ public final class DebugProtoBuf {
                   break;
                 }
                 case 66: {
-                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder subBuilder = null;
+                  org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder subBuilder = null;
                   if (((bitField0_ & 0x00000080) == 0x00000080)) {
                     subBuilder = annotation_.toBuilder();
                   }
-                  annotation_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.PARSER, extensionRegistry);
+                  annotation_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.PARSER, extensionRegistry);
                   if (subBuilder != null) {
                     subBuilder.mergeFrom(annotation_);
                     annotation_ = subBuilder.buildPartial();
@@ -2741,10 +2741,10 @@ public final class DebugProtoBuf {
                 }
                 case 74: {
                   if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
-                    arrayElement_ = new java.util.ArrayList();
+                    arrayElement_ = new java.util.ArrayList();
                     mutable_bitField0_ |= 0x00000100;
                   }
-                  arrayElement_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry));
+                  arrayElement_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry));
                   break;
                 }
               }
@@ -2764,14 +2764,14 @@ public final class DebugProtoBuf {
         }
         public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor;
+          return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_Value_descriptor;
         }
 
         protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_fieldAccessorTable
+          return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_Value_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder.class);
+                  org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder.class);
         }
 
         public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -2790,7 +2790,7 @@ public final class DebugProtoBuf {
         }
 
         /**
-         * Protobuf enum {@code org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type}
+         * Protobuf enum {@code org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type}
          */
         public enum Type
             implements org.jetbrains.kotlin.protobuf.ProtocolMessageEnum {
@@ -2945,7 +2945,7 @@ public final class DebugProtoBuf {
           }
           public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor
               getDescriptor() {
-            return org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDescriptor().getEnumTypes().get(0);
+            return org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.getDescriptor().getEnumTypes().get(0);
           }
 
           private static final Type[] VALUES = values();
@@ -2967,14 +2967,14 @@ public final class DebugProtoBuf {
             this.value = value;
           }
 
-          // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type)
+          // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type)
         }
 
         private int bitField0_;
         public static final int TYPE_FIELD_NUMBER = 1;
-        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type type_;
+        private org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Type type_;
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+         * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
          *
          * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2986,7 +2986,7 @@ public final class DebugProtoBuf {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+         * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
          *
          * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2994,7 +2994,7 @@ public final class DebugProtoBuf {
          * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
          * 

          */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type getType() {
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Type getType() {
           return type_;
         }
 
@@ -3097,70 +3097,70 @@ public final class DebugProtoBuf {
         }
 
         public static final int ANNOTATION_FIELD_NUMBER = 8;
-        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation annotation_;
+        private org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation annotation_;
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
          */
         public boolean hasAnnotation() {
           return ((bitField0_ & 0x00000080) == 0x00000080);
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
          */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation() {
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation() {
           return annotation_;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
          */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder() {
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder() {
           return annotation_;
         }
 
         public static final int ARRAY_ELEMENT_FIELD_NUMBER = 9;
-        private java.util.List arrayElement_;
+        private java.util.List arrayElement_;
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
-        public java.util.List getArrayElementList() {
+        public java.util.List getArrayElementList() {
           return arrayElement_;
         }
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
-        public java.util.List 
+        public java.util.List 
             getArrayElementOrBuilderList() {
           return arrayElement_;
         }
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
         public int getArrayElementCount() {
           return arrayElement_.size();
         }
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
           return arrayElement_.get(index);
         }
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
             int index) {
           return arrayElement_.get(index);
         }
 
         private void initFields() {
-          type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
+          type_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
           intValue_ = 0L;
           floatValue_ = 0F;
           doubleValue_ = 0D;
           stringValue_ = 0;
           classId_ = 0;
           enumValueId_ = 0;
-          annotation_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
+          annotation_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance();
           arrayElement_ = java.util.Collections.emptyList();
         }
         private byte memoizedIsInitialized = -1;
@@ -3272,53 +3272,53 @@ public final class DebugProtoBuf {
           return super.writeReplace();
         }
 
-        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value parseFrom(
             org.jetbrains.kotlin.protobuf.ByteString data)
             throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
           return PARSER.parseFrom(data);
         }
-        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value parseFrom(
             org.jetbrains.kotlin.protobuf.ByteString data,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
           return PARSER.parseFrom(data, extensionRegistry);
         }
-        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(byte[] data)
+        public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value parseFrom(byte[] data)
             throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
           return PARSER.parseFrom(data);
         }
-        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value parseFrom(
             byte[] data,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
           return PARSER.parseFrom(data, extensionRegistry);
         }
-        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(java.io.InputStream input)
+        public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value parseFrom(java.io.InputStream input)
             throws java.io.IOException {
           return PARSER.parseFrom(input);
         }
-        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value parseFrom(
             java.io.InputStream input,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
           return PARSER.parseFrom(input, extensionRegistry);
         }
-        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseDelimitedFrom(java.io.InputStream input)
+        public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value parseDelimitedFrom(java.io.InputStream input)
             throws java.io.IOException {
           return PARSER.parseDelimitedFrom(input);
         }
-        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseDelimitedFrom(
+        public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value parseDelimitedFrom(
             java.io.InputStream input,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
           return PARSER.parseDelimitedFrom(input, extensionRegistry);
         }
-        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value parseFrom(
             org.jetbrains.kotlin.protobuf.CodedInputStream input)
             throws java.io.IOException {
           return PARSER.parseFrom(input);
         }
-        public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value parseFrom(
             org.jetbrains.kotlin.protobuf.CodedInputStream input,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
@@ -3327,7 +3327,7 @@ public final class DebugProtoBuf {
 
         public static Builder newBuilder() { return Builder.create(); }
         public Builder newBuilderForType() { return newBuilder(); }
-        public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value prototype) {
+        public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value prototype) {
           return newBuilder().mergeFrom(prototype);
         }
         public Builder toBuilder() { return newBuilder(this); }
@@ -3339,25 +3339,25 @@ public final class DebugProtoBuf {
           return builder;
         }
         /**
-         * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument.Value}
+         * Protobuf type {@code org.jetbrains.kotlin.metadata.Annotation.Argument.Value}
          */
         public static final class Builder extends
             org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-            // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder {
+            // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Annotation.Argument.Value)
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.ValueOrBuilder {
           public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
               getDescriptor() {
-            return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor;
+            return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_Value_descriptor;
           }
 
           protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
               internalGetFieldAccessorTable() {
-            return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_fieldAccessorTable
+            return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_Value_fieldAccessorTable
                 .ensureFieldAccessorsInitialized(
-                    org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder.class);
+                    org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder.class);
           }
 
-          // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.newBuilder()
+          // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.newBuilder()
           private Builder() {
             maybeForceBuilderInitialization();
           }
@@ -3379,7 +3379,7 @@ public final class DebugProtoBuf {
 
           public Builder clear() {
             super.clear();
-            type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
+            type_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
             bitField0_ = (bitField0_ & ~0x00000001);
             intValue_ = 0L;
             bitField0_ = (bitField0_ & ~0x00000002);
@@ -3394,7 +3394,7 @@ public final class DebugProtoBuf {
             enumValueId_ = 0;
             bitField0_ = (bitField0_ & ~0x00000040);
             if (annotationBuilder_ == null) {
-              annotation_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
+              annotation_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance();
             } else {
               annotationBuilder_.clear();
             }
@@ -3414,23 +3414,23 @@ public final class DebugProtoBuf {
 
           public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
               getDescriptorForType() {
-            return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor;
+            return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_Value_descriptor;
           }
 
-          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value getDefaultInstanceForType() {
-            return org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+          public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value getDefaultInstanceForType() {
+            return org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
           }
 
-          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value build() {
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value result = buildPartial();
+          public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value build() {
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value result = buildPartial();
             if (!result.isInitialized()) {
               throw newUninitializedMessageException(result);
             }
             return result;
           }
 
-          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value buildPartial() {
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value(this);
+          public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value buildPartial() {
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value(this);
             int from_bitField0_ = bitField0_;
             int to_bitField0_ = 0;
             if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -3484,16 +3484,16 @@ public final class DebugProtoBuf {
           }
 
           public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-            if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value) {
-              return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value)other);
+            if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value) {
+              return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value)other);
             } else {
               super.mergeFrom(other);
               return this;
             }
           }
 
-          public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value other) {
-            if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance()) return this;
+          public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value other) {
+            if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance()) return this;
             if (other.hasType()) {
               setType(other.getType());
             }
@@ -3568,11 +3568,11 @@ public final class DebugProtoBuf {
               org.jetbrains.kotlin.protobuf.CodedInputStream input,
               org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
               throws java.io.IOException {
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value parsedMessage = null;
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value parsedMessage = null;
             try {
               parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
             } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-              parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value) e.getUnfinishedMessage();
+              parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value) e.getUnfinishedMessage();
               throw e;
             } finally {
               if (parsedMessage != null) {
@@ -3583,9 +3583,9 @@ public final class DebugProtoBuf {
           }
           private int bitField0_;
 
-          private org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
+          private org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Type type_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -3597,7 +3597,7 @@ public final class DebugProtoBuf {
             return ((bitField0_ & 0x00000001) == 0x00000001);
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -3605,11 +3605,11 @@ public final class DebugProtoBuf {
            * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
            * 

            */
-          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type getType() {
+          public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Type getType() {
             return type_;
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -3617,7 +3617,7 @@ public final class DebugProtoBuf {
            * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
            * 

            */
-          public Builder setType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type value) {
+          public Builder setType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Type value) {
             if (value == null) {
               throw new NullPointerException();
             }
@@ -3627,7 +3627,7 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -3637,7 +3637,7 @@ public final class DebugProtoBuf {
            */
           public Builder clearType() {
             bitField0_ = (bitField0_ & ~0x00000001);
-            type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
+            type_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Type.BYTE;
             onChanged();
             return this;
           }
@@ -3850,19 +3850,19 @@ public final class DebugProtoBuf {
             return this;
           }
 
-          private org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation annotation_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
+          private org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation annotation_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance();
           private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder> annotationBuilder_;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder> annotationBuilder_;
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
           public boolean hasAnnotation() {
             return ((bitField0_ & 0x00000080) == 0x00000080);
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
-          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation() {
+          public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation() {
             if (annotationBuilder_ == null) {
               return annotation_;
             } else {
@@ -3870,9 +3870,9 @@ public final class DebugProtoBuf {
             }
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
-          public Builder setAnnotation(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
+          public Builder setAnnotation(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation value) {
             if (annotationBuilder_ == null) {
               if (value == null) {
                 throw new NullPointerException();
@@ -3886,10 +3886,10 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
           public Builder setAnnotation(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder builderForValue) {
             if (annotationBuilder_ == null) {
               annotation_ = builderForValue.build();
               onChanged();
@@ -3900,14 +3900,14 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
-          public Builder mergeAnnotation(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
+          public Builder mergeAnnotation(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation value) {
             if (annotationBuilder_ == null) {
               if (((bitField0_ & 0x00000080) == 0x00000080) &&
-                  annotation_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance()) {
+                  annotation_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance()) {
                 annotation_ =
-                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.newBuilder(annotation_).mergeFrom(value).buildPartial();
+                  org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.newBuilder(annotation_).mergeFrom(value).buildPartial();
               } else {
                 annotation_ = value;
               }
@@ -3919,11 +3919,11 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
           public Builder clearAnnotation() {
             if (annotationBuilder_ == null) {
-              annotation_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
+              annotation_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance();
               onChanged();
             } else {
               annotationBuilder_.clear();
@@ -3932,17 +3932,17 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
-          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder getAnnotationBuilder() {
+          public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder getAnnotationBuilder() {
             bitField0_ |= 0x00000080;
             onChanged();
             return getAnnotationFieldBuilder().getBuilder();
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
-          public org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder() {
+          public org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder() {
             if (annotationBuilder_ != null) {
               return annotationBuilder_.getMessageOrBuilder();
             } else {
@@ -3950,14 +3950,14 @@ public final class DebugProtoBuf {
             }
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
           private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder> 
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder> 
               getAnnotationFieldBuilder() {
             if (annotationBuilder_ == null) {
               annotationBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder>(
+                  org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder>(
                       getAnnotation(),
                       getParentForChildren(),
                       isClean());
@@ -3966,22 +3966,22 @@ public final class DebugProtoBuf {
             return annotationBuilder_;
           }
 
-          private java.util.List arrayElement_ =
+          private java.util.List arrayElement_ =
             java.util.Collections.emptyList();
           private void ensureArrayElementIsMutable() {
             if (!((bitField0_ & 0x00000100) == 0x00000100)) {
-              arrayElement_ = new java.util.ArrayList(arrayElement_);
+              arrayElement_ = new java.util.ArrayList(arrayElement_);
               bitField0_ |= 0x00000100;
              }
           }
 
           private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> arrayElementBuilder_;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> arrayElementBuilder_;
 
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
-          public java.util.List getArrayElementList() {
+          public java.util.List getArrayElementList() {
             if (arrayElementBuilder_ == null) {
               return java.util.Collections.unmodifiableList(arrayElement_);
             } else {
@@ -3989,7 +3989,7 @@ public final class DebugProtoBuf {
             }
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public int getArrayElementCount() {
             if (arrayElementBuilder_ == null) {
@@ -3999,9 +3999,9 @@ public final class DebugProtoBuf {
             }
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
-          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
+          public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
             if (arrayElementBuilder_ == null) {
               return arrayElement_.get(index);
             } else {
@@ -4009,10 +4009,10 @@ public final class DebugProtoBuf {
             }
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder setArrayElement(
-              int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
+              int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value value) {
             if (arrayElementBuilder_ == null) {
               if (value == null) {
                 throw new NullPointerException();
@@ -4026,10 +4026,10 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder setArrayElement(
-              int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+              int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
             if (arrayElementBuilder_ == null) {
               ensureArrayElementIsMutable();
               arrayElement_.set(index, builderForValue.build());
@@ -4040,9 +4040,9 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
-          public Builder addArrayElement(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
+          public Builder addArrayElement(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value value) {
             if (arrayElementBuilder_ == null) {
               if (value == null) {
                 throw new NullPointerException();
@@ -4056,10 +4056,10 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder addArrayElement(
-              int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
+              int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value value) {
             if (arrayElementBuilder_ == null) {
               if (value == null) {
                 throw new NullPointerException();
@@ -4073,10 +4073,10 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder addArrayElement(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
             if (arrayElementBuilder_ == null) {
               ensureArrayElementIsMutable();
               arrayElement_.add(builderForValue.build());
@@ -4087,10 +4087,10 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder addArrayElement(
-              int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+              int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
             if (arrayElementBuilder_ == null) {
               ensureArrayElementIsMutable();
               arrayElement_.add(index, builderForValue.build());
@@ -4101,10 +4101,10 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder addAllArrayElement(
-              java.lang.Iterable values) {
+              java.lang.Iterable values) {
             if (arrayElementBuilder_ == null) {
               ensureArrayElementIsMutable();
               org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -4116,7 +4116,7 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder clearArrayElement() {
             if (arrayElementBuilder_ == null) {
@@ -4129,7 +4129,7 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder removeArrayElement(int index) {
             if (arrayElementBuilder_ == null) {
@@ -4142,16 +4142,16 @@ public final class DebugProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
-          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder getArrayElementBuilder(
+          public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder getArrayElementBuilder(
               int index) {
             return getArrayElementFieldBuilder().getBuilder(index);
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
-          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
+          public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
               int index) {
             if (arrayElementBuilder_ == null) {
               return arrayElement_.get(index);  } else {
@@ -4159,9 +4159,9 @@ public final class DebugProtoBuf {
             }
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
-          public java.util.List 
+          public java.util.List 
                getArrayElementOrBuilderList() {
             if (arrayElementBuilder_ != null) {
               return arrayElementBuilder_.getMessageOrBuilderList();
@@ -4170,33 +4170,33 @@ public final class DebugProtoBuf {
             }
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
-          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder addArrayElementBuilder() {
+          public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder addArrayElementBuilder() {
             return getArrayElementFieldBuilder().addBuilder(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
-          public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder addArrayElementBuilder(
+          public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder addArrayElementBuilder(
               int index) {
             return getArrayElementFieldBuilder().addBuilder(
-                index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
+                index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
-          public java.util.List 
+          public java.util.List 
                getArrayElementBuilderList() {
             return getArrayElementFieldBuilder().getBuilderList();
           }
           private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> 
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> 
               getArrayElementFieldBuilder() {
             if (arrayElementBuilder_ == null) {
               arrayElementBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder>(
+                  org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.ValueOrBuilder>(
                       arrayElement_,
                       ((bitField0_ & 0x00000100) == 0x00000100),
                       getParentForChildren(),
@@ -4206,7 +4206,7 @@ public final class DebugProtoBuf {
             return arrayElementBuilder_;
           }
 
-          // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
+          // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Annotation.Argument.Value)
         }
 
         static {
@@ -4214,7 +4214,7 @@ public final class DebugProtoBuf {
           defaultInstance.initFields();
         }
 
-        // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
+        // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Annotation.Argument.Value)
       }
 
       private int bitField0_;
@@ -4234,29 +4234,29 @@ public final class DebugProtoBuf {
       }
 
       public static final int VALUE_FIELD_NUMBER = 2;
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value value_;
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value value_;
       /**
-       * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+       * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
        */
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+       * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value getValue() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value getValue() {
         return value_;
       }
       /**
-       * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+       * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getValueOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getValueOrBuilder() {
         return value_;
       }
 
       private void initFields() {
         nameId_ = 0;
-        value_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+        value_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
       }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
@@ -4318,53 +4318,53 @@ public final class DebugProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.ByteString data)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.ByteString data,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument parseFrom(byte[] data)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument parseFrom(
           byte[] data,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument parseFrom(
           java.io.InputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseFrom(input, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseDelimitedFrom(
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument parseDelimitedFrom(
           java.io.InputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -4373,7 +4373,7 @@ public final class DebugProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
@@ -4385,25 +4385,25 @@ public final class DebugProtoBuf {
         return builder;
       }
       /**
-       * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument}
+       * Protobuf type {@code org.jetbrains.kotlin.metadata.Annotation.Argument}
        */
       public static final class Builder extends
           org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Annotation.Argument)
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder {
+          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Annotation.Argument)
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.ArgumentOrBuilder {
         public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor;
+          return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_descriptor;
         }
 
         protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_fieldAccessorTable
+          return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder.class);
+                  org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Builder.class);
         }
 
-        // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.newBuilder()
+        // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -4427,7 +4427,7 @@ public final class DebugProtoBuf {
           nameId_ = 0;
           bitField0_ = (bitField0_ & ~0x00000001);
           if (valueBuilder_ == null) {
-            value_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+            value_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
           } else {
             valueBuilder_.clear();
           }
@@ -4441,23 +4441,23 @@ public final class DebugProtoBuf {
 
         public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor;
+          return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_descriptor;
         }
 
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument getDefaultInstanceForType() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.getDefaultInstance();
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.getDefaultInstance();
         }
 
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument build() {
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument result = buildPartial();
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument build() {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument buildPartial() {
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument(this);
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument buildPartial() {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -4478,16 +4478,16 @@ public final class DebugProtoBuf {
         }
 
         public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-          if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument) {
-            return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument)other);
+          if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument) {
+            return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument other) {
-          if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument other) {
+          if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.getDefaultInstance()) return this;
           if (other.hasNameId()) {
             setNameId(other.getNameId());
           }
@@ -4518,11 +4518,11 @@ public final class DebugProtoBuf {
             org.jetbrains.kotlin.protobuf.CodedInputStream input,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument parsedMessage = null;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -4565,19 +4565,19 @@ public final class DebugProtoBuf {
           return this;
         }
 
-        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value value_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+        private org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value value_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
         private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> valueBuilder_;
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> valueBuilder_;
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
         public boolean hasValue() {
           return ((bitField0_ & 0x00000002) == 0x00000002);
         }
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value getValue() {
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value getValue() {
           if (valueBuilder_ == null) {
             return value_;
           } else {
@@ -4585,9 +4585,9 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
-        public Builder setValue(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
+        public Builder setValue(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value value) {
           if (valueBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -4601,10 +4601,10 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
         public Builder setValue(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
           if (valueBuilder_ == null) {
             value_ = builderForValue.build();
             onChanged();
@@ -4615,14 +4615,14 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
-        public Builder mergeValue(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value value) {
+        public Builder mergeValue(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value value) {
           if (valueBuilder_ == null) {
             if (((bitField0_ & 0x00000002) == 0x00000002) &&
-                value_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance()) {
+                value_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance()) {
               value_ =
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.newBuilder(value_).mergeFrom(value).buildPartial();
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.newBuilder(value_).mergeFrom(value).buildPartial();
             } else {
               value_ = value;
             }
@@ -4634,11 +4634,11 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
         public Builder clearValue() {
           if (valueBuilder_ == null) {
-            value_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+            value_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance();
             onChanged();
           } else {
             valueBuilder_.clear();
@@ -4647,17 +4647,17 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder getValueBuilder() {
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder getValueBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getValueFieldBuilder().getBuilder();
         }
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getValueOrBuilder() {
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.ValueOrBuilder getValueOrBuilder() {
           if (valueBuilder_ != null) {
             return valueBuilder_.getMessageOrBuilder();
           } else {
@@ -4665,14 +4665,14 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
         private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> 
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.ValueOrBuilder> 
             getValueFieldBuilder() {
           if (valueBuilder_ == null) {
             valueBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.ValueOrBuilder>(
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.ValueOrBuilder>(
                     getValue(),
                     getParentForChildren(),
                     isClean());
@@ -4681,7 +4681,7 @@ public final class DebugProtoBuf {
           return valueBuilder_;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Annotation.Argument)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Annotation.Argument)
       }
 
       static {
@@ -4689,7 +4689,7 @@ public final class DebugProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Annotation.Argument)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Annotation.Argument)
     }
 
     private int bitField0_;
@@ -4709,36 +4709,36 @@ public final class DebugProtoBuf {
     }
 
     public static final int ARGUMENT_FIELD_NUMBER = 2;
-    private java.util.List argument_;
+    private java.util.List argument_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
      */
-    public java.util.List getArgumentList() {
+    public java.util.List getArgumentList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getArgumentOrBuilderList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
      */
     public int getArgumentCount() {
       return argument_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument getArgument(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument getArgument(int index) {
       return argument_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder(
         int index) {
       return argument_.get(index);
     }
@@ -4805,53 +4805,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -4860,7 +4860,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -4872,25 +4872,25 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Annotation}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Annotation)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Annotation)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -4928,23 +4928,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Annotation_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -4966,16 +4966,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance()) return this;
         if (other.hasId()) {
           setId(other.getId());
         }
@@ -5027,11 +5027,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -5074,22 +5074,22 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private java.util.List argument_ =
+      private java.util.List argument_ =
         java.util.Collections.emptyList();
       private void ensureArgumentIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          argument_ = new java.util.ArrayList(argument_);
+          argument_ = new java.util.ArrayList(argument_);
           bitField0_ |= 0x00000002;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder> argumentBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.ArgumentOrBuilder> argumentBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
-      public java.util.List getArgumentList() {
+      public java.util.List getArgumentList() {
         if (argumentBuilder_ == null) {
           return java.util.Collections.unmodifiableList(argument_);
         } else {
@@ -5097,7 +5097,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public int getArgumentCount() {
         if (argumentBuilder_ == null) {
@@ -5107,9 +5107,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument getArgument(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument getArgument(int index) {
         if (argumentBuilder_ == null) {
           return argument_.get(index);
         } else {
@@ -5117,10 +5117,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument value) {
         if (argumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5134,10 +5134,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Builder builderForValue) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           argument_.set(index, builderForValue.build());
@@ -5148,9 +5148,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
-      public Builder addArgument(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument value) {
+      public Builder addArgument(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument value) {
         if (argumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5164,10 +5164,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument value) {
         if (argumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -5181,10 +5181,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder addArgument(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Builder builderForValue) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           argument_.add(builderForValue.build());
@@ -5195,10 +5195,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Builder builderForValue) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           argument_.add(index, builderForValue.build());
@@ -5209,10 +5209,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder addAllArgument(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -5224,7 +5224,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder clearArgument() {
         if (argumentBuilder_ == null) {
@@ -5237,7 +5237,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder removeArgument(int index) {
         if (argumentBuilder_ == null) {
@@ -5250,16 +5250,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder getArgumentBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Builder getArgumentBuilder(
           int index) {
         return getArgumentFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder(
           int index) {
         if (argumentBuilder_ == null) {
           return argument_.get(index);  } else {
@@ -5267,9 +5267,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getArgumentOrBuilderList() {
         if (argumentBuilder_ != null) {
           return argumentBuilder_.getMessageOrBuilderList();
@@ -5278,33 +5278,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder addArgumentBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Builder addArgumentBuilder() {
         return getArgumentFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder addArgumentBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Builder addArgumentBuilder(
           int index) {
         return getArgumentFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getArgumentBuilderList() {
         return getArgumentFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.ArgumentOrBuilder> 
           getArgumentFieldBuilder() {
         if (argumentBuilder_ == null) {
           argumentBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.ArgumentOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.ArgumentOrBuilder>(
                   argument_,
                   ((bitField0_ & 0x00000002) == 0x00000002),
                   getParentForChildren(),
@@ -5314,7 +5314,7 @@ public final class DebugProtoBuf {
         return argumentBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Annotation)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Annotation)
     }
 
     static {
@@ -5322,36 +5322,36 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Annotation)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Annotation)
   }
 
   public interface TypeOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Type)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Type)
       org.jetbrains.kotlin.protobuf.GeneratedMessage.
           ExtendableMessageOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
-    java.util.List 
+    java.util.List 
         getArgumentList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument getArgument(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument getArgument(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
     int getArgumentCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
-    java.util.List 
+    java.util.List 
         getArgumentOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
         int index);
 
     /**
@@ -5383,17 +5383,17 @@ public final class DebugProtoBuf {
     int getFlexibleTypeCapabilitiesId();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
      */
     boolean hasFlexibleUpperBound();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getFlexibleUpperBound();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getFlexibleUpperBound();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getFlexibleUpperBoundOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getFlexibleUpperBoundOrBuilder();
 
     /**
      * optional int32 flexible_upper_bound_id = 8;
@@ -5467,17 +5467,17 @@ public final class DebugProtoBuf {
     int getTypeAliasName();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+     * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
      */
     boolean hasOuterType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+     * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getOuterType();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getOuterType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+     * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getOuterTypeOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getOuterTypeOrBuilder();
 
     /**
      * optional int32 outer_type_id = 11;
@@ -5489,17 +5489,17 @@ public final class DebugProtoBuf {
     int getOuterTypeId();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+     * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
      */
     boolean hasAbbreviatedType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+     * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getAbbreviatedType();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getAbbreviatedType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+     * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getAbbreviatedTypeOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getAbbreviatedTypeOrBuilder();
 
     /**
      * optional int32 abbreviated_type_id = 14;
@@ -5528,15 +5528,15 @@ public final class DebugProtoBuf {
     int getFlags();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Type}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Type}
    */
   public static final class Type extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
         Type> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Type)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Type)
       TypeOrBuilder {
     // Use Type.newBuilder() to construct.
-    private Type(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+    private Type(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -5587,10 +5587,10 @@ public final class DebugProtoBuf {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                argument_ = new java.util.ArrayList();
+                argument_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              argument_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.PARSER, extensionRegistry));
+              argument_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.PARSER, extensionRegistry));
               break;
             }
             case 24: {
@@ -5604,11 +5604,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 42: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = flexibleUpperBound_.toBuilder();
               }
-              flexibleUpperBound_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              flexibleUpperBound_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(flexibleUpperBound_);
                 flexibleUpperBound_ = subBuilder.buildPartial();
@@ -5637,11 +5637,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 82: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000100) == 0x00000100)) {
                 subBuilder = outerType_.toBuilder();
               }
-              outerType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              outerType_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(outerType_);
                 outerType_ = subBuilder.buildPartial();
@@ -5660,11 +5660,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 106: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000400) == 0x00000400)) {
                 subBuilder = abbreviatedType_.toBuilder();
               }
-              abbreviatedType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              abbreviatedType_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(abbreviatedType_);
                 abbreviatedType_ = subBuilder.buildPartial();
@@ -5694,14 +5694,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Type_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Type_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -5720,20 +5720,20 @@ public final class DebugProtoBuf {
     }
 
     public interface ArgumentOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Type.Argument)
+        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Type.Argument)
         org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
        */
       boolean hasProjection();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
        */
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection getProjection();
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Projection getProjection();
 
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 2;
        *
        * 
        * When projection is STAR, no type is written, otherwise type must be specified
@@ -5741,21 +5741,21 @@ public final class DebugProtoBuf {
        */
       boolean hasType();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 2;
        *
        * 
        * When projection is STAR, no type is written, otherwise type must be specified
        * 

        */
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType();
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getType();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 2;
        *
        * 
        * When projection is STAR, no type is written, otherwise type must be specified
        * 

        */
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder();
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder();
 
       /**
        * optional int32 type_id = 3;
@@ -5767,11 +5767,11 @@ public final class DebugProtoBuf {
       int getTypeId();
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Type.Argument}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Type.Argument}
      */
     public static final class Argument extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Type.Argument)
+        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Type.Argument)
         ArgumentOrBuilder {
       // Use Argument.newBuilder() to construct.
       private Argument(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -5820,7 +5820,7 @@ public final class DebugProtoBuf {
               }
               case 8: {
                 int rawValue = input.readEnum();
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection value = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection.valueOf(rawValue);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Projection value = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Projection.valueOf(rawValue);
                 if (value == null) {
                   unknownFields.mergeVarintField(1, rawValue);
                 } else {
@@ -5830,11 +5830,11 @@ public final class DebugProtoBuf {
                 break;
               }
               case 18: {
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) == 0x00000002)) {
                   subBuilder = type_.toBuilder();
                 }
-                type_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+                type_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(type_);
                   type_ = subBuilder.buildPartial();
@@ -5861,14 +5861,14 @@ public final class DebugProtoBuf {
       }
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Type_Argument_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Argument_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Type_Argument_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Builder.class);
       }
 
       public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -5887,7 +5887,7 @@ public final class DebugProtoBuf {
       }
 
       /**
-       * Protobuf enum {@code org.jetbrains.kotlin.serialization.Type.Argument.Projection}
+       * Protobuf enum {@code org.jetbrains.kotlin.metadata.Type.Argument.Projection}
        */
       public enum Projection
           implements org.jetbrains.kotlin.protobuf.ProtocolMessageEnum {
@@ -5961,7 +5961,7 @@ public final class DebugProtoBuf {
         }
         public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor
             getDescriptor() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.getDescriptor().getEnumTypes().get(0);
+          return org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.getDescriptor().getEnumTypes().get(0);
         }
 
         private static final Projection[] VALUES = values();
@@ -5983,29 +5983,29 @@ public final class DebugProtoBuf {
           this.value = value;
         }
 
-        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Type.Argument.Projection)
+        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Type.Argument.Projection)
       }
 
       private int bitField0_;
       public static final int PROJECTION_FIELD_NUMBER = 1;
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection projection_;
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Projection projection_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
        */
       public boolean hasProjection() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection getProjection() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Projection getProjection() {
         return projection_;
       }
 
       public static final int TYPE_FIELD_NUMBER = 2;
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type type_;
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type type_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 2;
        *
        * 
        * When projection is STAR, no type is written, otherwise type must be specified
@@ -6015,23 +6015,23 @@ public final class DebugProtoBuf {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 2;
        *
        * 
        * When projection is STAR, no type is written, otherwise type must be specified
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getType() {
         return type_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 2;
        *
        * 
        * When projection is STAR, no type is written, otherwise type must be specified
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
         return type_;
       }
 
@@ -6051,8 +6051,8 @@ public final class DebugProtoBuf {
       }
 
       private void initFields() {
-        projection_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection.INV;
-        type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+        projection_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Projection.INV;
+        type_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
         typeId_ = 0;
       }
       private byte memoizedIsInitialized = -1;
@@ -6116,53 +6116,53 @@ public final class DebugProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.ByteString data)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.ByteString data,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument parseFrom(byte[] data)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument parseFrom(
           byte[] data,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument parseFrom(
           java.io.InputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseFrom(input, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseDelimitedFrom(
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument parseDelimitedFrom(
           java.io.InputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -6171,7 +6171,7 @@ public final class DebugProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
@@ -6183,25 +6183,25 @@ public final class DebugProtoBuf {
         return builder;
       }
       /**
-       * Protobuf type {@code org.jetbrains.kotlin.serialization.Type.Argument}
+       * Protobuf type {@code org.jetbrains.kotlin.metadata.Type.Argument}
        */
       public static final class Builder extends
           org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Type.Argument)
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ArgumentOrBuilder {
+          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Type.Argument)
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.ArgumentOrBuilder {
         public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor;
+          return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Type_Argument_descriptor;
         }
 
         protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Argument_fieldAccessorTable
+          return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Type_Argument_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder.class);
+                  org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Builder.class);
         }
 
-        // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.newBuilder()
+        // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -6222,10 +6222,10 @@ public final class DebugProtoBuf {
 
         public Builder clear() {
           super.clear();
-          projection_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection.INV;
+          projection_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Projection.INV;
           bitField0_ = (bitField0_ & ~0x00000001);
           if (typeBuilder_ == null) {
-            type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+            type_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
           } else {
             typeBuilder_.clear();
           }
@@ -6241,23 +6241,23 @@ public final class DebugProtoBuf {
 
         public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor;
+          return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Type_Argument_descriptor;
         }
 
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument getDefaultInstanceForType() {
-          return org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance();
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.getDefaultInstance();
         }
 
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument build() {
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument result = buildPartial();
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument build() {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument buildPartial() {
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument(this);
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument buildPartial() {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -6282,16 +6282,16 @@ public final class DebugProtoBuf {
         }
 
         public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-          if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument) {
-            return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument)other);
+          if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument) {
+            return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument other) {
-          if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument other) {
+          if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.getDefaultInstance()) return this;
           if (other.hasProjection()) {
             setProjection(other.getProjection());
           }
@@ -6319,11 +6319,11 @@ public final class DebugProtoBuf {
             org.jetbrains.kotlin.protobuf.CodedInputStream input,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument parsedMessage = null;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -6334,23 +6334,23 @@ public final class DebugProtoBuf {
         }
         private int bitField0_;
 
-        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection projection_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection.INV;
+        private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Projection projection_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Projection.INV;
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
          */
         public boolean hasProjection() {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
          */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection getProjection() {
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Projection getProjection() {
           return projection_;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
          */
-        public Builder setProjection(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection value) {
+        public Builder setProjection(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Projection value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -6360,20 +6360,20 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
          */
         public Builder clearProjection() {
           bitField0_ = (bitField0_ & ~0x00000001);
-          projection_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Projection.INV;
+          projection_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Projection.INV;
           onChanged();
           return this;
         }
 
-        private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+        private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type type_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
         private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> typeBuilder_;
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> typeBuilder_;
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
@@ -6383,13 +6383,13 @@ public final class DebugProtoBuf {
           return ((bitField0_ & 0x00000002) == 0x00000002);
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
          * 

          */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType() {
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getType() {
           if (typeBuilder_ == null) {
             return type_;
           } else {
@@ -6397,13 +6397,13 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
          * 

          */
-        public Builder setType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+        public Builder setType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
           if (typeBuilder_ == null) {
             if (value == null) {
               throw new NullPointerException();
@@ -6417,14 +6417,14 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
          * 

          */
         public Builder setType(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
           if (typeBuilder_ == null) {
             type_ = builderForValue.build();
             onChanged();
@@ -6435,18 +6435,18 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
          * 

          */
-        public Builder mergeType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+        public Builder mergeType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
           if (typeBuilder_ == null) {
             if (((bitField0_ & 0x00000002) == 0x00000002) &&
-                type_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+                type_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) {
               type_ =
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
             } else {
               type_ = value;
             }
@@ -6458,7 +6458,7 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
@@ -6466,7 +6466,7 @@ public final class DebugProtoBuf {
          */
         public Builder clearType() {
           if (typeBuilder_ == null) {
-            type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+            type_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
             onChanged();
           } else {
             typeBuilder_.clear();
@@ -6475,25 +6475,25 @@ public final class DebugProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
          * 

          */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getTypeBuilder() {
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getTypeBuilder() {
           bitField0_ |= 0x00000002;
           onChanged();
           return getTypeFieldBuilder().getBuilder();
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
          * 

          */
-        public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
+        public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
           if (typeBuilder_ != null) {
             return typeBuilder_.getMessageOrBuilder();
           } else {
@@ -6501,18 +6501,18 @@ public final class DebugProtoBuf {
           }
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
          * 

          */
         private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
             getTypeFieldBuilder() {
           if (typeBuilder_ == null) {
             typeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                     getType(),
                     getParentForChildren(),
                     isClean());
@@ -6553,7 +6553,7 @@ public final class DebugProtoBuf {
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Type.Argument)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Type.Argument)
       }
 
       static {
@@ -6561,41 +6561,41 @@ public final class DebugProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Type.Argument)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Type.Argument)
     }
 
     private int bitField0_;
     public static final int ARGUMENT_FIELD_NUMBER = 2;
-    private java.util.List argument_;
+    private java.util.List argument_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
-    public java.util.List getArgumentList() {
+    public java.util.List getArgumentList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getArgumentOrBuilderList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
     public int getArgumentCount() {
       return argument_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument getArgument(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument getArgument(int index) {
       return argument_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
         int index) {
       return argument_.get(index);
     }
@@ -6641,23 +6641,23 @@ public final class DebugProtoBuf {
     }
 
     public static final int FLEXIBLE_UPPER_BOUND_FIELD_NUMBER = 5;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type flexibleUpperBound_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type flexibleUpperBound_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
      */
     public boolean hasFlexibleUpperBound() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getFlexibleUpperBound() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getFlexibleUpperBound() {
       return flexibleUpperBound_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getFlexibleUpperBoundOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getFlexibleUpperBoundOrBuilder() {
       return flexibleUpperBound_;
     }
 
@@ -6763,23 +6763,23 @@ public final class DebugProtoBuf {
     }
 
     public static final int OUTER_TYPE_FIELD_NUMBER = 10;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type outerType_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type outerType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+     * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
      */
     public boolean hasOuterType() {
       return ((bitField0_ & 0x00000100) == 0x00000100);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+     * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getOuterType() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getOuterType() {
       return outerType_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+     * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getOuterTypeOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getOuterTypeOrBuilder() {
       return outerType_;
     }
 
@@ -6799,23 +6799,23 @@ public final class DebugProtoBuf {
     }
 
     public static final int ABBREVIATED_TYPE_FIELD_NUMBER = 13;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type abbreviatedType_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type abbreviatedType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+     * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
      */
     public boolean hasAbbreviatedType() {
       return ((bitField0_ & 0x00000400) == 0x00000400);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+     * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getAbbreviatedType() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getAbbreviatedType() {
       return abbreviatedType_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+     * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getAbbreviatedTypeOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getAbbreviatedTypeOrBuilder() {
       return abbreviatedType_;
     }
 
@@ -6861,15 +6861,15 @@ public final class DebugProtoBuf {
       argument_ = java.util.Collections.emptyList();
       nullable_ = false;
       flexibleTypeCapabilitiesId_ = 0;
-      flexibleUpperBound_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      flexibleUpperBound_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       flexibleUpperBoundId_ = 0;
       className_ = 0;
       typeParameter_ = 0;
       typeParameterName_ = 0;
       typeAliasName_ = 0;
-      outerType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      outerType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       outerTypeId_ = 0;
-      abbreviatedType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      abbreviatedType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       abbreviatedTypeId_ = 0;
       flags_ = 0;
     }
@@ -6915,7 +6915,7 @@ public final class DebugProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessage
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00001000) == 0x00001000)) {
         output.writeInt32(1, flags_);
@@ -7038,53 +7038,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Type parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -7093,7 +7093,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -7105,26 +7105,26 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Type}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Type}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Type)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Type)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Type_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Type_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -7159,7 +7159,7 @@ public final class DebugProtoBuf {
         flexibleTypeCapabilitiesId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
         if (flexibleUpperBoundBuilder_ == null) {
-          flexibleUpperBound_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          flexibleUpperBound_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           flexibleUpperBoundBuilder_.clear();
         }
@@ -7175,7 +7175,7 @@ public final class DebugProtoBuf {
         typeAliasName_ = 0;
         bitField0_ = (bitField0_ & ~0x00000100);
         if (outerTypeBuilder_ == null) {
-          outerType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          outerType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           outerTypeBuilder_.clear();
         }
@@ -7183,7 +7183,7 @@ public final class DebugProtoBuf {
         outerTypeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000400);
         if (abbreviatedTypeBuilder_ == null) {
-          abbreviatedType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          abbreviatedType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           abbreviatedTypeBuilder_.clear();
         }
@@ -7201,23 +7201,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Type_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Type_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Type result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Type result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Type result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Type(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Type result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.Type(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (argumentBuilder_ == null) {
@@ -7299,16 +7299,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Type) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Type)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.Type) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.Type)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) return this;
         if (argumentBuilder_ == null) {
           if (!other.argument_.isEmpty()) {
             if (argument_.isEmpty()) {
@@ -7415,11 +7415,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Type parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Type parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Type) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.Type) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -7430,22 +7430,22 @@ public final class DebugProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List argument_ =
+      private java.util.List argument_ =
         java.util.Collections.emptyList();
       private void ensureArgumentIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          argument_ = new java.util.ArrayList(argument_);
+          argument_ = new java.util.ArrayList(argument_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ArgumentOrBuilder> argumentBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.ArgumentOrBuilder> argumentBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
-      public java.util.List getArgumentList() {
+      public java.util.List getArgumentList() {
         if (argumentBuilder_ == null) {
           return java.util.Collections.unmodifiableList(argument_);
         } else {
@@ -7453,7 +7453,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public int getArgumentCount() {
         if (argumentBuilder_ == null) {
@@ -7463,9 +7463,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument getArgument(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument getArgument(int index) {
         if (argumentBuilder_ == null) {
           return argument_.get(index);
         } else {
@@ -7473,10 +7473,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument value) {
         if (argumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7490,10 +7490,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Builder builderForValue) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           argument_.set(index, builderForValue.build());
@@ -7504,9 +7504,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
-      public Builder addArgument(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument value) {
+      public Builder addArgument(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument value) {
         if (argumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7520,10 +7520,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument value) {
         if (argumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7537,10 +7537,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder addArgument(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Builder builderForValue) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           argument_.add(builderForValue.build());
@@ -7551,10 +7551,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Builder builderForValue) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           argument_.add(index, builderForValue.build());
@@ -7565,10 +7565,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder addAllArgument(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (argumentBuilder_ == null) {
           ensureArgumentIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -7580,7 +7580,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder clearArgument() {
         if (argumentBuilder_ == null) {
@@ -7593,7 +7593,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder removeArgument(int index) {
         if (argumentBuilder_ == null) {
@@ -7606,16 +7606,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder getArgumentBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Builder getArgumentBuilder(
           int index) {
         return getArgumentFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
           int index) {
         if (argumentBuilder_ == null) {
           return argument_.get(index);  } else {
@@ -7623,9 +7623,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getArgumentOrBuilderList() {
         if (argumentBuilder_ != null) {
           return argumentBuilder_.getMessageOrBuilderList();
@@ -7634,33 +7634,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder addArgumentBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Builder addArgumentBuilder() {
         return getArgumentFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder addArgumentBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Builder addArgumentBuilder(
           int index) {
         return getArgumentFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getArgumentBuilderList() {
         return getArgumentFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ArgumentOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.ArgumentOrBuilder> 
           getArgumentFieldBuilder() {
         if (argumentBuilder_ == null) {
           argumentBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.ArgumentOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.ArgumentOrBuilder>(
                   argument_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
@@ -7754,19 +7754,19 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type flexibleUpperBound_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type flexibleUpperBound_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> flexibleUpperBoundBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> flexibleUpperBoundBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
       public boolean hasFlexibleUpperBound() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getFlexibleUpperBound() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getFlexibleUpperBound() {
         if (flexibleUpperBoundBuilder_ == null) {
           return flexibleUpperBound_;
         } else {
@@ -7774,9 +7774,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
-      public Builder setFlexibleUpperBound(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder setFlexibleUpperBound(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (flexibleUpperBoundBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -7790,10 +7790,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
       public Builder setFlexibleUpperBound(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (flexibleUpperBoundBuilder_ == null) {
           flexibleUpperBound_ = builderForValue.build();
           onChanged();
@@ -7804,14 +7804,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
-      public Builder mergeFlexibleUpperBound(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeFlexibleUpperBound(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (flexibleUpperBoundBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              flexibleUpperBound_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              flexibleUpperBound_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) {
             flexibleUpperBound_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(flexibleUpperBound_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder(flexibleUpperBound_).mergeFrom(value).buildPartial();
           } else {
             flexibleUpperBound_ = value;
           }
@@ -7823,11 +7823,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
       public Builder clearFlexibleUpperBound() {
         if (flexibleUpperBoundBuilder_ == null) {
-          flexibleUpperBound_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          flexibleUpperBound_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           flexibleUpperBoundBuilder_.clear();
@@ -7836,17 +7836,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getFlexibleUpperBoundBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getFlexibleUpperBoundBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getFlexibleUpperBoundFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getFlexibleUpperBoundOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getFlexibleUpperBoundOrBuilder() {
         if (flexibleUpperBoundBuilder_ != null) {
           return flexibleUpperBoundBuilder_.getMessageOrBuilder();
         } else {
@@ -7854,14 +7854,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getFlexibleUpperBoundFieldBuilder() {
         if (flexibleUpperBoundBuilder_ == null) {
           flexibleUpperBoundBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   getFlexibleUpperBound(),
                   getParentForChildren(),
                   isClean());
@@ -8082,19 +8082,19 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type outerType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type outerType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> outerTypeBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> outerTypeBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
       public boolean hasOuterType() {
         return ((bitField0_ & 0x00000200) == 0x00000200);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getOuterType() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getOuterType() {
         if (outerTypeBuilder_ == null) {
           return outerType_;
         } else {
@@ -8102,9 +8102,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
-      public Builder setOuterType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder setOuterType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (outerTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8118,10 +8118,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
       public Builder setOuterType(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (outerTypeBuilder_ == null) {
           outerType_ = builderForValue.build();
           onChanged();
@@ -8132,14 +8132,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
-      public Builder mergeOuterType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeOuterType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (outerTypeBuilder_ == null) {
           if (((bitField0_ & 0x00000200) == 0x00000200) &&
-              outerType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              outerType_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) {
             outerType_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(outerType_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder(outerType_).mergeFrom(value).buildPartial();
           } else {
             outerType_ = value;
           }
@@ -8151,11 +8151,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
       public Builder clearOuterType() {
         if (outerTypeBuilder_ == null) {
-          outerType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          outerType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           outerTypeBuilder_.clear();
@@ -8164,17 +8164,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getOuterTypeBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getOuterTypeBuilder() {
         bitField0_ |= 0x00000200;
         onChanged();
         return getOuterTypeFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getOuterTypeOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getOuterTypeOrBuilder() {
         if (outerTypeBuilder_ != null) {
           return outerTypeBuilder_.getMessageOrBuilder();
         } else {
@@ -8182,14 +8182,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getOuterTypeFieldBuilder() {
         if (outerTypeBuilder_ == null) {
           outerTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   getOuterType(),
                   getParentForChildren(),
                   isClean());
@@ -8230,19 +8230,19 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type abbreviatedType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type abbreviatedType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> abbreviatedTypeBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> abbreviatedTypeBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
       public boolean hasAbbreviatedType() {
         return ((bitField0_ & 0x00000800) == 0x00000800);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getAbbreviatedType() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getAbbreviatedType() {
         if (abbreviatedTypeBuilder_ == null) {
           return abbreviatedType_;
         } else {
@@ -8250,9 +8250,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
-      public Builder setAbbreviatedType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder setAbbreviatedType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (abbreviatedTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -8266,10 +8266,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
       public Builder setAbbreviatedType(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (abbreviatedTypeBuilder_ == null) {
           abbreviatedType_ = builderForValue.build();
           onChanged();
@@ -8280,14 +8280,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
-      public Builder mergeAbbreviatedType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeAbbreviatedType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (abbreviatedTypeBuilder_ == null) {
           if (((bitField0_ & 0x00000800) == 0x00000800) &&
-              abbreviatedType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              abbreviatedType_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) {
             abbreviatedType_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(abbreviatedType_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder(abbreviatedType_).mergeFrom(value).buildPartial();
           } else {
             abbreviatedType_ = value;
           }
@@ -8299,11 +8299,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
       public Builder clearAbbreviatedType() {
         if (abbreviatedTypeBuilder_ == null) {
-          abbreviatedType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          abbreviatedType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           abbreviatedTypeBuilder_.clear();
@@ -8312,17 +8312,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getAbbreviatedTypeBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getAbbreviatedTypeBuilder() {
         bitField0_ |= 0x00000800;
         onChanged();
         return getAbbreviatedTypeFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getAbbreviatedTypeOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getAbbreviatedTypeOrBuilder() {
         if (abbreviatedTypeBuilder_ != null) {
           return abbreviatedTypeBuilder_.getMessageOrBuilder();
         } else {
@@ -8330,14 +8330,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getAbbreviatedTypeFieldBuilder() {
         if (abbreviatedTypeBuilder_ == null) {
           abbreviatedTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   getAbbreviatedType(),
                   getParentForChildren(),
                   isClean());
@@ -8426,7 +8426,7 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Type)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Type)
     }
 
     static {
@@ -8434,11 +8434,11 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Type)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Type)
   }
 
   public interface TypeParameterOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.TypeParameter)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.TypeParameter)
       org.jetbrains.kotlin.protobuf.GeneratedMessage.
           ExtendableMessageOrBuilder {
 
@@ -8470,36 +8470,36 @@ public final class DebugProtoBuf {
     boolean getReified();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
      */
     boolean hasVariance();
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance getVariance();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Variance getVariance();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
-    java.util.List 
+    java.util.List 
         getUpperBoundList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getUpperBound(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getUpperBound(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
     int getUpperBoundCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
-    java.util.List 
+    java.util.List 
         getUpperBoundOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
         int index);
 
     /**
@@ -8516,15 +8516,15 @@ public final class DebugProtoBuf {
     int getUpperBoundId(int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeParameter}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.TypeParameter}
    */
   public static final class TypeParameter extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
         TypeParameter> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.TypeParameter)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.TypeParameter)
       TypeParameterOrBuilder {
     // Use TypeParameter.newBuilder() to construct.
-    private TypeParameter(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+    private TypeParameter(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -8585,7 +8585,7 @@ public final class DebugProtoBuf {
             }
             case 32: {
               int rawValue = input.readEnum();
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance value = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance.valueOf(rawValue);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Variance value = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Variance.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(4, rawValue);
               } else {
@@ -8596,10 +8596,10 @@ public final class DebugProtoBuf {
             }
             case 42: {
               if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-                upperBound_ = new java.util.ArrayList();
+                upperBound_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
-              upperBound_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry));
+              upperBound_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry));
               break;
             }
             case 48: {
@@ -8643,14 +8643,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeParameter_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeParameter_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeParameter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -8669,7 +8669,7 @@ public final class DebugProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.TypeParameter.Variance}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.TypeParameter.Variance}
      */
     public enum Variance
         implements org.jetbrains.kotlin.protobuf.ProtocolMessageEnum {
@@ -8734,7 +8734,7 @@ public final class DebugProtoBuf {
       }
       public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDescriptor().getEnumTypes().get(0);
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final Variance[] VALUES = values();
@@ -8756,7 +8756,7 @@ public final class DebugProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.TypeParameter.Variance)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.TypeParameter.Variance)
     }
 
     private int bitField0_;
@@ -8806,51 +8806,51 @@ public final class DebugProtoBuf {
     }
 
     public static final int VARIANCE_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance variance_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Variance variance_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
      */
     public boolean hasVariance() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance getVariance() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Variance getVariance() {
       return variance_;
     }
 
     public static final int UPPER_BOUND_FIELD_NUMBER = 5;
-    private java.util.List upperBound_;
+    private java.util.List upperBound_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
-    public java.util.List getUpperBoundList() {
+    public java.util.List getUpperBoundList() {
       return upperBound_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
-    public java.util.List 
+    public java.util.List 
         getUpperBoundOrBuilderList() {
       return upperBound_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
     public int getUpperBoundCount() {
       return upperBound_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getUpperBound(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getUpperBound(int index) {
       return upperBound_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
         int index) {
       return upperBound_.get(index);
     }
@@ -8881,7 +8881,7 @@ public final class DebugProtoBuf {
       id_ = 0;
       name_ = 0;
       reified_ = false;
-      variance_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance.INV;
+      variance_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Variance.INV;
       upperBound_ = java.util.Collections.emptyList();
       upperBoundId_ = java.util.Collections.emptyList();
     }
@@ -8917,7 +8917,7 @@ public final class DebugProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessage
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, id_);
@@ -8989,53 +8989,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -9044,7 +9044,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -9056,26 +9056,26 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeParameter}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.TypeParameter}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.TypeParameter)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.TypeParameter)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeParameter_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeParameter_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeParameter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -9102,7 +9102,7 @@ public final class DebugProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000002);
         reified_ = false;
         bitField0_ = (bitField0_ & ~0x00000004);
-        variance_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance.INV;
+        variance_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Variance.INV;
         bitField0_ = (bitField0_ & ~0x00000008);
         if (upperBoundBuilder_ == null) {
           upperBound_ = java.util.Collections.emptyList();
@@ -9121,23 +9121,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeParameter_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -9176,16 +9176,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.getDefaultInstance()) return this;
         if (other.hasId()) {
           setId(other.getId());
         }
@@ -9265,11 +9265,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -9376,23 +9376,23 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance variance_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance.INV;
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Variance variance_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Variance.INV;
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
        */
       public boolean hasVariance() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance getVariance() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Variance getVariance() {
         return variance_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
        */
-      public Builder setVariance(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance value) {
+      public Builder setVariance(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Variance value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -9402,31 +9402,31 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
        */
       public Builder clearVariance() {
         bitField0_ = (bitField0_ & ~0x00000008);
-        variance_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Variance.INV;
+        variance_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Variance.INV;
         onChanged();
         return this;
       }
 
-      private java.util.List upperBound_ =
+      private java.util.List upperBound_ =
         java.util.Collections.emptyList();
       private void ensureUpperBoundIsMutable() {
         if (!((bitField0_ & 0x00000010) == 0x00000010)) {
-          upperBound_ = new java.util.ArrayList(upperBound_);
+          upperBound_ = new java.util.ArrayList(upperBound_);
           bitField0_ |= 0x00000010;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> upperBoundBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> upperBoundBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
-      public java.util.List getUpperBoundList() {
+      public java.util.List getUpperBoundList() {
         if (upperBoundBuilder_ == null) {
           return java.util.Collections.unmodifiableList(upperBound_);
         } else {
@@ -9434,7 +9434,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public int getUpperBoundCount() {
         if (upperBoundBuilder_ == null) {
@@ -9444,9 +9444,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getUpperBound(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getUpperBound(int index) {
         if (upperBoundBuilder_ == null) {
           return upperBound_.get(index);
         } else {
@@ -9454,10 +9454,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder setUpperBound(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (upperBoundBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9471,10 +9471,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder setUpperBound(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (upperBoundBuilder_ == null) {
           ensureUpperBoundIsMutable();
           upperBound_.set(index, builderForValue.build());
@@ -9485,9 +9485,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
-      public Builder addUpperBound(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder addUpperBound(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (upperBoundBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9501,10 +9501,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder addUpperBound(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (upperBoundBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -9518,10 +9518,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder addUpperBound(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (upperBoundBuilder_ == null) {
           ensureUpperBoundIsMutable();
           upperBound_.add(builderForValue.build());
@@ -9532,10 +9532,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder addUpperBound(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (upperBoundBuilder_ == null) {
           ensureUpperBoundIsMutable();
           upperBound_.add(index, builderForValue.build());
@@ -9546,10 +9546,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder addAllUpperBound(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (upperBoundBuilder_ == null) {
           ensureUpperBoundIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -9561,7 +9561,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder clearUpperBound() {
         if (upperBoundBuilder_ == null) {
@@ -9574,7 +9574,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder removeUpperBound(int index) {
         if (upperBoundBuilder_ == null) {
@@ -9587,16 +9587,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getUpperBoundBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getUpperBoundBuilder(
           int index) {
         return getUpperBoundFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
           int index) {
         if (upperBoundBuilder_ == null) {
           return upperBound_.get(index);  } else {
@@ -9604,9 +9604,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
-      public java.util.List 
+      public java.util.List 
            getUpperBoundOrBuilderList() {
         if (upperBoundBuilder_ != null) {
           return upperBoundBuilder_.getMessageOrBuilderList();
@@ -9615,33 +9615,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder addUpperBoundBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder addUpperBoundBuilder() {
         return getUpperBoundFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder addUpperBoundBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder addUpperBoundBuilder(
           int index) {
         return getUpperBoundFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
-      public java.util.List 
+      public java.util.List 
            getUpperBoundBuilderList() {
         return getUpperBoundFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getUpperBoundFieldBuilder() {
         if (upperBoundBuilder_ == null) {
           upperBoundBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   upperBound_,
                   ((bitField0_ & 0x00000010) == 0x00000010),
                   getParentForChildren(),
@@ -9717,7 +9717,7 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.TypeParameter)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.TypeParameter)
     }
 
     static {
@@ -9725,11 +9725,11 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.TypeParameter)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.TypeParameter)
   }
 
   public interface ClassOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Class)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Class)
       org.jetbrains.kotlin.protobuf.GeneratedMessage.
           ExtendableMessageOrBuilder {
 
@@ -9781,51 +9781,51 @@ public final class DebugProtoBuf {
     int getCompanionObjectName();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter getTypeParameter(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
     int getTypeParameterCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index);
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
-    java.util.List 
+    java.util.List 
         getSupertypeList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getSupertype(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getSupertype(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
     int getSupertypeCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
-    java.util.List 
+    java.util.List 
         getSupertypeOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
         int index);
 
     /**
@@ -9855,123 +9855,123 @@ public final class DebugProtoBuf {
     int getNestedClassName(int index);
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
-    java.util.List 
+    java.util.List 
         getConstructorList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor getConstructor(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor getConstructor(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
     int getConstructorCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
-    java.util.List 
+    java.util.List 
         getConstructorOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder getConstructorOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.ConstructorOrBuilder getConstructorOrBuilder(
         int index);
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
-    java.util.List 
+    java.util.List 
         getFunctionList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Function getFunction(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Function getFunction(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
     int getFunctionCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
-    java.util.List 
+    java.util.List 
         getFunctionOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
         int index);
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
-    java.util.List 
+    java.util.List 
         getPropertyList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Property getProperty(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Property getProperty(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
     int getPropertyCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
-    java.util.List 
+    java.util.List 
         getPropertyOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
         int index);
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
-    java.util.List 
+    java.util.List 
         getTypeAliasList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias getTypeAlias(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias getTypeAlias(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
     int getTypeAliasCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
-    java.util.List 
+    java.util.List 
         getTypeAliasOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
         int index);
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
-    java.util.List 
+    java.util.List 
         getEnumEntryList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry getEnumEntry(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry getEnumEntry(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
     int getEnumEntryCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
-    java.util.List 
+    java.util.List 
         getEnumEntryOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntryOrBuilder getEnumEntryOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntryOrBuilder getEnumEntryOrBuilder(
         int index);
 
     /**
@@ -9988,17 +9988,17 @@ public final class DebugProtoBuf {
     int getSealedSubclassFqName(int index);
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
     boolean hasTypeTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable getTypeTable();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable getTypeTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder();
 
     /**
      * optional int32 version_requirement = 31;
@@ -10018,28 +10018,28 @@ public final class DebugProtoBuf {
     int getVersionRequirement();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
     boolean hasVersionRequirementTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable getVersionRequirementTable();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable getVersionRequirementTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTableOrBuilder getVersionRequirementTableOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTableOrBuilder getVersionRequirementTableOrBuilder();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Class}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Class}
    */
   public static final class Class extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
         Class> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Class)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Class)
       ClassOrBuilder {
     // Use Class.newBuilder() to construct.
-    private Class(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+    private Class(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -10121,18 +10121,18 @@ public final class DebugProtoBuf {
             }
             case 42: {
               if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                typeParameter_ = new java.util.ArrayList();
+                typeParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000008;
               }
-              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry));
+              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry));
               break;
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-                supertype_ = new java.util.ArrayList();
+                supertype_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
-              supertype_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry));
+              supertype_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry));
               break;
             }
             case 56: {
@@ -10158,42 +10158,42 @@ public final class DebugProtoBuf {
             }
             case 66: {
               if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
-                constructor_ = new java.util.ArrayList();
+                constructor_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000080;
               }
-              constructor_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.PARSER, extensionRegistry));
+              constructor_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.PARSER, extensionRegistry));
               break;
             }
             case 74: {
               if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
-                function_ = new java.util.ArrayList();
+                function_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000100;
               }
-              function_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.PARSER, extensionRegistry));
+              function_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.PARSER, extensionRegistry));
               break;
             }
             case 82: {
               if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
-                property_ = new java.util.ArrayList();
+                property_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000200;
               }
-              property_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.PARSER, extensionRegistry));
+              property_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.PARSER, extensionRegistry));
               break;
             }
             case 90: {
               if (!((mutable_bitField0_ & 0x00000400) == 0x00000400)) {
-                typeAlias_ = new java.util.ArrayList();
+                typeAlias_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000400;
               }
-              typeAlias_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.PARSER, extensionRegistry));
+              typeAlias_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.PARSER, extensionRegistry));
               break;
             }
             case 106: {
               if (!((mutable_bitField0_ & 0x00000800) == 0x00000800)) {
-                enumEntry_ = new java.util.ArrayList();
+                enumEntry_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000800;
               }
-              enumEntry_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.PARSER, extensionRegistry));
+              enumEntry_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.PARSER, extensionRegistry));
               break;
             }
             case 128: {
@@ -10218,11 +10218,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 242: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = typeTable_.toBuilder();
               }
-              typeTable_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.PARSER, extensionRegistry);
+              typeTable_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(typeTable_);
                 typeTable_ = subBuilder.buildPartial();
@@ -10236,11 +10236,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 258: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000020) == 0x00000020)) {
                 subBuilder = versionRequirementTable_.toBuilder();
               }
-              versionRequirementTable_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.PARSER, extensionRegistry);
+              versionRequirementTable_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(versionRequirementTable_);
                 versionRequirementTable_ = subBuilder.buildPartial();
@@ -10292,14 +10292,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Class_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Class_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -10318,7 +10318,7 @@ public final class DebugProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.Class.Kind}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.Class.Kind}
      */
     public enum Kind
         implements org.jetbrains.kotlin.protobuf.ProtocolMessageEnum {
@@ -10427,7 +10427,7 @@ public final class DebugProtoBuf {
       }
       public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDescriptor().getEnumTypes().get(0);
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final Kind[] VALUES = values();
@@ -10449,7 +10449,7 @@ public final class DebugProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Class.Kind)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Class.Kind)
     }
 
     private int bitField0_;
@@ -10519,71 +10519,71 @@ public final class DebugProtoBuf {
     }
 
     public static final int TYPE_PARAMETER_FIELD_NUMBER = 5;
-    private java.util.List typeParameter_;
+    private java.util.List typeParameter_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
-    public java.util.List getTypeParameterList() {
+    public java.util.List getTypeParameterList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeParameterOrBuilderList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
     public int getTypeParameterCount() {
       return typeParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
       return typeParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index) {
       return typeParameter_.get(index);
     }
 
     public static final int SUPERTYPE_FIELD_NUMBER = 6;
-    private java.util.List supertype_;
+    private java.util.List supertype_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
-    public java.util.List getSupertypeList() {
+    public java.util.List getSupertypeList() {
       return supertype_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
-    public java.util.List 
+    public java.util.List 
         getSupertypeOrBuilderList() {
       return supertype_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
     public int getSupertypeCount() {
       return supertype_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getSupertype(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getSupertype(int index) {
       return supertype_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
         int index) {
       return supertype_.get(index);
     }
@@ -10635,176 +10635,176 @@ public final class DebugProtoBuf {
     private int nestedClassNameMemoizedSerializedSize = -1;
 
     public static final int CONSTRUCTOR_FIELD_NUMBER = 8;
-    private java.util.List constructor_;
+    private java.util.List constructor_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
-    public java.util.List getConstructorList() {
+    public java.util.List getConstructorList() {
       return constructor_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
-    public java.util.List 
+    public java.util.List 
         getConstructorOrBuilderList() {
       return constructor_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
     public int getConstructorCount() {
       return constructor_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor getConstructor(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor getConstructor(int index) {
       return constructor_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder getConstructorOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.ConstructorOrBuilder getConstructorOrBuilder(
         int index) {
       return constructor_.get(index);
     }
 
     public static final int FUNCTION_FIELD_NUMBER = 9;
-    private java.util.List function_;
+    private java.util.List function_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
-    public java.util.List getFunctionList() {
+    public java.util.List getFunctionList() {
       return function_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
-    public java.util.List 
+    public java.util.List 
         getFunctionOrBuilderList() {
       return function_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
     public int getFunctionCount() {
       return function_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Function getFunction(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Function getFunction(int index) {
       return function_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
         int index) {
       return function_.get(index);
     }
 
     public static final int PROPERTY_FIELD_NUMBER = 10;
-    private java.util.List property_;
+    private java.util.List property_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
-    public java.util.List getPropertyList() {
+    public java.util.List getPropertyList() {
       return property_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
-    public java.util.List 
+    public java.util.List 
         getPropertyOrBuilderList() {
       return property_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
     public int getPropertyCount() {
       return property_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Property getProperty(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Property getProperty(int index) {
       return property_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
         int index) {
       return property_.get(index);
     }
 
     public static final int TYPE_ALIAS_FIELD_NUMBER = 11;
-    private java.util.List typeAlias_;
+    private java.util.List typeAlias_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
-    public java.util.List getTypeAliasList() {
+    public java.util.List getTypeAliasList() {
       return typeAlias_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeAliasOrBuilderList() {
       return typeAlias_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
     public int getTypeAliasCount() {
       return typeAlias_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias getTypeAlias(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias getTypeAlias(int index) {
       return typeAlias_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
         int index) {
       return typeAlias_.get(index);
     }
 
     public static final int ENUM_ENTRY_FIELD_NUMBER = 13;
-    private java.util.List enumEntry_;
+    private java.util.List enumEntry_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
-    public java.util.List getEnumEntryList() {
+    public java.util.List getEnumEntryList() {
       return enumEntry_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
-    public java.util.List 
+    public java.util.List 
         getEnumEntryOrBuilderList() {
       return enumEntry_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
     public int getEnumEntryCount() {
       return enumEntry_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry getEnumEntry(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry getEnumEntry(int index) {
       return enumEntry_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntryOrBuilder getEnumEntryOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntryOrBuilder getEnumEntryOrBuilder(
         int index) {
       return enumEntry_.get(index);
     }
@@ -10833,23 +10833,23 @@ public final class DebugProtoBuf {
     private int sealedSubclassFqNameMemoizedSerializedSize = -1;
 
     public static final int TYPE_TABLE_FIELD_NUMBER = 30;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable typeTable_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable typeTable_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
     public boolean hasTypeTable() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable getTypeTable() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable getTypeTable() {
       return typeTable_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder() {
       return typeTable_;
     }
 
@@ -10877,23 +10877,23 @@ public final class DebugProtoBuf {
     }
 
     public static final int VERSION_REQUIREMENT_TABLE_FIELD_NUMBER = 32;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable versionRequirementTable_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable versionRequirementTable_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
     public boolean hasVersionRequirementTable() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable getVersionRequirementTable() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable getVersionRequirementTable() {
       return versionRequirementTable_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTableOrBuilder getVersionRequirementTableOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTableOrBuilder getVersionRequirementTableOrBuilder() {
       return versionRequirementTable_;
     }
 
@@ -10911,9 +10911,9 @@ public final class DebugProtoBuf {
       typeAlias_ = java.util.Collections.emptyList();
       enumEntry_ = java.util.Collections.emptyList();
       sealedSubclassFqName_ = java.util.Collections.emptyList();
-      typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
+      typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
       versionRequirement_ = 0;
-      versionRequirementTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
+      versionRequirementTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -10985,7 +10985,7 @@ public final class DebugProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessage
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, flags_);
@@ -11164,53 +11164,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Class parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Class parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Class parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Class parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Class parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Class parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Class parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Class parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Class parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Class parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -11219,7 +11219,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.Class prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -11231,26 +11231,26 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Class}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Class}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Class)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Class, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Class)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.ClassOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Class_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Class_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -11334,7 +11334,7 @@ public final class DebugProtoBuf {
         sealedSubclassFqName_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00001000);
         if (typeTableBuilder_ == null) {
-          typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
+          typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
         } else {
           typeTableBuilder_.clear();
         }
@@ -11342,7 +11342,7 @@ public final class DebugProtoBuf {
         versionRequirement_ = 0;
         bitField0_ = (bitField0_ & ~0x00004000);
         if (versionRequirementTableBuilder_ == null) {
-          versionRequirementTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
+          versionRequirementTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
         } else {
           versionRequirementTableBuilder_.clear();
         }
@@ -11356,23 +11356,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Class_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Class_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Class getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Class result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Class build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Class result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Class result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Class(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Class buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Class result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.Class(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -11491,16 +11491,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Class) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Class)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.Class) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.Class)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.Class other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -11800,11 +11800,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Class parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Class parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Class) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.Class) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -11951,22 +11951,22 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private java.util.List typeParameter_ =
+      private java.util.List typeParameter_ =
         java.util.Collections.emptyList();
       private void ensureTypeParameterIsMutable() {
         if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-          typeParameter_ = new java.util.ArrayList(typeParameter_);
+          typeParameter_ = new java.util.ArrayList(typeParameter_);
           bitField0_ |= 0x00000008;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
-      public java.util.List getTypeParameterList() {
+      public java.util.List getTypeParameterList() {
         if (typeParameterBuilder_ == null) {
           return java.util.Collections.unmodifiableList(typeParameter_);
         } else {
@@ -11974,7 +11974,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public int getTypeParameterCount() {
         if (typeParameterBuilder_ == null) {
@@ -11984,9 +11984,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
         if (typeParameterBuilder_ == null) {
           return typeParameter_.get(index);
         } else {
@@ -11994,10 +11994,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12011,10 +12011,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.set(index, builderForValue.build());
@@ -12025,9 +12025,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
-      public Builder addTypeParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
+      public Builder addTypeParameter(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12041,10 +12041,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12058,10 +12058,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder addTypeParameter(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.add(builderForValue.build());
@@ -12072,10 +12072,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.add(index, builderForValue.build());
@@ -12086,10 +12086,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder addAllTypeParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -12101,7 +12101,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder clearTypeParameter() {
         if (typeParameterBuilder_ == null) {
@@ -12114,7 +12114,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder removeTypeParameter(int index) {
         if (typeParameterBuilder_ == null) {
@@ -12127,16 +12127,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder(
           int index) {
         return getTypeParameterFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
           int index) {
         if (typeParameterBuilder_ == null) {
           return typeParameter_.get(index);  } else {
@@ -12144,9 +12144,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeParameterOrBuilderList() {
         if (typeParameterBuilder_ != null) {
           return typeParameterBuilder_.getMessageOrBuilderList();
@@ -12155,33 +12155,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() {
         return getTypeParameterFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder(
           int index) {
         return getTypeParameterFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeParameterBuilderList() {
         return getTypeParameterFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder> 
           getTypeParameterFieldBuilder() {
         if (typeParameterBuilder_ == null) {
           typeParameterBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder>(
                   typeParameter_,
                   ((bitField0_ & 0x00000008) == 0x00000008),
                   getParentForChildren(),
@@ -12191,22 +12191,22 @@ public final class DebugProtoBuf {
         return typeParameterBuilder_;
       }
 
-      private java.util.List supertype_ =
+      private java.util.List supertype_ =
         java.util.Collections.emptyList();
       private void ensureSupertypeIsMutable() {
         if (!((bitField0_ & 0x00000010) == 0x00000010)) {
-          supertype_ = new java.util.ArrayList(supertype_);
+          supertype_ = new java.util.ArrayList(supertype_);
           bitField0_ |= 0x00000010;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> supertypeBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> supertypeBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
-      public java.util.List getSupertypeList() {
+      public java.util.List getSupertypeList() {
         if (supertypeBuilder_ == null) {
           return java.util.Collections.unmodifiableList(supertype_);
         } else {
@@ -12214,7 +12214,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public int getSupertypeCount() {
         if (supertypeBuilder_ == null) {
@@ -12224,9 +12224,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getSupertype(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getSupertype(int index) {
         if (supertypeBuilder_ == null) {
           return supertype_.get(index);
         } else {
@@ -12234,10 +12234,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder setSupertype(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (supertypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12251,10 +12251,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder setSupertype(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (supertypeBuilder_ == null) {
           ensureSupertypeIsMutable();
           supertype_.set(index, builderForValue.build());
@@ -12265,9 +12265,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
-      public Builder addSupertype(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder addSupertype(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (supertypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12281,10 +12281,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder addSupertype(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (supertypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12298,10 +12298,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder addSupertype(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (supertypeBuilder_ == null) {
           ensureSupertypeIsMutable();
           supertype_.add(builderForValue.build());
@@ -12312,10 +12312,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder addSupertype(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (supertypeBuilder_ == null) {
           ensureSupertypeIsMutable();
           supertype_.add(index, builderForValue.build());
@@ -12326,10 +12326,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder addAllSupertype(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (supertypeBuilder_ == null) {
           ensureSupertypeIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -12341,7 +12341,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder clearSupertype() {
         if (supertypeBuilder_ == null) {
@@ -12354,7 +12354,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder removeSupertype(int index) {
         if (supertypeBuilder_ == null) {
@@ -12367,16 +12367,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getSupertypeBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getSupertypeBuilder(
           int index) {
         return getSupertypeFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
           int index) {
         if (supertypeBuilder_ == null) {
           return supertype_.get(index);  } else {
@@ -12384,9 +12384,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
-      public java.util.List 
+      public java.util.List 
            getSupertypeOrBuilderList() {
         if (supertypeBuilder_ != null) {
           return supertypeBuilder_.getMessageOrBuilderList();
@@ -12395,33 +12395,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder addSupertypeBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder addSupertypeBuilder() {
         return getSupertypeFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder addSupertypeBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder addSupertypeBuilder(
           int index) {
         return getSupertypeFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
-      public java.util.List 
+      public java.util.List 
            getSupertypeBuilderList() {
         return getSupertypeFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getSupertypeFieldBuilder() {
         if (supertypeBuilder_ == null) {
           supertypeBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   supertype_,
                   ((bitField0_ & 0x00000010) == 0x00000010),
                   getParentForChildren(),
@@ -12563,22 +12563,22 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private java.util.List constructor_ =
+      private java.util.List constructor_ =
         java.util.Collections.emptyList();
       private void ensureConstructorIsMutable() {
         if (!((bitField0_ & 0x00000080) == 0x00000080)) {
-          constructor_ = new java.util.ArrayList(constructor_);
+          constructor_ = new java.util.ArrayList(constructor_);
           bitField0_ |= 0x00000080;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder> constructorBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor, org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ConstructorOrBuilder> constructorBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
-      public java.util.List getConstructorList() {
+      public java.util.List getConstructorList() {
         if (constructorBuilder_ == null) {
           return java.util.Collections.unmodifiableList(constructor_);
         } else {
@@ -12586,7 +12586,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public int getConstructorCount() {
         if (constructorBuilder_ == null) {
@@ -12596,9 +12596,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor getConstructor(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor getConstructor(int index) {
         if (constructorBuilder_ == null) {
           return constructor_.get(index);
         } else {
@@ -12606,10 +12606,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder setConstructor(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor value) {
         if (constructorBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12623,10 +12623,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder setConstructor(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.Builder builderForValue) {
         if (constructorBuilder_ == null) {
           ensureConstructorIsMutable();
           constructor_.set(index, builderForValue.build());
@@ -12637,9 +12637,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
-      public Builder addConstructor(org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor value) {
+      public Builder addConstructor(org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor value) {
         if (constructorBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12653,10 +12653,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder addConstructor(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor value) {
         if (constructorBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12670,10 +12670,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder addConstructor(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.Builder builderForValue) {
         if (constructorBuilder_ == null) {
           ensureConstructorIsMutable();
           constructor_.add(builderForValue.build());
@@ -12684,10 +12684,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder addConstructor(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.Builder builderForValue) {
         if (constructorBuilder_ == null) {
           ensureConstructorIsMutable();
           constructor_.add(index, builderForValue.build());
@@ -12698,10 +12698,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder addAllConstructor(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (constructorBuilder_ == null) {
           ensureConstructorIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -12713,7 +12713,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder clearConstructor() {
         if (constructorBuilder_ == null) {
@@ -12726,7 +12726,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder removeConstructor(int index) {
         if (constructorBuilder_ == null) {
@@ -12739,16 +12739,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder getConstructorBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.Builder getConstructorBuilder(
           int index) {
         return getConstructorFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder getConstructorOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ConstructorOrBuilder getConstructorOrBuilder(
           int index) {
         if (constructorBuilder_ == null) {
           return constructor_.get(index);  } else {
@@ -12756,9 +12756,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
-      public java.util.List 
+      public java.util.List 
            getConstructorOrBuilderList() {
         if (constructorBuilder_ != null) {
           return constructorBuilder_.getMessageOrBuilderList();
@@ -12767,33 +12767,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder addConstructorBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.Builder addConstructorBuilder() {
         return getConstructorFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder addConstructorBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.Builder addConstructorBuilder(
           int index) {
         return getConstructorFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
-      public java.util.List 
+      public java.util.List 
            getConstructorBuilderList() {
         return getConstructorFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor, org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ConstructorOrBuilder> 
           getConstructorFieldBuilder() {
         if (constructorBuilder_ == null) {
           constructorBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor, org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ConstructorOrBuilder>(
                   constructor_,
                   ((bitField0_ & 0x00000080) == 0x00000080),
                   getParentForChildren(),
@@ -12803,22 +12803,22 @@ public final class DebugProtoBuf {
         return constructorBuilder_;
       }
 
-      private java.util.List function_ =
+      private java.util.List function_ =
         java.util.Collections.emptyList();
       private void ensureFunctionIsMutable() {
         if (!((bitField0_ & 0x00000100) == 0x00000100)) {
-          function_ = new java.util.ArrayList(function_);
+          function_ = new java.util.ArrayList(function_);
           bitField0_ |= 0x00000100;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Function, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder> functionBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Function, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.FunctionOrBuilder> functionBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
-      public java.util.List getFunctionList() {
+      public java.util.List getFunctionList() {
         if (functionBuilder_ == null) {
           return java.util.Collections.unmodifiableList(function_);
         } else {
@@ -12826,7 +12826,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public int getFunctionCount() {
         if (functionBuilder_ == null) {
@@ -12836,9 +12836,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Function getFunction(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Function getFunction(int index) {
         if (functionBuilder_ == null) {
           return function_.get(index);
         } else {
@@ -12846,10 +12846,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder setFunction(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function value) {
         if (functionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12863,10 +12863,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder setFunction(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder builderForValue) {
         if (functionBuilder_ == null) {
           ensureFunctionIsMutable();
           function_.set(index, builderForValue.build());
@@ -12877,9 +12877,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
-      public Builder addFunction(org.jetbrains.kotlin.serialization.DebugProtoBuf.Function value) {
+      public Builder addFunction(org.jetbrains.kotlin.metadata.DebugProtoBuf.Function value) {
         if (functionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12893,10 +12893,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder addFunction(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function value) {
         if (functionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -12910,10 +12910,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder addFunction(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder builderForValue) {
         if (functionBuilder_ == null) {
           ensureFunctionIsMutable();
           function_.add(builderForValue.build());
@@ -12924,10 +12924,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder addFunction(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder builderForValue) {
         if (functionBuilder_ == null) {
           ensureFunctionIsMutable();
           function_.add(index, builderForValue.build());
@@ -12938,10 +12938,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder addAllFunction(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (functionBuilder_ == null) {
           ensureFunctionIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -12953,7 +12953,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder clearFunction() {
         if (functionBuilder_ == null) {
@@ -12966,7 +12966,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder removeFunction(int index) {
         if (functionBuilder_ == null) {
@@ -12979,16 +12979,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder getFunctionBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder getFunctionBuilder(
           int index) {
         return getFunctionFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
           int index) {
         if (functionBuilder_ == null) {
           return function_.get(index);  } else {
@@ -12996,9 +12996,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
-      public java.util.List 
+      public java.util.List 
            getFunctionOrBuilderList() {
         if (functionBuilder_ != null) {
           return functionBuilder_.getMessageOrBuilderList();
@@ -13007,33 +13007,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder addFunctionBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder addFunctionBuilder() {
         return getFunctionFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder addFunctionBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder addFunctionBuilder(
           int index) {
         return getFunctionFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
-      public java.util.List 
+      public java.util.List 
            getFunctionBuilderList() {
         return getFunctionFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Function, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Function, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.FunctionOrBuilder> 
           getFunctionFieldBuilder() {
         if (functionBuilder_ == null) {
           functionBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Function, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Function, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.FunctionOrBuilder>(
                   function_,
                   ((bitField0_ & 0x00000100) == 0x00000100),
                   getParentForChildren(),
@@ -13043,22 +13043,22 @@ public final class DebugProtoBuf {
         return functionBuilder_;
       }
 
-      private java.util.List property_ =
+      private java.util.List property_ =
         java.util.Collections.emptyList();
       private void ensurePropertyIsMutable() {
         if (!((bitField0_ & 0x00000200) == 0x00000200)) {
-          property_ = new java.util.ArrayList(property_);
+          property_ = new java.util.ArrayList(property_);
           bitField0_ |= 0x00000200;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Property, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder> propertyBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Property, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.PropertyOrBuilder> propertyBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
-      public java.util.List getPropertyList() {
+      public java.util.List getPropertyList() {
         if (propertyBuilder_ == null) {
           return java.util.Collections.unmodifiableList(property_);
         } else {
@@ -13066,7 +13066,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public int getPropertyCount() {
         if (propertyBuilder_ == null) {
@@ -13076,9 +13076,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Property getProperty(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Property getProperty(int index) {
         if (propertyBuilder_ == null) {
           return property_.get(index);
         } else {
@@ -13086,10 +13086,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder setProperty(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property value) {
         if (propertyBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13103,10 +13103,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder setProperty(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder builderForValue) {
         if (propertyBuilder_ == null) {
           ensurePropertyIsMutable();
           property_.set(index, builderForValue.build());
@@ -13117,9 +13117,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
-      public Builder addProperty(org.jetbrains.kotlin.serialization.DebugProtoBuf.Property value) {
+      public Builder addProperty(org.jetbrains.kotlin.metadata.DebugProtoBuf.Property value) {
         if (propertyBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13133,10 +13133,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder addProperty(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property value) {
         if (propertyBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13150,10 +13150,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder addProperty(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder builderForValue) {
         if (propertyBuilder_ == null) {
           ensurePropertyIsMutable();
           property_.add(builderForValue.build());
@@ -13164,10 +13164,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder addProperty(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder builderForValue) {
         if (propertyBuilder_ == null) {
           ensurePropertyIsMutable();
           property_.add(index, builderForValue.build());
@@ -13178,10 +13178,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder addAllProperty(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (propertyBuilder_ == null) {
           ensurePropertyIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -13193,7 +13193,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder clearProperty() {
         if (propertyBuilder_ == null) {
@@ -13206,7 +13206,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder removeProperty(int index) {
         if (propertyBuilder_ == null) {
@@ -13219,16 +13219,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder getPropertyBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder getPropertyBuilder(
           int index) {
         return getPropertyFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
           int index) {
         if (propertyBuilder_ == null) {
           return property_.get(index);  } else {
@@ -13236,9 +13236,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
-      public java.util.List 
+      public java.util.List 
            getPropertyOrBuilderList() {
         if (propertyBuilder_ != null) {
           return propertyBuilder_.getMessageOrBuilderList();
@@ -13247,33 +13247,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder addPropertyBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder addPropertyBuilder() {
         return getPropertyFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder addPropertyBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder addPropertyBuilder(
           int index) {
         return getPropertyFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
-      public java.util.List 
+      public java.util.List 
            getPropertyBuilderList() {
         return getPropertyFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Property, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Property, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.PropertyOrBuilder> 
           getPropertyFieldBuilder() {
         if (propertyBuilder_ == null) {
           propertyBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Property, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Property, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.PropertyOrBuilder>(
                   property_,
                   ((bitField0_ & 0x00000200) == 0x00000200),
                   getParentForChildren(),
@@ -13283,22 +13283,22 @@ public final class DebugProtoBuf {
         return propertyBuilder_;
       }
 
-      private java.util.List typeAlias_ =
+      private java.util.List typeAlias_ =
         java.util.Collections.emptyList();
       private void ensureTypeAliasIsMutable() {
         if (!((bitField0_ & 0x00000400) == 0x00000400)) {
-          typeAlias_ = new java.util.ArrayList(typeAlias_);
+          typeAlias_ = new java.util.ArrayList(typeAlias_);
           bitField0_ |= 0x00000400;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder> typeAliasBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAliasOrBuilder> typeAliasBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
-      public java.util.List getTypeAliasList() {
+      public java.util.List getTypeAliasList() {
         if (typeAliasBuilder_ == null) {
           return java.util.Collections.unmodifiableList(typeAlias_);
         } else {
@@ -13306,7 +13306,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public int getTypeAliasCount() {
         if (typeAliasBuilder_ == null) {
@@ -13316,9 +13316,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias getTypeAlias(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias getTypeAlias(int index) {
         if (typeAliasBuilder_ == null) {
           return typeAlias_.get(index);
         } else {
@@ -13326,10 +13326,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder setTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias value) {
         if (typeAliasBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13343,10 +13343,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder setTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder builderForValue) {
         if (typeAliasBuilder_ == null) {
           ensureTypeAliasIsMutable();
           typeAlias_.set(index, builderForValue.build());
@@ -13357,9 +13357,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
-      public Builder addTypeAlias(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias value) {
+      public Builder addTypeAlias(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias value) {
         if (typeAliasBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13373,10 +13373,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder addTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias value) {
         if (typeAliasBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13390,10 +13390,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder addTypeAlias(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder builderForValue) {
         if (typeAliasBuilder_ == null) {
           ensureTypeAliasIsMutable();
           typeAlias_.add(builderForValue.build());
@@ -13404,10 +13404,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder addTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder builderForValue) {
         if (typeAliasBuilder_ == null) {
           ensureTypeAliasIsMutable();
           typeAlias_.add(index, builderForValue.build());
@@ -13418,10 +13418,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder addAllTypeAlias(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (typeAliasBuilder_ == null) {
           ensureTypeAliasIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -13433,7 +13433,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder clearTypeAlias() {
         if (typeAliasBuilder_ == null) {
@@ -13446,7 +13446,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder removeTypeAlias(int index) {
         if (typeAliasBuilder_ == null) {
@@ -13459,16 +13459,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder getTypeAliasBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder getTypeAliasBuilder(
           int index) {
         return getTypeAliasFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
           int index) {
         if (typeAliasBuilder_ == null) {
           return typeAlias_.get(index);  } else {
@@ -13476,9 +13476,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeAliasOrBuilderList() {
         if (typeAliasBuilder_ != null) {
           return typeAliasBuilder_.getMessageOrBuilderList();
@@ -13487,33 +13487,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder addTypeAliasBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder addTypeAliasBuilder() {
         return getTypeAliasFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder addTypeAliasBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder addTypeAliasBuilder(
           int index) {
         return getTypeAliasFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeAliasBuilderList() {
         return getTypeAliasFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAliasOrBuilder> 
           getTypeAliasFieldBuilder() {
         if (typeAliasBuilder_ == null) {
           typeAliasBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAliasOrBuilder>(
                   typeAlias_,
                   ((bitField0_ & 0x00000400) == 0x00000400),
                   getParentForChildren(),
@@ -13523,22 +13523,22 @@ public final class DebugProtoBuf {
         return typeAliasBuilder_;
       }
 
-      private java.util.List enumEntry_ =
+      private java.util.List enumEntry_ =
         java.util.Collections.emptyList();
       private void ensureEnumEntryIsMutable() {
         if (!((bitField0_ & 0x00000800) == 0x00000800)) {
-          enumEntry_ = new java.util.ArrayList(enumEntry_);
+          enumEntry_ = new java.util.ArrayList(enumEntry_);
           bitField0_ |= 0x00000800;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry, org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntryOrBuilder> enumEntryBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry, org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntryOrBuilder> enumEntryBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
-      public java.util.List getEnumEntryList() {
+      public java.util.List getEnumEntryList() {
         if (enumEntryBuilder_ == null) {
           return java.util.Collections.unmodifiableList(enumEntry_);
         } else {
@@ -13546,7 +13546,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public int getEnumEntryCount() {
         if (enumEntryBuilder_ == null) {
@@ -13556,9 +13556,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry getEnumEntry(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry getEnumEntry(int index) {
         if (enumEntryBuilder_ == null) {
           return enumEntry_.get(index);
         } else {
@@ -13566,10 +13566,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder setEnumEntry(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry value) {
         if (enumEntryBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13583,10 +13583,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder setEnumEntry(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.Builder builderForValue) {
         if (enumEntryBuilder_ == null) {
           ensureEnumEntryIsMutable();
           enumEntry_.set(index, builderForValue.build());
@@ -13597,9 +13597,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
-      public Builder addEnumEntry(org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry value) {
+      public Builder addEnumEntry(org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry value) {
         if (enumEntryBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13613,10 +13613,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder addEnumEntry(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry value) {
         if (enumEntryBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13630,10 +13630,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder addEnumEntry(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.Builder builderForValue) {
         if (enumEntryBuilder_ == null) {
           ensureEnumEntryIsMutable();
           enumEntry_.add(builderForValue.build());
@@ -13644,10 +13644,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder addEnumEntry(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.Builder builderForValue) {
         if (enumEntryBuilder_ == null) {
           ensureEnumEntryIsMutable();
           enumEntry_.add(index, builderForValue.build());
@@ -13658,10 +13658,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder addAllEnumEntry(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (enumEntryBuilder_ == null) {
           ensureEnumEntryIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -13673,7 +13673,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder clearEnumEntry() {
         if (enumEntryBuilder_ == null) {
@@ -13686,7 +13686,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder removeEnumEntry(int index) {
         if (enumEntryBuilder_ == null) {
@@ -13699,16 +13699,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.Builder getEnumEntryBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.Builder getEnumEntryBuilder(
           int index) {
         return getEnumEntryFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntryOrBuilder getEnumEntryOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntryOrBuilder getEnumEntryOrBuilder(
           int index) {
         if (enumEntryBuilder_ == null) {
           return enumEntry_.get(index);  } else {
@@ -13716,9 +13716,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
-      public java.util.List 
+      public java.util.List 
            getEnumEntryOrBuilderList() {
         if (enumEntryBuilder_ != null) {
           return enumEntryBuilder_.getMessageOrBuilderList();
@@ -13727,33 +13727,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.Builder addEnumEntryBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.Builder addEnumEntryBuilder() {
         return getEnumEntryFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.Builder addEnumEntryBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.Builder addEnumEntryBuilder(
           int index) {
         return getEnumEntryFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
-      public java.util.List 
+      public java.util.List 
            getEnumEntryBuilderList() {
         return getEnumEntryFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry, org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntryOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry, org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntryOrBuilder> 
           getEnumEntryFieldBuilder() {
         if (enumEntryBuilder_ == null) {
           enumEntryBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry, org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntryOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry, org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntryOrBuilder>(
                   enumEntry_,
                   ((bitField0_ & 0x00000800) == 0x00000800),
                   getParentForChildren(),
@@ -13829,19 +13829,19 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder> typeTableBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder> typeTableBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public boolean hasTypeTable() {
         return ((bitField0_ & 0x00002000) == 0x00002000);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable getTypeTable() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable getTypeTable() {
         if (typeTableBuilder_ == null) {
           return typeTable_;
         } else {
@@ -13849,9 +13849,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public Builder setTypeTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable value) {
+      public Builder setTypeTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable value) {
         if (typeTableBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -13865,10 +13865,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public Builder setTypeTable(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder builderForValue) {
         if (typeTableBuilder_ == null) {
           typeTable_ = builderForValue.build();
           onChanged();
@@ -13879,14 +13879,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public Builder mergeTypeTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable value) {
+      public Builder mergeTypeTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable value) {
         if (typeTableBuilder_ == null) {
           if (((bitField0_ & 0x00002000) == 0x00002000) &&
-              typeTable_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance()) {
+              typeTable_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance()) {
             typeTable_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
           } else {
             typeTable_ = value;
           }
@@ -13898,11 +13898,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public Builder clearTypeTable() {
         if (typeTableBuilder_ == null) {
-          typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
+          typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
           onChanged();
         } else {
           typeTableBuilder_.clear();
@@ -13911,17 +13911,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder getTypeTableBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder getTypeTableBuilder() {
         bitField0_ |= 0x00002000;
         onChanged();
         return getTypeTableFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder() {
         if (typeTableBuilder_ != null) {
           return typeTableBuilder_.getMessageOrBuilder();
         } else {
@@ -13929,14 +13929,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder> 
           getTypeTableFieldBuilder() {
         if (typeTableBuilder_ == null) {
           typeTableBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder>(
                   getTypeTable(),
                   getParentForChildren(),
                   isClean());
@@ -13993,19 +13993,19 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable versionRequirementTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable versionRequirementTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTableOrBuilder> versionRequirementTableBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTableOrBuilder> versionRequirementTableBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
       public boolean hasVersionRequirementTable() {
         return ((bitField0_ & 0x00008000) == 0x00008000);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable getVersionRequirementTable() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable getVersionRequirementTable() {
         if (versionRequirementTableBuilder_ == null) {
           return versionRequirementTable_;
         } else {
@@ -14013,9 +14013,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public Builder setVersionRequirementTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable value) {
+      public Builder setVersionRequirementTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable value) {
         if (versionRequirementTableBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -14029,10 +14029,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
       public Builder setVersionRequirementTable(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder builderForValue) {
         if (versionRequirementTableBuilder_ == null) {
           versionRequirementTable_ = builderForValue.build();
           onChanged();
@@ -14043,14 +14043,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public Builder mergeVersionRequirementTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable value) {
+      public Builder mergeVersionRequirementTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable value) {
         if (versionRequirementTableBuilder_ == null) {
           if (((bitField0_ & 0x00008000) == 0x00008000) &&
-              versionRequirementTable_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.getDefaultInstance()) {
+              versionRequirementTable_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance()) {
             versionRequirementTable_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.newBuilder(versionRequirementTable_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.newBuilder(versionRequirementTable_).mergeFrom(value).buildPartial();
           } else {
             versionRequirementTable_ = value;
           }
@@ -14062,11 +14062,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
       public Builder clearVersionRequirementTable() {
         if (versionRequirementTableBuilder_ == null) {
-          versionRequirementTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
+          versionRequirementTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
           onChanged();
         } else {
           versionRequirementTableBuilder_.clear();
@@ -14075,17 +14075,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder getVersionRequirementTableBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder getVersionRequirementTableBuilder() {
         bitField0_ |= 0x00008000;
         onChanged();
         return getVersionRequirementTableFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTableOrBuilder getVersionRequirementTableOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTableOrBuilder getVersionRequirementTableOrBuilder() {
         if (versionRequirementTableBuilder_ != null) {
           return versionRequirementTableBuilder_.getMessageOrBuilder();
         } else {
@@ -14093,14 +14093,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTableOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTableOrBuilder> 
           getVersionRequirementTableFieldBuilder() {
         if (versionRequirementTableBuilder_ == null) {
           versionRequirementTableBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTableOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTableOrBuilder>(
                   getVersionRequirementTable(),
                   getParentForChildren(),
                   isClean());
@@ -14109,7 +14109,7 @@ public final class DebugProtoBuf {
         return versionRequirementTableBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Class)
     }
 
     static {
@@ -14117,122 +14117,122 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Class)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Class)
   }
 
   public interface PackageOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Package)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Package)
       org.jetbrains.kotlin.protobuf.GeneratedMessage.
           ExtendableMessageOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
-    java.util.List 
+    java.util.List 
         getFunctionList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Function getFunction(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Function getFunction(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
     int getFunctionCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
-    java.util.List 
+    java.util.List 
         getFunctionOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
         int index);
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
-    java.util.List 
+    java.util.List 
         getPropertyList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Property getProperty(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Property getProperty(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
     int getPropertyCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
-    java.util.List 
+    java.util.List 
         getPropertyOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
         int index);
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
-    java.util.List 
+    java.util.List 
         getTypeAliasList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias getTypeAlias(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias getTypeAlias(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
     int getTypeAliasCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
-    java.util.List 
+    java.util.List 
         getTypeAliasOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
         int index);
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
     boolean hasTypeTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable getTypeTable();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable getTypeTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
     boolean hasVersionRequirementTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable getVersionRequirementTable();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable getVersionRequirementTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTableOrBuilder getVersionRequirementTableOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTableOrBuilder getVersionRequirementTableOrBuilder();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Package}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Package}
    */
   public static final class Package extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
         Package> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Package)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Package)
       PackageOrBuilder {
     // Use Package.newBuilder() to construct.
-    private Package(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+    private Package(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -14278,34 +14278,34 @@ public final class DebugProtoBuf {
             }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                function_ = new java.util.ArrayList();
+                function_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              function_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.PARSER, extensionRegistry));
+              function_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.PARSER, extensionRegistry));
               break;
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                property_ = new java.util.ArrayList();
+                property_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              property_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.PARSER, extensionRegistry));
+              property_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.PARSER, extensionRegistry));
               break;
             }
             case 42: {
               if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-                typeAlias_ = new java.util.ArrayList();
+                typeAlias_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
-              typeAlias_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.PARSER, extensionRegistry));
+              typeAlias_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.PARSER, extensionRegistry));
               break;
             }
             case 242: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = typeTable_.toBuilder();
               }
-              typeTable_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.PARSER, extensionRegistry);
+              typeTable_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(typeTable_);
                 typeTable_ = subBuilder.buildPartial();
@@ -14314,11 +14314,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 258: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = versionRequirementTable_.toBuilder();
               }
-              versionRequirementTable_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.PARSER, extensionRegistry);
+              versionRequirementTable_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(versionRequirementTable_);
                 versionRequirementTable_ = subBuilder.buildPartial();
@@ -14349,14 +14349,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Package_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Package_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Package_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Package_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -14376,149 +14376,149 @@ public final class DebugProtoBuf {
 
     private int bitField0_;
     public static final int FUNCTION_FIELD_NUMBER = 3;
-    private java.util.List function_;
+    private java.util.List function_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
-    public java.util.List getFunctionList() {
+    public java.util.List getFunctionList() {
       return function_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
-    public java.util.List 
+    public java.util.List 
         getFunctionOrBuilderList() {
       return function_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
     public int getFunctionCount() {
       return function_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Function getFunction(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Function getFunction(int index) {
       return function_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
         int index) {
       return function_.get(index);
     }
 
     public static final int PROPERTY_FIELD_NUMBER = 4;
-    private java.util.List property_;
+    private java.util.List property_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
-    public java.util.List getPropertyList() {
+    public java.util.List getPropertyList() {
       return property_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
-    public java.util.List 
+    public java.util.List 
         getPropertyOrBuilderList() {
       return property_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
     public int getPropertyCount() {
       return property_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Property getProperty(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Property getProperty(int index) {
       return property_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
         int index) {
       return property_.get(index);
     }
 
     public static final int TYPE_ALIAS_FIELD_NUMBER = 5;
-    private java.util.List typeAlias_;
+    private java.util.List typeAlias_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
-    public java.util.List getTypeAliasList() {
+    public java.util.List getTypeAliasList() {
       return typeAlias_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeAliasOrBuilderList() {
       return typeAlias_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
     public int getTypeAliasCount() {
       return typeAlias_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias getTypeAlias(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias getTypeAlias(int index) {
       return typeAlias_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
         int index) {
       return typeAlias_.get(index);
     }
 
     public static final int TYPE_TABLE_FIELD_NUMBER = 30;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable typeTable_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable typeTable_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
     public boolean hasTypeTable() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable getTypeTable() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable getTypeTable() {
       return typeTable_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder() {
       return typeTable_;
     }
 
     public static final int VERSION_REQUIREMENT_TABLE_FIELD_NUMBER = 32;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable versionRequirementTable_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable versionRequirementTable_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
     public boolean hasVersionRequirementTable() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable getVersionRequirementTable() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable getVersionRequirementTable() {
       return versionRequirementTable_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTableOrBuilder getVersionRequirementTableOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTableOrBuilder getVersionRequirementTableOrBuilder() {
       return versionRequirementTable_;
     }
 
@@ -14526,8 +14526,8 @@ public final class DebugProtoBuf {
       function_ = java.util.Collections.emptyList();
       property_ = java.util.Collections.emptyList();
       typeAlias_ = java.util.Collections.emptyList();
-      typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
-      versionRequirementTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
+      typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
+      versionRequirementTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -14571,7 +14571,7 @@ public final class DebugProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessage
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       for (int i = 0; i < function_.size(); i++) {
         output.writeMessage(3, function_.get(i));
@@ -14631,53 +14631,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Package parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Package parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Package parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Package parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Package parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Package parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Package parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Package parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Package parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Package parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -14686,7 +14686,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Package prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.Package prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -14698,26 +14698,26 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Package}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Package}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Package)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Package, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Package)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Package_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Package_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Package_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Package_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -14761,13 +14761,13 @@ public final class DebugProtoBuf {
           typeAliasBuilder_.clear();
         }
         if (typeTableBuilder_ == null) {
-          typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
+          typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
         } else {
           typeTableBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000008);
         if (versionRequirementTableBuilder_ == null) {
-          versionRequirementTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
+          versionRequirementTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
         } else {
           versionRequirementTableBuilder_.clear();
         }
@@ -14781,23 +14781,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Package_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Package_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Package getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Package getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Package build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Package result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Package build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Package result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Package buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Package result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Package(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Package buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Package result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.Package(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (functionBuilder_ == null) {
@@ -14849,16 +14849,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Package) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Package)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.Package) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.Package)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Package other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.Package other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.getDefaultInstance()) return this;
         if (functionBuilder_ == null) {
           if (!other.function_.isEmpty()) {
             if (function_.isEmpty()) {
@@ -14984,11 +14984,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Package parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Package parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Package) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.Package) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -14999,22 +14999,22 @@ public final class DebugProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List function_ =
+      private java.util.List function_ =
         java.util.Collections.emptyList();
       private void ensureFunctionIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          function_ = new java.util.ArrayList(function_);
+          function_ = new java.util.ArrayList(function_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Function, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder> functionBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Function, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.FunctionOrBuilder> functionBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
-      public java.util.List getFunctionList() {
+      public java.util.List getFunctionList() {
         if (functionBuilder_ == null) {
           return java.util.Collections.unmodifiableList(function_);
         } else {
@@ -15022,7 +15022,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public int getFunctionCount() {
         if (functionBuilder_ == null) {
@@ -15032,9 +15032,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Function getFunction(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Function getFunction(int index) {
         if (functionBuilder_ == null) {
           return function_.get(index);
         } else {
@@ -15042,10 +15042,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder setFunction(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function value) {
         if (functionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15059,10 +15059,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder setFunction(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder builderForValue) {
         if (functionBuilder_ == null) {
           ensureFunctionIsMutable();
           function_.set(index, builderForValue.build());
@@ -15073,9 +15073,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
-      public Builder addFunction(org.jetbrains.kotlin.serialization.DebugProtoBuf.Function value) {
+      public Builder addFunction(org.jetbrains.kotlin.metadata.DebugProtoBuf.Function value) {
         if (functionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15089,10 +15089,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder addFunction(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function value) {
         if (functionBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15106,10 +15106,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder addFunction(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder builderForValue) {
         if (functionBuilder_ == null) {
           ensureFunctionIsMutable();
           function_.add(builderForValue.build());
@@ -15120,10 +15120,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder addFunction(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder builderForValue) {
         if (functionBuilder_ == null) {
           ensureFunctionIsMutable();
           function_.add(index, builderForValue.build());
@@ -15134,10 +15134,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder addAllFunction(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (functionBuilder_ == null) {
           ensureFunctionIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -15149,7 +15149,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder clearFunction() {
         if (functionBuilder_ == null) {
@@ -15162,7 +15162,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder removeFunction(int index) {
         if (functionBuilder_ == null) {
@@ -15175,16 +15175,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder getFunctionBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder getFunctionBuilder(
           int index) {
         return getFunctionFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
           int index) {
         if (functionBuilder_ == null) {
           return function_.get(index);  } else {
@@ -15192,9 +15192,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getFunctionOrBuilderList() {
         if (functionBuilder_ != null) {
           return functionBuilder_.getMessageOrBuilderList();
@@ -15203,33 +15203,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder addFunctionBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder addFunctionBuilder() {
         return getFunctionFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder addFunctionBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder addFunctionBuilder(
           int index) {
         return getFunctionFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getFunctionBuilderList() {
         return getFunctionFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Function, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Function, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.FunctionOrBuilder> 
           getFunctionFieldBuilder() {
         if (functionBuilder_ == null) {
           functionBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Function, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Function, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.FunctionOrBuilder>(
                   function_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
@@ -15239,22 +15239,22 @@ public final class DebugProtoBuf {
         return functionBuilder_;
       }
 
-      private java.util.List property_ =
+      private java.util.List property_ =
         java.util.Collections.emptyList();
       private void ensurePropertyIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          property_ = new java.util.ArrayList(property_);
+          property_ = new java.util.ArrayList(property_);
           bitField0_ |= 0x00000002;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Property, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder> propertyBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Property, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.PropertyOrBuilder> propertyBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
-      public java.util.List getPropertyList() {
+      public java.util.List getPropertyList() {
         if (propertyBuilder_ == null) {
           return java.util.Collections.unmodifiableList(property_);
         } else {
@@ -15262,7 +15262,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public int getPropertyCount() {
         if (propertyBuilder_ == null) {
@@ -15272,9 +15272,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Property getProperty(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Property getProperty(int index) {
         if (propertyBuilder_ == null) {
           return property_.get(index);
         } else {
@@ -15282,10 +15282,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder setProperty(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property value) {
         if (propertyBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15299,10 +15299,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder setProperty(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder builderForValue) {
         if (propertyBuilder_ == null) {
           ensurePropertyIsMutable();
           property_.set(index, builderForValue.build());
@@ -15313,9 +15313,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
-      public Builder addProperty(org.jetbrains.kotlin.serialization.DebugProtoBuf.Property value) {
+      public Builder addProperty(org.jetbrains.kotlin.metadata.DebugProtoBuf.Property value) {
         if (propertyBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15329,10 +15329,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder addProperty(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property value) {
         if (propertyBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15346,10 +15346,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder addProperty(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder builderForValue) {
         if (propertyBuilder_ == null) {
           ensurePropertyIsMutable();
           property_.add(builderForValue.build());
@@ -15360,10 +15360,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder addProperty(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder builderForValue) {
         if (propertyBuilder_ == null) {
           ensurePropertyIsMutable();
           property_.add(index, builderForValue.build());
@@ -15374,10 +15374,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder addAllProperty(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (propertyBuilder_ == null) {
           ensurePropertyIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -15389,7 +15389,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder clearProperty() {
         if (propertyBuilder_ == null) {
@@ -15402,7 +15402,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder removeProperty(int index) {
         if (propertyBuilder_ == null) {
@@ -15415,16 +15415,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder getPropertyBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder getPropertyBuilder(
           int index) {
         return getPropertyFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
           int index) {
         if (propertyBuilder_ == null) {
           return property_.get(index);  } else {
@@ -15432,9 +15432,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getPropertyOrBuilderList() {
         if (propertyBuilder_ != null) {
           return propertyBuilder_.getMessageOrBuilderList();
@@ -15443,33 +15443,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder addPropertyBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder addPropertyBuilder() {
         return getPropertyFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder addPropertyBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder addPropertyBuilder(
           int index) {
         return getPropertyFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getPropertyBuilderList() {
         return getPropertyFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Property, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Property, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.PropertyOrBuilder> 
           getPropertyFieldBuilder() {
         if (propertyBuilder_ == null) {
           propertyBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Property, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Property, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.PropertyOrBuilder>(
                   property_,
                   ((bitField0_ & 0x00000002) == 0x00000002),
                   getParentForChildren(),
@@ -15479,22 +15479,22 @@ public final class DebugProtoBuf {
         return propertyBuilder_;
       }
 
-      private java.util.List typeAlias_ =
+      private java.util.List typeAlias_ =
         java.util.Collections.emptyList();
       private void ensureTypeAliasIsMutable() {
         if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-          typeAlias_ = new java.util.ArrayList(typeAlias_);
+          typeAlias_ = new java.util.ArrayList(typeAlias_);
           bitField0_ |= 0x00000004;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder> typeAliasBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAliasOrBuilder> typeAliasBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
-      public java.util.List getTypeAliasList() {
+      public java.util.List getTypeAliasList() {
         if (typeAliasBuilder_ == null) {
           return java.util.Collections.unmodifiableList(typeAlias_);
         } else {
@@ -15502,7 +15502,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public int getTypeAliasCount() {
         if (typeAliasBuilder_ == null) {
@@ -15512,9 +15512,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias getTypeAlias(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias getTypeAlias(int index) {
         if (typeAliasBuilder_ == null) {
           return typeAlias_.get(index);
         } else {
@@ -15522,10 +15522,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder setTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias value) {
         if (typeAliasBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15539,10 +15539,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder setTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder builderForValue) {
         if (typeAliasBuilder_ == null) {
           ensureTypeAliasIsMutable();
           typeAlias_.set(index, builderForValue.build());
@@ -15553,9 +15553,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
-      public Builder addTypeAlias(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias value) {
+      public Builder addTypeAlias(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias value) {
         if (typeAliasBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15569,10 +15569,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder addTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias value) {
         if (typeAliasBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15586,10 +15586,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder addTypeAlias(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder builderForValue) {
         if (typeAliasBuilder_ == null) {
           ensureTypeAliasIsMutable();
           typeAlias_.add(builderForValue.build());
@@ -15600,10 +15600,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder addTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder builderForValue) {
         if (typeAliasBuilder_ == null) {
           ensureTypeAliasIsMutable();
           typeAlias_.add(index, builderForValue.build());
@@ -15614,10 +15614,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder addAllTypeAlias(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (typeAliasBuilder_ == null) {
           ensureTypeAliasIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -15629,7 +15629,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder clearTypeAlias() {
         if (typeAliasBuilder_ == null) {
@@ -15642,7 +15642,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder removeTypeAlias(int index) {
         if (typeAliasBuilder_ == null) {
@@ -15655,16 +15655,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder getTypeAliasBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder getTypeAliasBuilder(
           int index) {
         return getTypeAliasFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
           int index) {
         if (typeAliasBuilder_ == null) {
           return typeAlias_.get(index);  } else {
@@ -15672,9 +15672,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeAliasOrBuilderList() {
         if (typeAliasBuilder_ != null) {
           return typeAliasBuilder_.getMessageOrBuilderList();
@@ -15683,33 +15683,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder addTypeAliasBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder addTypeAliasBuilder() {
         return getTypeAliasFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder addTypeAliasBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder addTypeAliasBuilder(
           int index) {
         return getTypeAliasFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeAliasBuilderList() {
         return getTypeAliasFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAliasOrBuilder> 
           getTypeAliasFieldBuilder() {
         if (typeAliasBuilder_ == null) {
           typeAliasBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAliasOrBuilder>(
                   typeAlias_,
                   ((bitField0_ & 0x00000004) == 0x00000004),
                   getParentForChildren(),
@@ -15719,19 +15719,19 @@ public final class DebugProtoBuf {
         return typeAliasBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder> typeTableBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder> typeTableBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public boolean hasTypeTable() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable getTypeTable() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable getTypeTable() {
         if (typeTableBuilder_ == null) {
           return typeTable_;
         } else {
@@ -15739,9 +15739,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public Builder setTypeTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable value) {
+      public Builder setTypeTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable value) {
         if (typeTableBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15755,10 +15755,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public Builder setTypeTable(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder builderForValue) {
         if (typeTableBuilder_ == null) {
           typeTable_ = builderForValue.build();
           onChanged();
@@ -15769,14 +15769,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public Builder mergeTypeTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable value) {
+      public Builder mergeTypeTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable value) {
         if (typeTableBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              typeTable_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance()) {
+              typeTable_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance()) {
             typeTable_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
           } else {
             typeTable_ = value;
           }
@@ -15788,11 +15788,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public Builder clearTypeTable() {
         if (typeTableBuilder_ == null) {
-          typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
+          typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
           onChanged();
         } else {
           typeTableBuilder_.clear();
@@ -15801,17 +15801,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder getTypeTableBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder getTypeTableBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getTypeTableFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder() {
         if (typeTableBuilder_ != null) {
           return typeTableBuilder_.getMessageOrBuilder();
         } else {
@@ -15819,14 +15819,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder> 
           getTypeTableFieldBuilder() {
         if (typeTableBuilder_ == null) {
           typeTableBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder>(
                   getTypeTable(),
                   getParentForChildren(),
                   isClean());
@@ -15835,19 +15835,19 @@ public final class DebugProtoBuf {
         return typeTableBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable versionRequirementTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable versionRequirementTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTableOrBuilder> versionRequirementTableBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTableOrBuilder> versionRequirementTableBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
       public boolean hasVersionRequirementTable() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable getVersionRequirementTable() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable getVersionRequirementTable() {
         if (versionRequirementTableBuilder_ == null) {
           return versionRequirementTable_;
         } else {
@@ -15855,9 +15855,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public Builder setVersionRequirementTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable value) {
+      public Builder setVersionRequirementTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable value) {
         if (versionRequirementTableBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -15871,10 +15871,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
       public Builder setVersionRequirementTable(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder builderForValue) {
         if (versionRequirementTableBuilder_ == null) {
           versionRequirementTable_ = builderForValue.build();
           onChanged();
@@ -15885,14 +15885,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public Builder mergeVersionRequirementTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable value) {
+      public Builder mergeVersionRequirementTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable value) {
         if (versionRequirementTableBuilder_ == null) {
           if (((bitField0_ & 0x00000010) == 0x00000010) &&
-              versionRequirementTable_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.getDefaultInstance()) {
+              versionRequirementTable_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance()) {
             versionRequirementTable_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.newBuilder(versionRequirementTable_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.newBuilder(versionRequirementTable_).mergeFrom(value).buildPartial();
           } else {
             versionRequirementTable_ = value;
           }
@@ -15904,11 +15904,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
       public Builder clearVersionRequirementTable() {
         if (versionRequirementTableBuilder_ == null) {
-          versionRequirementTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
+          versionRequirementTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
           onChanged();
         } else {
           versionRequirementTableBuilder_.clear();
@@ -15917,17 +15917,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder getVersionRequirementTableBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder getVersionRequirementTableBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
         return getVersionRequirementTableFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTableOrBuilder getVersionRequirementTableOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTableOrBuilder getVersionRequirementTableOrBuilder() {
         if (versionRequirementTableBuilder_ != null) {
           return versionRequirementTableBuilder_.getMessageOrBuilder();
         } else {
@@ -15935,14 +15935,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTableOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTableOrBuilder> 
           getVersionRequirementTableFieldBuilder() {
         if (versionRequirementTableBuilder_ == null) {
           versionRequirementTableBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTableOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTableOrBuilder>(
                   getVersionRequirementTable(),
                   getParentForChildren(),
                   isClean());
@@ -15951,7 +15951,7 @@ public final class DebugProtoBuf {
         return versionRequirementTableBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Package)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Package)
     }
 
     static {
@@ -15959,35 +15959,35 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Package)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Package)
   }
 
   public interface TypeTableOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.TypeTable)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.TypeTable)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
-    java.util.List 
+    java.util.List 
         getTypeList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getType(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
     int getTypeCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
-    java.util.List 
+    java.util.List 
         getTypeOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder(
         int index);
 
     /**
@@ -16010,11 +16010,11 @@ public final class DebugProtoBuf {
     int getFirstNullable();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeTable}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.TypeTable}
    */
   public static final class TypeTable extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.TypeTable)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.TypeTable)
       TypeTableOrBuilder {
     // Use TypeTable.newBuilder() to construct.
     private TypeTable(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -16063,10 +16063,10 @@ public final class DebugProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                type_ = new java.util.ArrayList();
+                type_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              type_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry));
+              type_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry));
               break;
             }
             case 16: {
@@ -16091,14 +16091,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeTable_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeTable_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeTable_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeTable_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -16118,36 +16118,36 @@ public final class DebugProtoBuf {
 
     private int bitField0_;
     public static final int TYPE_FIELD_NUMBER = 1;
-    private java.util.List type_;
+    private java.util.List type_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
-    public java.util.List getTypeList() {
+    public java.util.List getTypeList() {
       return type_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeOrBuilderList() {
       return type_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
     public int getTypeCount() {
       return type_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getType(int index) {
       return type_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder(
         int index) {
       return type_.get(index);
     }
@@ -16235,53 +16235,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -16290,7 +16290,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -16302,25 +16302,25 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeTable}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.TypeTable}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.TypeTable)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.TypeTable)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeTable_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeTable_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeTable_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeTable_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -16358,23 +16358,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeTable_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeTable_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (typeBuilder_ == null) {
@@ -16396,16 +16396,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance()) return this;
         if (typeBuilder_ == null) {
           if (!other.type_.isEmpty()) {
             if (type_.isEmpty()) {
@@ -16453,11 +16453,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -16468,22 +16468,22 @@ public final class DebugProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List type_ =
+      private java.util.List type_ =
         java.util.Collections.emptyList();
       private void ensureTypeIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          type_ = new java.util.ArrayList(type_);
+          type_ = new java.util.ArrayList(type_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> typeBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> typeBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
-      public java.util.List getTypeList() {
+      public java.util.List getTypeList() {
         if (typeBuilder_ == null) {
           return java.util.Collections.unmodifiableList(type_);
         } else {
@@ -16491,7 +16491,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public int getTypeCount() {
         if (typeBuilder_ == null) {
@@ -16501,9 +16501,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getType(int index) {
         if (typeBuilder_ == null) {
           return type_.get(index);
         } else {
@@ -16511,10 +16511,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder setType(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (typeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16528,10 +16528,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder setType(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (typeBuilder_ == null) {
           ensureTypeIsMutable();
           type_.set(index, builderForValue.build());
@@ -16542,9 +16542,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
-      public Builder addType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder addType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (typeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16558,10 +16558,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder addType(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (typeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -16575,10 +16575,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder addType(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (typeBuilder_ == null) {
           ensureTypeIsMutable();
           type_.add(builderForValue.build());
@@ -16589,10 +16589,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder addType(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (typeBuilder_ == null) {
           ensureTypeIsMutable();
           type_.add(index, builderForValue.build());
@@ -16603,10 +16603,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder addAllType(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (typeBuilder_ == null) {
           ensureTypeIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -16618,7 +16618,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder clearType() {
         if (typeBuilder_ == null) {
@@ -16631,7 +16631,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder removeType(int index) {
         if (typeBuilder_ == null) {
@@ -16644,16 +16644,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getTypeBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getTypeBuilder(
           int index) {
         return getTypeFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder(
           int index) {
         if (typeBuilder_ == null) {
           return type_.get(index);  } else {
@@ -16661,9 +16661,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeOrBuilderList() {
         if (typeBuilder_ != null) {
           return typeBuilder_.getMessageOrBuilderList();
@@ -16672,33 +16672,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder addTypeBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder addTypeBuilder() {
         return getTypeFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder addTypeBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder addTypeBuilder(
           int index) {
         return getTypeFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeBuilderList() {
         return getTypeFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getTypeFieldBuilder() {
         if (typeBuilder_ == null) {
           typeBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   type_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
@@ -16760,7 +16760,7 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.TypeTable)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.TypeTable)
     }
 
     static {
@@ -16768,11 +16768,11 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.TypeTable)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.TypeTable)
   }
 
   public interface ConstructorOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Constructor)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Constructor)
       org.jetbrains.kotlin.protobuf.GeneratedMessage.
           ExtendableMessageOrBuilder {
 
@@ -16798,27 +16798,27 @@ public final class DebugProtoBuf {
     int getFlags();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
-    java.util.List 
+    java.util.List 
         getValueParameterList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getValueParameter(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter getValueParameter(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
     int getValueParameterCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
-    java.util.List 
+    java.util.List 
         getValueParameterOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
         int index);
 
     /**
@@ -16839,15 +16839,15 @@ public final class DebugProtoBuf {
     int getVersionRequirement();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Constructor}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Constructor}
    */
   public static final class Constructor extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
         Constructor> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Constructor)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Constructor)
       ConstructorOrBuilder {
     // Use Constructor.newBuilder() to construct.
-    private Constructor(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+    private Constructor(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -16898,10 +16898,10 @@ public final class DebugProtoBuf {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                valueParameter_ = new java.util.ArrayList();
+                valueParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.PARSER, extensionRegistry));
+              valueParameter_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.PARSER, extensionRegistry));
               break;
             }
             case 248: {
@@ -16926,14 +16926,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Constructor_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Constructor_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Constructor_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Constructor_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -16980,36 +16980,36 @@ public final class DebugProtoBuf {
     }
 
     public static final int VALUE_PARAMETER_FIELD_NUMBER = 2;
-    private java.util.List valueParameter_;
+    private java.util.List valueParameter_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
-    public java.util.List getValueParameterList() {
+    public java.util.List getValueParameterList() {
       return valueParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getValueParameterOrBuilderList() {
       return valueParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
     public int getValueParameterCount() {
       return valueParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getValueParameter(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter getValueParameter(int index) {
       return valueParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
         int index) {
       return valueParameter_.get(index);
     }
@@ -17066,7 +17066,7 @@ public final class DebugProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessage
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, flags_);
@@ -17112,53 +17112,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -17167,7 +17167,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -17179,26 +17179,26 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Constructor}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Constructor}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Constructor)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.ConstructorOrBuilder {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Constructor)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.ConstructorOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Constructor_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Constructor_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Constructor_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Constructor_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -17238,23 +17238,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Constructor_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Constructor_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -17280,16 +17280,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -17345,11 +17345,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -17416,22 +17416,22 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private java.util.List valueParameter_ =
+      private java.util.List valueParameter_ =
         java.util.Collections.emptyList();
       private void ensureValueParameterIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          valueParameter_ = new java.util.ArrayList(valueParameter_);
+          valueParameter_ = new java.util.ArrayList(valueParameter_);
           bitField0_ |= 0x00000002;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder> valueParameterBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder> valueParameterBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
-      public java.util.List getValueParameterList() {
+      public java.util.List getValueParameterList() {
         if (valueParameterBuilder_ == null) {
           return java.util.Collections.unmodifiableList(valueParameter_);
         } else {
@@ -17439,7 +17439,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public int getValueParameterCount() {
         if (valueParameterBuilder_ == null) {
@@ -17449,9 +17449,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getValueParameter(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter getValueParameter(int index) {
         if (valueParameterBuilder_ == null) {
           return valueParameter_.get(index);
         } else {
@@ -17459,10 +17459,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder setValueParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter value) {
         if (valueParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17476,10 +17476,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder setValueParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder builderForValue) {
         if (valueParameterBuilder_ == null) {
           ensureValueParameterIsMutable();
           valueParameter_.set(index, builderForValue.build());
@@ -17490,9 +17490,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
-      public Builder addValueParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) {
+      public Builder addValueParameter(org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter value) {
         if (valueParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17506,10 +17506,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder addValueParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter value) {
         if (valueParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -17523,10 +17523,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder addValueParameter(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder builderForValue) {
         if (valueParameterBuilder_ == null) {
           ensureValueParameterIsMutable();
           valueParameter_.add(builderForValue.build());
@@ -17537,10 +17537,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder addValueParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder builderForValue) {
         if (valueParameterBuilder_ == null) {
           ensureValueParameterIsMutable();
           valueParameter_.add(index, builderForValue.build());
@@ -17551,10 +17551,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder addAllValueParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (valueParameterBuilder_ == null) {
           ensureValueParameterIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -17566,7 +17566,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder clearValueParameter() {
         if (valueParameterBuilder_ == null) {
@@ -17579,7 +17579,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder removeValueParameter(int index) {
         if (valueParameterBuilder_ == null) {
@@ -17592,16 +17592,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder getValueParameterBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder getValueParameterBuilder(
           int index) {
         return getValueParameterFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
           int index) {
         if (valueParameterBuilder_ == null) {
           return valueParameter_.get(index);  } else {
@@ -17609,9 +17609,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getValueParameterOrBuilderList() {
         if (valueParameterBuilder_ != null) {
           return valueParameterBuilder_.getMessageOrBuilderList();
@@ -17620,33 +17620,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder addValueParameterBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder addValueParameterBuilder() {
         return getValueParameterFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder addValueParameterBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder addValueParameterBuilder(
           int index) {
         return getValueParameterFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getValueParameterBuilderList() {
         return getValueParameterFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder> 
           getValueParameterFieldBuilder() {
         if (valueParameterBuilder_ == null) {
           valueParameterBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder>(
                   valueParameter_,
                   ((bitField0_ & 0x00000002) == 0x00000002),
                   getParentForChildren(),
@@ -17704,7 +17704,7 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Constructor)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Constructor)
     }
 
     static {
@@ -17712,11 +17712,11 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Constructor)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Constructor)
   }
 
   public interface FunctionOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Function)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Function)
       org.jetbrains.kotlin.protobuf.GeneratedMessage.
           ExtendableMessageOrBuilder {
 
@@ -17776,17 +17776,17 @@ public final class DebugProtoBuf {
     int getName();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
     boolean hasReturnType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReturnType();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getReturnType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder();
 
     /**
      * optional int32 return_type_id = 7;
@@ -17798,41 +17798,41 @@ public final class DebugProtoBuf {
     int getReturnTypeId();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter getTypeParameter(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
     int getTypeParameterCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index);
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
     boolean hasReceiverType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReceiverType();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getReceiverType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder();
 
     /**
      * optional int32 receiver_type_id = 8;
@@ -17844,41 +17844,41 @@ public final class DebugProtoBuf {
     int getReceiverTypeId();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
-    java.util.List 
+    java.util.List 
         getValueParameterList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getValueParameter(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter getValueParameter(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
     int getValueParameterCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
-    java.util.List 
+    java.util.List 
         getValueParameterOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
         int index);
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
     boolean hasTypeTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable getTypeTable();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable getTypeTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder();
 
     /**
      * optional int32 version_requirement = 31;
@@ -17898,28 +17898,28 @@ public final class DebugProtoBuf {
     int getVersionRequirement();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+     * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
      */
     boolean hasContract();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+     * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract getContract();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract getContract();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+     * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ContractOrBuilder getContractOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.ContractOrBuilder getContractOrBuilder();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Function}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Function}
    */
   public static final class Function extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
         Function> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Function)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Function)
       FunctionOrBuilder {
     // Use Function.newBuilder() to construct.
-    private Function(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+    private Function(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -17974,11 +17974,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 26: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = returnType_.toBuilder();
               }
-              returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              returnType_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(returnType_);
                 returnType_ = subBuilder.buildPartial();
@@ -17988,18 +17988,18 @@ public final class DebugProtoBuf {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                typeParameter_ = new java.util.ArrayList();
+                typeParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry));
+              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry));
               break;
             }
             case 42: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000020) == 0x00000020)) {
                 subBuilder = receiverType_.toBuilder();
               }
-              receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              receiverType_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(receiverType_);
                 receiverType_ = subBuilder.buildPartial();
@@ -18009,10 +18009,10 @@ public final class DebugProtoBuf {
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
-                valueParameter_ = new java.util.ArrayList();
+                valueParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000100;
               }
-              valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.PARSER, extensionRegistry));
+              valueParameter_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.PARSER, extensionRegistry));
               break;
             }
             case 56: {
@@ -18031,11 +18031,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 242: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000080) == 0x00000080)) {
                 subBuilder = typeTable_.toBuilder();
               }
-              typeTable_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.PARSER, extensionRegistry);
+              typeTable_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(typeTable_);
                 typeTable_ = subBuilder.buildPartial();
@@ -18049,11 +18049,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 258: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.Builder subBuilder = null;
               if (((bitField0_ & 0x00000200) == 0x00000200)) {
                 subBuilder = contract_.toBuilder();
               }
-              contract_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.PARSER, extensionRegistry);
+              contract_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(contract_);
                 contract_ = subBuilder.buildPartial();
@@ -18081,14 +18081,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Function_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Function_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Function_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Function_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -18181,23 +18181,23 @@ public final class DebugProtoBuf {
     }
 
     public static final int RETURN_TYPE_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type returnType_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type returnType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
     public boolean hasReturnType() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReturnType() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getReturnType() {
       return returnType_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() {
       return returnType_;
     }
 
@@ -18217,58 +18217,58 @@ public final class DebugProtoBuf {
     }
 
     public static final int TYPE_PARAMETER_FIELD_NUMBER = 4;
-    private java.util.List typeParameter_;
+    private java.util.List typeParameter_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public java.util.List getTypeParameterList() {
+    public java.util.List getTypeParameterList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeParameterOrBuilderList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
     public int getTypeParameterCount() {
       return typeParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
       return typeParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index) {
       return typeParameter_.get(index);
     }
 
     public static final int RECEIVER_TYPE_FIELD_NUMBER = 5;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type receiverType_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type receiverType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
     public boolean hasReceiverType() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReceiverType() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getReceiverType() {
       return receiverType_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() {
       return receiverType_;
     }
 
@@ -18288,58 +18288,58 @@ public final class DebugProtoBuf {
     }
 
     public static final int VALUE_PARAMETER_FIELD_NUMBER = 6;
-    private java.util.List valueParameter_;
+    private java.util.List valueParameter_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
-    public java.util.List getValueParameterList() {
+    public java.util.List getValueParameterList() {
       return valueParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
-    public java.util.List 
+    public java.util.List 
         getValueParameterOrBuilderList() {
       return valueParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
     public int getValueParameterCount() {
       return valueParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getValueParameter(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter getValueParameter(int index) {
       return valueParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
         int index) {
       return valueParameter_.get(index);
     }
 
     public static final int TYPE_TABLE_FIELD_NUMBER = 30;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable typeTable_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable typeTable_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
     public boolean hasTypeTable() {
       return ((bitField0_ & 0x00000080) == 0x00000080);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable getTypeTable() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable getTypeTable() {
       return typeTable_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder() {
       return typeTable_;
     }
 
@@ -18367,23 +18367,23 @@ public final class DebugProtoBuf {
     }
 
     public static final int CONTRACT_FIELD_NUMBER = 32;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract contract_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract contract_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+     * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
      */
     public boolean hasContract() {
       return ((bitField0_ & 0x00000200) == 0x00000200);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+     * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract getContract() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract getContract() {
       return contract_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+     * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ContractOrBuilder getContractOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.ContractOrBuilder getContractOrBuilder() {
       return contract_;
     }
 
@@ -18391,15 +18391,15 @@ public final class DebugProtoBuf {
       flags_ = 6;
       oldFlags_ = 6;
       name_ = 0;
-      returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      returnType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       returnTypeId_ = 0;
       typeParameter_ = java.util.Collections.emptyList();
-      receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      receiverType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       receiverTypeId_ = 0;
       valueParameter_ = java.util.Collections.emptyList();
-      typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
+      typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
       versionRequirement_ = 0;
-      contract_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.getDefaultInstance();
+      contract_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -18459,7 +18459,7 @@ public final class DebugProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessage
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeInt32(1, oldFlags_);
@@ -18568,53 +18568,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Function parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Function parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Function parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Function parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Function parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Function parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Function parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Function parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Function parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Function parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Function parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Function parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Function parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Function parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Function parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Function parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Function parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Function parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Function parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Function parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -18623,7 +18623,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Function prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.Function prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -18635,26 +18635,26 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Function}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Function}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Function, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Function)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.FunctionOrBuilder {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Function, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Function)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.FunctionOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Function_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Function_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Function_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Function_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -18687,7 +18687,7 @@ public final class DebugProtoBuf {
         name_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
         if (returnTypeBuilder_ == null) {
-          returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          returnType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           returnTypeBuilder_.clear();
         }
@@ -18701,7 +18701,7 @@ public final class DebugProtoBuf {
           typeParameterBuilder_.clear();
         }
         if (receiverTypeBuilder_ == null) {
-          receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          receiverType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           receiverTypeBuilder_.clear();
         }
@@ -18715,7 +18715,7 @@ public final class DebugProtoBuf {
           valueParameterBuilder_.clear();
         }
         if (typeTableBuilder_ == null) {
-          typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
+          typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
         } else {
           typeTableBuilder_.clear();
         }
@@ -18723,7 +18723,7 @@ public final class DebugProtoBuf {
         versionRequirement_ = 0;
         bitField0_ = (bitField0_ & ~0x00000400);
         if (contractBuilder_ == null) {
-          contract_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.getDefaultInstance();
+          contract_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.getDefaultInstance();
         } else {
           contractBuilder_.clear();
         }
@@ -18737,23 +18737,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Function_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Function_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Function getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Function getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Function build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Function result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Function build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Function result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Function buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Function result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Function(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Function buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Function result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.Function(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -18836,16 +18836,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Function) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Function)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.Function) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.Function)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Function other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Function.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.Function other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.Function.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -18985,11 +18985,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Function parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Function parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Function) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.Function) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -19152,19 +19152,19 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type returnType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> returnTypeBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> returnTypeBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
       public boolean hasReturnType() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReturnType() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getReturnType() {
         if (returnTypeBuilder_ == null) {
           return returnType_;
         } else {
@@ -19172,9 +19172,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public Builder setReturnType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder setReturnType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (returnTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -19188,10 +19188,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
       public Builder setReturnType(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (returnTypeBuilder_ == null) {
           returnType_ = builderForValue.build();
           onChanged();
@@ -19202,14 +19202,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public Builder mergeReturnType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeReturnType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (returnTypeBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              returnType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              returnType_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) {
             returnType_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
           } else {
             returnType_ = value;
           }
@@ -19221,11 +19221,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
       public Builder clearReturnType() {
         if (returnTypeBuilder_ == null) {
-          returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          returnType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           returnTypeBuilder_.clear();
@@ -19234,17 +19234,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getReturnTypeBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getReturnTypeBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getReturnTypeFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() {
         if (returnTypeBuilder_ != null) {
           return returnTypeBuilder_.getMessageOrBuilder();
         } else {
@@ -19252,14 +19252,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getReturnTypeFieldBuilder() {
         if (returnTypeBuilder_ == null) {
           returnTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   getReturnType(),
                   getParentForChildren(),
                   isClean());
@@ -19300,22 +19300,22 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private java.util.List typeParameter_ =
+      private java.util.List typeParameter_ =
         java.util.Collections.emptyList();
       private void ensureTypeParameterIsMutable() {
         if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          typeParameter_ = new java.util.ArrayList(typeParameter_);
+          typeParameter_ = new java.util.ArrayList(typeParameter_);
           bitField0_ |= 0x00000020;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public java.util.List getTypeParameterList() {
+      public java.util.List getTypeParameterList() {
         if (typeParameterBuilder_ == null) {
           return java.util.Collections.unmodifiableList(typeParameter_);
         } else {
@@ -19323,7 +19323,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public int getTypeParameterCount() {
         if (typeParameterBuilder_ == null) {
@@ -19333,9 +19333,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
         if (typeParameterBuilder_ == null) {
           return typeParameter_.get(index);
         } else {
@@ -19343,10 +19343,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -19360,10 +19360,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.set(index, builderForValue.build());
@@ -19374,9 +19374,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public Builder addTypeParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
+      public Builder addTypeParameter(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -19390,10 +19390,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -19407,10 +19407,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.add(builderForValue.build());
@@ -19421,10 +19421,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.add(index, builderForValue.build());
@@ -19435,10 +19435,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addAllTypeParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -19450,7 +19450,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder clearTypeParameter() {
         if (typeParameterBuilder_ == null) {
@@ -19463,7 +19463,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder removeTypeParameter(int index) {
         if (typeParameterBuilder_ == null) {
@@ -19476,16 +19476,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder(
           int index) {
         return getTypeParameterFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
           int index) {
         if (typeParameterBuilder_ == null) {
           return typeParameter_.get(index);  } else {
@@ -19493,9 +19493,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeParameterOrBuilderList() {
         if (typeParameterBuilder_ != null) {
           return typeParameterBuilder_.getMessageOrBuilderList();
@@ -19504,33 +19504,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() {
         return getTypeParameterFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder(
           int index) {
         return getTypeParameterFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeParameterBuilderList() {
         return getTypeParameterFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder> 
           getTypeParameterFieldBuilder() {
         if (typeParameterBuilder_ == null) {
           typeParameterBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder>(
                   typeParameter_,
                   ((bitField0_ & 0x00000020) == 0x00000020),
                   getParentForChildren(),
@@ -19540,19 +19540,19 @@ public final class DebugProtoBuf {
         return typeParameterBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type receiverType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> receiverTypeBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> receiverTypeBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
       public boolean hasReceiverType() {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReceiverType() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getReceiverType() {
         if (receiverTypeBuilder_ == null) {
           return receiverType_;
         } else {
@@ -19560,9 +19560,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public Builder setReceiverType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder setReceiverType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (receiverTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -19576,10 +19576,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
       public Builder setReceiverType(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (receiverTypeBuilder_ == null) {
           receiverType_ = builderForValue.build();
           onChanged();
@@ -19590,14 +19590,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeReceiverType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (receiverTypeBuilder_ == null) {
           if (((bitField0_ & 0x00000040) == 0x00000040) &&
-              receiverType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              receiverType_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) {
             receiverType_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
           } else {
             receiverType_ = value;
           }
@@ -19609,11 +19609,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
       public Builder clearReceiverType() {
         if (receiverTypeBuilder_ == null) {
-          receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          receiverType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           receiverTypeBuilder_.clear();
@@ -19622,17 +19622,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getReceiverTypeBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getReceiverTypeBuilder() {
         bitField0_ |= 0x00000040;
         onChanged();
         return getReceiverTypeFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() {
         if (receiverTypeBuilder_ != null) {
           return receiverTypeBuilder_.getMessageOrBuilder();
         } else {
@@ -19640,14 +19640,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getReceiverTypeFieldBuilder() {
         if (receiverTypeBuilder_ == null) {
           receiverTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   getReceiverType(),
                   getParentForChildren(),
                   isClean());
@@ -19688,22 +19688,22 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private java.util.List valueParameter_ =
+      private java.util.List valueParameter_ =
         java.util.Collections.emptyList();
       private void ensureValueParameterIsMutable() {
         if (!((bitField0_ & 0x00000100) == 0x00000100)) {
-          valueParameter_ = new java.util.ArrayList(valueParameter_);
+          valueParameter_ = new java.util.ArrayList(valueParameter_);
           bitField0_ |= 0x00000100;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder> valueParameterBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder> valueParameterBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
-      public java.util.List getValueParameterList() {
+      public java.util.List getValueParameterList() {
         if (valueParameterBuilder_ == null) {
           return java.util.Collections.unmodifiableList(valueParameter_);
         } else {
@@ -19711,7 +19711,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public int getValueParameterCount() {
         if (valueParameterBuilder_ == null) {
@@ -19721,9 +19721,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getValueParameter(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter getValueParameter(int index) {
         if (valueParameterBuilder_ == null) {
           return valueParameter_.get(index);
         } else {
@@ -19731,10 +19731,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder setValueParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter value) {
         if (valueParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -19748,10 +19748,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder setValueParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder builderForValue) {
         if (valueParameterBuilder_ == null) {
           ensureValueParameterIsMutable();
           valueParameter_.set(index, builderForValue.build());
@@ -19762,9 +19762,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
-      public Builder addValueParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) {
+      public Builder addValueParameter(org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter value) {
         if (valueParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -19778,10 +19778,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder addValueParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter value) {
         if (valueParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -19795,10 +19795,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder addValueParameter(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder builderForValue) {
         if (valueParameterBuilder_ == null) {
           ensureValueParameterIsMutable();
           valueParameter_.add(builderForValue.build());
@@ -19809,10 +19809,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder addValueParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder builderForValue) {
         if (valueParameterBuilder_ == null) {
           ensureValueParameterIsMutable();
           valueParameter_.add(index, builderForValue.build());
@@ -19823,10 +19823,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder addAllValueParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (valueParameterBuilder_ == null) {
           ensureValueParameterIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -19838,7 +19838,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder clearValueParameter() {
         if (valueParameterBuilder_ == null) {
@@ -19851,7 +19851,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder removeValueParameter(int index) {
         if (valueParameterBuilder_ == null) {
@@ -19864,16 +19864,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder getValueParameterBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder getValueParameterBuilder(
           int index) {
         return getValueParameterFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
           int index) {
         if (valueParameterBuilder_ == null) {
           return valueParameter_.get(index);  } else {
@@ -19881,9 +19881,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
-      public java.util.List 
+      public java.util.List 
            getValueParameterOrBuilderList() {
         if (valueParameterBuilder_ != null) {
           return valueParameterBuilder_.getMessageOrBuilderList();
@@ -19892,33 +19892,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder addValueParameterBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder addValueParameterBuilder() {
         return getValueParameterFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder addValueParameterBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder addValueParameterBuilder(
           int index) {
         return getValueParameterFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
-      public java.util.List 
+      public java.util.List 
            getValueParameterBuilderList() {
         return getValueParameterFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder> 
           getValueParameterFieldBuilder() {
         if (valueParameterBuilder_ == null) {
           valueParameterBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder>(
                   valueParameter_,
                   ((bitField0_ & 0x00000100) == 0x00000100),
                   getParentForChildren(),
@@ -19928,19 +19928,19 @@ public final class DebugProtoBuf {
         return valueParameterBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder> typeTableBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder> typeTableBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public boolean hasTypeTable() {
         return ((bitField0_ & 0x00000200) == 0x00000200);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable getTypeTable() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable getTypeTable() {
         if (typeTableBuilder_ == null) {
           return typeTable_;
         } else {
@@ -19948,9 +19948,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public Builder setTypeTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable value) {
+      public Builder setTypeTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable value) {
         if (typeTableBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -19964,10 +19964,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public Builder setTypeTable(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder builderForValue) {
         if (typeTableBuilder_ == null) {
           typeTable_ = builderForValue.build();
           onChanged();
@@ -19978,14 +19978,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public Builder mergeTypeTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable value) {
+      public Builder mergeTypeTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable value) {
         if (typeTableBuilder_ == null) {
           if (((bitField0_ & 0x00000200) == 0x00000200) &&
-              typeTable_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance()) {
+              typeTable_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance()) {
             typeTable_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
           } else {
             typeTable_ = value;
           }
@@ -19997,11 +19997,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public Builder clearTypeTable() {
         if (typeTableBuilder_ == null) {
-          typeTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.getDefaultInstance();
+          typeTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.getDefaultInstance();
           onChanged();
         } else {
           typeTableBuilder_.clear();
@@ -20010,17 +20010,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder getTypeTableBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder getTypeTableBuilder() {
         bitField0_ |= 0x00000200;
         onChanged();
         return getTypeTableFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder getTypeTableOrBuilder() {
         if (typeTableBuilder_ != null) {
           return typeTableBuilder_.getMessageOrBuilder();
         } else {
@@ -20028,14 +20028,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder> 
           getTypeTableFieldBuilder() {
         if (typeTableBuilder_ == null) {
           typeTableBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeTableOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeTableOrBuilder>(
                   getTypeTable(),
                   getParentForChildren(),
                   isClean());
@@ -20092,19 +20092,19 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract contract_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract contract_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract, org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ContractOrBuilder> contractBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract, org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ContractOrBuilder> contractBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
       public boolean hasContract() {
         return ((bitField0_ & 0x00000800) == 0x00000800);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract getContract() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract getContract() {
         if (contractBuilder_ == null) {
           return contract_;
         } else {
@@ -20112,9 +20112,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
-      public Builder setContract(org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract value) {
+      public Builder setContract(org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract value) {
         if (contractBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -20128,10 +20128,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
       public Builder setContract(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.Builder builderForValue) {
         if (contractBuilder_ == null) {
           contract_ = builderForValue.build();
           onChanged();
@@ -20142,14 +20142,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
-      public Builder mergeContract(org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract value) {
+      public Builder mergeContract(org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract value) {
         if (contractBuilder_ == null) {
           if (((bitField0_ & 0x00000800) == 0x00000800) &&
-              contract_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.getDefaultInstance()) {
+              contract_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.getDefaultInstance()) {
             contract_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.newBuilder(contract_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.newBuilder(contract_).mergeFrom(value).buildPartial();
           } else {
             contract_ = value;
           }
@@ -20161,11 +20161,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
       public Builder clearContract() {
         if (contractBuilder_ == null) {
-          contract_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.getDefaultInstance();
+          contract_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.getDefaultInstance();
           onChanged();
         } else {
           contractBuilder_.clear();
@@ -20174,17 +20174,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.Builder getContractBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.Builder getContractBuilder() {
         bitField0_ |= 0x00000800;
         onChanged();
         return getContractFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ContractOrBuilder getContractOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ContractOrBuilder getContractOrBuilder() {
         if (contractBuilder_ != null) {
           return contractBuilder_.getMessageOrBuilder();
         } else {
@@ -20192,14 +20192,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract, org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ContractOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract, org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ContractOrBuilder> 
           getContractFieldBuilder() {
         if (contractBuilder_ == null) {
           contractBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract, org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ContractOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract, org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ContractOrBuilder>(
                   getContract(),
                   getParentForChildren(),
                   isClean());
@@ -20208,7 +20208,7 @@ public final class DebugProtoBuf {
         return contractBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Function)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Function)
     }
 
     static {
@@ -20216,11 +20216,11 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Function)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Function)
   }
 
   public interface PropertyOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Property)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Property)
       org.jetbrains.kotlin.protobuf.GeneratedMessage.
           ExtendableMessageOrBuilder {
 
@@ -20284,17 +20284,17 @@ public final class DebugProtoBuf {
     int getName();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
     boolean hasReturnType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReturnType();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getReturnType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder();
 
     /**
      * optional int32 return_type_id = 9;
@@ -20306,41 +20306,41 @@ public final class DebugProtoBuf {
     int getReturnTypeId();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter getTypeParameter(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
     int getTypeParameterCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index);
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
     boolean hasReceiverType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReceiverType();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getReceiverType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder();
 
     /**
      * optional int32 receiver_type_id = 10;
@@ -20352,17 +20352,17 @@ public final class DebugProtoBuf {
     int getReceiverTypeId();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+     * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
      */
     boolean hasSetterValueParameter();
     /**
-     * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+     * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getSetterValueParameter();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter getSetterValueParameter();
     /**
-     * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+     * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getSetterValueParameterOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder getSetterValueParameterOrBuilder();
 
     /**
      * optional int32 getter_flags = 7;
@@ -20418,15 +20418,15 @@ public final class DebugProtoBuf {
     int getVersionRequirement();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Property}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Property}
    */
   public static final class Property extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
         Property> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Property)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Property)
       PropertyOrBuilder {
     // Use Property.newBuilder() to construct.
-    private Property(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+    private Property(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -20481,11 +20481,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 26: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = returnType_.toBuilder();
               }
-              returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              returnType_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(returnType_);
                 returnType_ = subBuilder.buildPartial();
@@ -20495,18 +20495,18 @@ public final class DebugProtoBuf {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                typeParameter_ = new java.util.ArrayList();
+                typeParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry));
+              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry));
               break;
             }
             case 42: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000020) == 0x00000020)) {
                 subBuilder = receiverType_.toBuilder();
               }
-              receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              receiverType_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(receiverType_);
                 receiverType_ = subBuilder.buildPartial();
@@ -20515,11 +20515,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 50: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder subBuilder = null;
               if (((bitField0_ & 0x00000080) == 0x00000080)) {
                 subBuilder = setterValueParameter_.toBuilder();
               }
-              setterValueParameter_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.PARSER, extensionRegistry);
+              setterValueParameter_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(setterValueParameter_);
                 setterValueParameter_ = subBuilder.buildPartial();
@@ -20574,14 +20574,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Property_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Property_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Property_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Property_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -20678,23 +20678,23 @@ public final class DebugProtoBuf {
     }
 
     public static final int RETURN_TYPE_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type returnType_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type returnType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
     public boolean hasReturnType() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReturnType() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getReturnType() {
       return returnType_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() {
       return returnType_;
     }
 
@@ -20714,58 +20714,58 @@ public final class DebugProtoBuf {
     }
 
     public static final int TYPE_PARAMETER_FIELD_NUMBER = 4;
-    private java.util.List typeParameter_;
+    private java.util.List typeParameter_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public java.util.List getTypeParameterList() {
+    public java.util.List getTypeParameterList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeParameterOrBuilderList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
     public int getTypeParameterCount() {
       return typeParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
       return typeParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index) {
       return typeParameter_.get(index);
     }
 
     public static final int RECEIVER_TYPE_FIELD_NUMBER = 5;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type receiverType_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type receiverType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
     public boolean hasReceiverType() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReceiverType() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getReceiverType() {
       return receiverType_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() {
       return receiverType_;
     }
 
@@ -20785,23 +20785,23 @@ public final class DebugProtoBuf {
     }
 
     public static final int SETTER_VALUE_PARAMETER_FIELD_NUMBER = 6;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter setterValueParameter_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter setterValueParameter_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+     * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
      */
     public boolean hasSetterValueParameter() {
       return ((bitField0_ & 0x00000080) == 0x00000080);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+     * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getSetterValueParameter() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter getSetterValueParameter() {
       return setterValueParameter_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+     * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getSetterValueParameterOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder getSetterValueParameterOrBuilder() {
       return setterValueParameter_;
     }
 
@@ -20880,12 +20880,12 @@ public final class DebugProtoBuf {
       flags_ = 518;
       oldFlags_ = 2054;
       name_ = 0;
-      returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      returnType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       returnTypeId_ = 0;
       typeParameter_ = java.util.Collections.emptyList();
-      receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      receiverType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       receiverTypeId_ = 0;
-      setterValueParameter_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance();
+      setterValueParameter_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.getDefaultInstance();
       getterFlags_ = 0;
       setterFlags_ = 0;
       versionRequirement_ = 0;
@@ -20936,7 +20936,7 @@ public final class DebugProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessage
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeInt32(1, oldFlags_);
@@ -21045,53 +21045,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Property parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Property parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Property parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Property parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Property parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Property parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Property parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Property parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Property parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Property parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Property parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Property parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Property parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Property parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Property parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Property parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Property parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Property parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Property parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Property parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -21100,7 +21100,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Property prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.Property prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -21112,26 +21112,26 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Property}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Property}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Property, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Property)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.PropertyOrBuilder {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Property, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Property)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.PropertyOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Property_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Property_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Property_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Property_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -21162,7 +21162,7 @@ public final class DebugProtoBuf {
         name_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
         if (returnTypeBuilder_ == null) {
-          returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          returnType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           returnTypeBuilder_.clear();
         }
@@ -21176,7 +21176,7 @@ public final class DebugProtoBuf {
           typeParameterBuilder_.clear();
         }
         if (receiverTypeBuilder_ == null) {
-          receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          receiverType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           receiverTypeBuilder_.clear();
         }
@@ -21184,7 +21184,7 @@ public final class DebugProtoBuf {
         receiverTypeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000080);
         if (setterValueParameterBuilder_ == null) {
-          setterValueParameter_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance();
+          setterValueParameter_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.getDefaultInstance();
         } else {
           setterValueParameterBuilder_.clear();
         }
@@ -21204,23 +21204,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Property_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Property_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Property getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Property getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Property build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Property result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Property build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Property result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Property buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Property result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Property(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Property buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Property result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.Property(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -21294,16 +21294,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Property) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Property)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.Property) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.Property)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Property other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.Property other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -21408,11 +21408,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Property parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Property parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Property) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.Property) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -21583,19 +21583,19 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type returnType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> returnTypeBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> returnTypeBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
       public boolean hasReturnType() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReturnType() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getReturnType() {
         if (returnTypeBuilder_ == null) {
           return returnType_;
         } else {
@@ -21603,9 +21603,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public Builder setReturnType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder setReturnType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (returnTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21619,10 +21619,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
       public Builder setReturnType(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (returnTypeBuilder_ == null) {
           returnType_ = builderForValue.build();
           onChanged();
@@ -21633,14 +21633,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public Builder mergeReturnType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeReturnType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (returnTypeBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              returnType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              returnType_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) {
             returnType_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
           } else {
             returnType_ = value;
           }
@@ -21652,11 +21652,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
       public Builder clearReturnType() {
         if (returnTypeBuilder_ == null) {
-          returnType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          returnType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           returnTypeBuilder_.clear();
@@ -21665,17 +21665,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getReturnTypeBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getReturnTypeBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getReturnTypeFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() {
         if (returnTypeBuilder_ != null) {
           return returnTypeBuilder_.getMessageOrBuilder();
         } else {
@@ -21683,14 +21683,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getReturnTypeFieldBuilder() {
         if (returnTypeBuilder_ == null) {
           returnTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   getReturnType(),
                   getParentForChildren(),
                   isClean());
@@ -21731,22 +21731,22 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private java.util.List typeParameter_ =
+      private java.util.List typeParameter_ =
         java.util.Collections.emptyList();
       private void ensureTypeParameterIsMutable() {
         if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          typeParameter_ = new java.util.ArrayList(typeParameter_);
+          typeParameter_ = new java.util.ArrayList(typeParameter_);
           bitField0_ |= 0x00000020;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public java.util.List getTypeParameterList() {
+      public java.util.List getTypeParameterList() {
         if (typeParameterBuilder_ == null) {
           return java.util.Collections.unmodifiableList(typeParameter_);
         } else {
@@ -21754,7 +21754,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public int getTypeParameterCount() {
         if (typeParameterBuilder_ == null) {
@@ -21764,9 +21764,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
         if (typeParameterBuilder_ == null) {
           return typeParameter_.get(index);
         } else {
@@ -21774,10 +21774,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21791,10 +21791,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.set(index, builderForValue.build());
@@ -21805,9 +21805,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public Builder addTypeParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
+      public Builder addTypeParameter(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21821,10 +21821,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -21838,10 +21838,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.add(builderForValue.build());
@@ -21852,10 +21852,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.add(index, builderForValue.build());
@@ -21866,10 +21866,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addAllTypeParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -21881,7 +21881,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder clearTypeParameter() {
         if (typeParameterBuilder_ == null) {
@@ -21894,7 +21894,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder removeTypeParameter(int index) {
         if (typeParameterBuilder_ == null) {
@@ -21907,16 +21907,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder(
           int index) {
         return getTypeParameterFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
           int index) {
         if (typeParameterBuilder_ == null) {
           return typeParameter_.get(index);  } else {
@@ -21924,9 +21924,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeParameterOrBuilderList() {
         if (typeParameterBuilder_ != null) {
           return typeParameterBuilder_.getMessageOrBuilderList();
@@ -21935,33 +21935,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() {
         return getTypeParameterFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder(
           int index) {
         return getTypeParameterFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeParameterBuilderList() {
         return getTypeParameterFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder> 
           getTypeParameterFieldBuilder() {
         if (typeParameterBuilder_ == null) {
           typeParameterBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder>(
                   typeParameter_,
                   ((bitField0_ & 0x00000020) == 0x00000020),
                   getParentForChildren(),
@@ -21971,19 +21971,19 @@ public final class DebugProtoBuf {
         return typeParameterBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type receiverType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> receiverTypeBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> receiverTypeBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
       public boolean hasReceiverType() {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getReceiverType() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getReceiverType() {
         if (receiverTypeBuilder_ == null) {
           return receiverType_;
         } else {
@@ -21991,9 +21991,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public Builder setReceiverType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder setReceiverType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (receiverTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -22007,10 +22007,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
       public Builder setReceiverType(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (receiverTypeBuilder_ == null) {
           receiverType_ = builderForValue.build();
           onChanged();
@@ -22021,14 +22021,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeReceiverType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (receiverTypeBuilder_ == null) {
           if (((bitField0_ & 0x00000040) == 0x00000040) &&
-              receiverType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              receiverType_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) {
             receiverType_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
           } else {
             receiverType_ = value;
           }
@@ -22040,11 +22040,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
       public Builder clearReceiverType() {
         if (receiverTypeBuilder_ == null) {
-          receiverType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          receiverType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           receiverTypeBuilder_.clear();
@@ -22053,17 +22053,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getReceiverTypeBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getReceiverTypeBuilder() {
         bitField0_ |= 0x00000040;
         onChanged();
         return getReceiverTypeFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() {
         if (receiverTypeBuilder_ != null) {
           return receiverTypeBuilder_.getMessageOrBuilder();
         } else {
@@ -22071,14 +22071,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getReceiverTypeFieldBuilder() {
         if (receiverTypeBuilder_ == null) {
           receiverTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   getReceiverType(),
                   getParentForChildren(),
                   isClean());
@@ -22119,19 +22119,19 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter setterValueParameter_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter setterValueParameter_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder> setterValueParameterBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder> setterValueParameterBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
       public boolean hasSetterValueParameter() {
         return ((bitField0_ & 0x00000100) == 0x00000100);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getSetterValueParameter() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter getSetterValueParameter() {
         if (setterValueParameterBuilder_ == null) {
           return setterValueParameter_;
         } else {
@@ -22139,9 +22139,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
-      public Builder setSetterValueParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) {
+      public Builder setSetterValueParameter(org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter value) {
         if (setterValueParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -22155,10 +22155,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
       public Builder setSetterValueParameter(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder builderForValue) {
         if (setterValueParameterBuilder_ == null) {
           setterValueParameter_ = builderForValue.build();
           onChanged();
@@ -22169,14 +22169,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
-      public Builder mergeSetterValueParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter value) {
+      public Builder mergeSetterValueParameter(org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter value) {
         if (setterValueParameterBuilder_ == null) {
           if (((bitField0_ & 0x00000100) == 0x00000100) &&
-              setterValueParameter_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance()) {
+              setterValueParameter_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.getDefaultInstance()) {
             setterValueParameter_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.newBuilder(setterValueParameter_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.newBuilder(setterValueParameter_).mergeFrom(value).buildPartial();
           } else {
             setterValueParameter_ = value;
           }
@@ -22188,11 +22188,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
       public Builder clearSetterValueParameter() {
         if (setterValueParameterBuilder_ == null) {
-          setterValueParameter_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance();
+          setterValueParameter_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.getDefaultInstance();
           onChanged();
         } else {
           setterValueParameterBuilder_.clear();
@@ -22201,17 +22201,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder getSetterValueParameterBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder getSetterValueParameterBuilder() {
         bitField0_ |= 0x00000100;
         onChanged();
         return getSetterValueParameterFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder getSetterValueParameterOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder getSetterValueParameterOrBuilder() {
         if (setterValueParameterBuilder_ != null) {
           return setterValueParameterBuilder_.getMessageOrBuilder();
         } else {
@@ -22219,14 +22219,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder> 
           getSetterValueParameterFieldBuilder() {
         if (setterValueParameterBuilder_ == null) {
           setterValueParameterBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder>(
                   getSetterValueParameter(),
                   getParentForChildren(),
                   isClean());
@@ -22383,7 +22383,7 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Property)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Property)
     }
 
     static {
@@ -22391,11 +22391,11 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Property)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Property)
   }
 
   public interface ValueParameterOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.ValueParameter)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.ValueParameter)
       org.jetbrains.kotlin.protobuf.GeneratedMessage.
           ExtendableMessageOrBuilder {
 
@@ -22432,17 +22432,17 @@ public final class DebugProtoBuf {
     int getName();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type type = 3;
      */
     boolean hasType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type type = 3;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type type = 3;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder();
 
     /**
      * optional int32 type_id = 5;
@@ -22454,17 +22454,17 @@ public final class DebugProtoBuf {
     int getTypeId();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
      */
     boolean hasVarargElementType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getVarargElementType();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getVarargElementType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder();
 
     /**
      * optional int32 vararg_element_type_id = 6;
@@ -22476,15 +22476,15 @@ public final class DebugProtoBuf {
     int getVarargElementTypeId();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.ValueParameter}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.ValueParameter}
    */
   public static final class ValueParameter extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
         ValueParameter> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.ValueParameter)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.ValueParameter)
       ValueParameterOrBuilder {
     // Use ValueParameter.newBuilder() to construct.
-    private ValueParameter(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+    private ValueParameter(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -22539,11 +22539,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 26: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = type_.toBuilder();
               }
-              type_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              type_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(type_);
                 type_ = subBuilder.buildPartial();
@@ -22552,11 +22552,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 34: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000010) == 0x00000010)) {
                 subBuilder = varargElementType_.toBuilder();
               }
-              varargElementType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              varargElementType_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(varargElementType_);
                 varargElementType_ = subBuilder.buildPartial();
@@ -22588,14 +22588,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_ValueParameter_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_ValueParameter_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_ValueParameter_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -22659,23 +22659,23 @@ public final class DebugProtoBuf {
     }
 
     public static final int TYPE_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type type_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type type_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type type = 3;
      */
     public boolean hasType() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type type = 3;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getType() {
       return type_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type type = 3;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
       return type_;
     }
 
@@ -22695,23 +22695,23 @@ public final class DebugProtoBuf {
     }
 
     public static final int VARARG_ELEMENT_TYPE_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type varargElementType_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type varargElementType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
      */
     public boolean hasVarargElementType() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getVarargElementType() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getVarargElementType() {
       return varargElementType_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder() {
       return varargElementType_;
     }
 
@@ -22733,9 +22733,9 @@ public final class DebugProtoBuf {
     private void initFields() {
       flags_ = 0;
       name_ = 0;
-      type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      type_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       typeId_ = 0;
-      varargElementType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      varargElementType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       varargElementTypeId_ = 0;
     }
     private byte memoizedIsInitialized = -1;
@@ -22772,7 +22772,7 @@ public final class DebugProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessage
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, flags_);
@@ -22839,53 +22839,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -22894,7 +22894,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -22906,26 +22906,26 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.ValueParameter}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.ValueParameter}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.ValueParameter)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameterOrBuilder {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.ValueParameter)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameterOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_ValueParameter_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_ValueParameter_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_ValueParameter_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -22952,7 +22952,7 @@ public final class DebugProtoBuf {
         name_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
         if (typeBuilder_ == null) {
-          type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          type_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           typeBuilder_.clear();
         }
@@ -22960,7 +22960,7 @@ public final class DebugProtoBuf {
         typeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000008);
         if (varargElementTypeBuilder_ == null) {
-          varargElementType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          varargElementType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           varargElementTypeBuilder_.clear();
         }
@@ -22976,23 +22976,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_ValueParameter_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -23033,16 +23033,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -23094,11 +23094,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -23201,19 +23201,19 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type type_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> typeBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> typeBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getType() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getType() {
         if (typeBuilder_ == null) {
           return type_;
         } else {
@@ -23221,9 +23221,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
-      public Builder setType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder setType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (typeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -23237,10 +23237,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
       public Builder setType(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (typeBuilder_ == null) {
           type_ = builderForValue.build();
           onChanged();
@@ -23251,14 +23251,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
-      public Builder mergeType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (typeBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
-              type_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              type_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) {
             type_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
           } else {
             type_ = value;
           }
@@ -23270,11 +23270,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
       public Builder clearType() {
         if (typeBuilder_ == null) {
-          type_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          type_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           typeBuilder_.clear();
@@ -23283,17 +23283,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getTypeBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getTypeBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getTypeFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() {
         if (typeBuilder_ != null) {
           return typeBuilder_.getMessageOrBuilder();
         } else {
@@ -23301,14 +23301,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getTypeFieldBuilder() {
         if (typeBuilder_ == null) {
           typeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   getType(),
                   getParentForChildren(),
                   isClean());
@@ -23349,19 +23349,19 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type varargElementType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type varargElementType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> varargElementTypeBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> varargElementTypeBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
       public boolean hasVarargElementType() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getVarargElementType() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getVarargElementType() {
         if (varargElementTypeBuilder_ == null) {
           return varargElementType_;
         } else {
@@ -23369,9 +23369,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
-      public Builder setVarargElementType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder setVarargElementType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (varargElementTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -23385,10 +23385,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
       public Builder setVarargElementType(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (varargElementTypeBuilder_ == null) {
           varargElementType_ = builderForValue.build();
           onChanged();
@@ -23399,14 +23399,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
-      public Builder mergeVarargElementType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeVarargElementType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (varargElementTypeBuilder_ == null) {
           if (((bitField0_ & 0x00000010) == 0x00000010) &&
-              varargElementType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              varargElementType_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) {
             varargElementType_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(varargElementType_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder(varargElementType_).mergeFrom(value).buildPartial();
           } else {
             varargElementType_ = value;
           }
@@ -23418,11 +23418,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
       public Builder clearVarargElementType() {
         if (varargElementTypeBuilder_ == null) {
-          varargElementType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          varargElementType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           varargElementTypeBuilder_.clear();
@@ -23431,17 +23431,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getVarargElementTypeBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getVarargElementTypeBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
         return getVarargElementTypeFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder() {
         if (varargElementTypeBuilder_ != null) {
           return varargElementTypeBuilder_.getMessageOrBuilder();
         } else {
@@ -23449,14 +23449,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getVarargElementTypeFieldBuilder() {
         if (varargElementTypeBuilder_ == null) {
           varargElementTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   getVarargElementType(),
                   getParentForChildren(),
                   isClean());
@@ -23497,7 +23497,7 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.ValueParameter)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.ValueParameter)
     }
 
     static {
@@ -23505,11 +23505,11 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.ValueParameter)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.ValueParameter)
   }
 
   public interface TypeAliasOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.TypeAlias)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.TypeAlias)
       org.jetbrains.kotlin.protobuf.GeneratedMessage.
           ExtendableMessageOrBuilder {
 
@@ -23542,41 +23542,41 @@ public final class DebugProtoBuf {
     int getName();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter getTypeParameter(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
     int getTypeParameterCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index);
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
      */
     boolean hasUnderlyingType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getUnderlyingType();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getUnderlyingType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getUnderlyingTypeOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getUnderlyingTypeOrBuilder();
 
     /**
      * optional int32 underlying_type_id = 5;
@@ -23588,17 +23588,17 @@ public final class DebugProtoBuf {
     int getUnderlyingTypeId();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+     * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
      */
     boolean hasExpandedType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+     * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getExpandedType();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getExpandedType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+     * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getExpandedTypeOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getExpandedTypeOrBuilder();
 
     /**
      * optional int32 expanded_type_id = 7;
@@ -23610,27 +23610,27 @@ public final class DebugProtoBuf {
     int getExpandedTypeId();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
-    java.util.List 
+    java.util.List 
         getAnnotationList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
     int getAnnotationCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
-    java.util.List 
+    java.util.List 
         getAnnotationOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
         int index);
 
     /**
@@ -23651,15 +23651,15 @@ public final class DebugProtoBuf {
     int getVersionRequirement();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeAlias}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.TypeAlias}
    */
   public static final class TypeAlias extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
         TypeAlias> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.TypeAlias)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.TypeAlias)
       TypeAliasOrBuilder {
     // Use TypeAlias.newBuilder() to construct.
-    private TypeAlias(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+    private TypeAlias(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -23715,18 +23715,18 @@ public final class DebugProtoBuf {
             }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-                typeParameter_ = new java.util.ArrayList();
+                typeParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
-              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry));
+              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry));
               break;
             }
             case 34: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = underlyingType_.toBuilder();
               }
-              underlyingType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              underlyingType_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(underlyingType_);
                 underlyingType_ = subBuilder.buildPartial();
@@ -23740,11 +23740,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 50: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000010) == 0x00000010)) {
                 subBuilder = expandedType_.toBuilder();
               }
-              expandedType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              expandedType_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(expandedType_);
                 expandedType_ = subBuilder.buildPartial();
@@ -23759,10 +23759,10 @@ public final class DebugProtoBuf {
             }
             case 66: {
               if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
-                annotation_ = new java.util.ArrayList();
+                annotation_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000080;
               }
-              annotation_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.PARSER, extensionRegistry));
+              annotation_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.PARSER, extensionRegistry));
               break;
             }
             case 248: {
@@ -23790,14 +23790,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeAlias_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeAlias_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeAlias_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeAlias_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -23857,58 +23857,58 @@ public final class DebugProtoBuf {
     }
 
     public static final int TYPE_PARAMETER_FIELD_NUMBER = 3;
-    private java.util.List typeParameter_;
+    private java.util.List typeParameter_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
-    public java.util.List getTypeParameterList() {
+    public java.util.List getTypeParameterList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeParameterOrBuilderList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
     public int getTypeParameterCount() {
       return typeParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
       return typeParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index) {
       return typeParameter_.get(index);
     }
 
     public static final int UNDERLYING_TYPE_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type underlyingType_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type underlyingType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
      */
     public boolean hasUnderlyingType() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getUnderlyingType() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getUnderlyingType() {
       return underlyingType_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getUnderlyingTypeOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getUnderlyingTypeOrBuilder() {
       return underlyingType_;
     }
 
@@ -23928,23 +23928,23 @@ public final class DebugProtoBuf {
     }
 
     public static final int EXPANDED_TYPE_FIELD_NUMBER = 6;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type expandedType_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type expandedType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+     * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
      */
     public boolean hasExpandedType() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+     * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getExpandedType() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getExpandedType() {
       return expandedType_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+     * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getExpandedTypeOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getExpandedTypeOrBuilder() {
       return expandedType_;
     }
 
@@ -23964,36 +23964,36 @@ public final class DebugProtoBuf {
     }
 
     public static final int ANNOTATION_FIELD_NUMBER = 8;
-    private java.util.List annotation_;
+    private java.util.List annotation_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
-    public java.util.List getAnnotationList() {
+    public java.util.List getAnnotationList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
-    public java.util.List 
+    public java.util.List 
         getAnnotationOrBuilderList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
     public int getAnnotationCount() {
       return annotation_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation(int index) {
       return annotation_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
         int index) {
       return annotation_.get(index);
     }
@@ -24025,9 +24025,9 @@ public final class DebugProtoBuf {
       flags_ = 6;
       name_ = 0;
       typeParameter_ = java.util.Collections.emptyList();
-      underlyingType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      underlyingType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       underlyingTypeId_ = 0;
-      expandedType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      expandedType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       expandedTypeId_ = 0;
       annotation_ = java.util.Collections.emptyList();
       versionRequirement_ = 0;
@@ -24078,7 +24078,7 @@ public final class DebugProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessage
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, flags_);
@@ -24166,53 +24166,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -24221,7 +24221,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -24233,26 +24233,26 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeAlias}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.TypeAlias}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.TypeAlias)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAliasOrBuilder {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.TypeAlias)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAliasOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeAlias_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeAlias_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeAlias_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeAlias_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -24287,7 +24287,7 @@ public final class DebugProtoBuf {
           typeParameterBuilder_.clear();
         }
         if (underlyingTypeBuilder_ == null) {
-          underlyingType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          underlyingType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           underlyingTypeBuilder_.clear();
         }
@@ -24295,7 +24295,7 @@ public final class DebugProtoBuf {
         underlyingTypeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000010);
         if (expandedTypeBuilder_ == null) {
-          expandedType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          expandedType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           expandedTypeBuilder_.clear();
         }
@@ -24319,23 +24319,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_TypeAlias_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_TypeAlias_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -24398,16 +24398,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -24526,11 +24526,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeAlias) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeAlias) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -24625,22 +24625,22 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private java.util.List typeParameter_ =
+      private java.util.List typeParameter_ =
         java.util.Collections.emptyList();
       private void ensureTypeParameterIsMutable() {
         if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-          typeParameter_ = new java.util.ArrayList(typeParameter_);
+          typeParameter_ = new java.util.ArrayList(typeParameter_);
           bitField0_ |= 0x00000004;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
-      public java.util.List getTypeParameterList() {
+      public java.util.List getTypeParameterList() {
         if (typeParameterBuilder_ == null) {
           return java.util.Collections.unmodifiableList(typeParameter_);
         } else {
@@ -24648,7 +24648,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public int getTypeParameterCount() {
         if (typeParameterBuilder_ == null) {
@@ -24658,9 +24658,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter getTypeParameter(int index) {
         if (typeParameterBuilder_ == null) {
           return typeParameter_.get(index);
         } else {
@@ -24668,10 +24668,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -24685,10 +24685,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.set(index, builderForValue.build());
@@ -24699,9 +24699,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
-      public Builder addTypeParameter(org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
+      public Builder addTypeParameter(org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -24715,10 +24715,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter value) {
         if (typeParameterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -24732,10 +24732,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder addTypeParameter(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.add(builderForValue.build());
@@ -24746,10 +24746,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder builderForValue) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           typeParameter_.add(index, builderForValue.build());
@@ -24760,10 +24760,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder addAllTypeParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (typeParameterBuilder_ == null) {
           ensureTypeParameterIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -24775,7 +24775,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder clearTypeParameter() {
         if (typeParameterBuilder_ == null) {
@@ -24788,7 +24788,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder removeTypeParameter(int index) {
         if (typeParameterBuilder_ == null) {
@@ -24801,16 +24801,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder(
           int index) {
         return getTypeParameterFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
           int index) {
         if (typeParameterBuilder_ == null) {
           return typeParameter_.get(index);  } else {
@@ -24818,9 +24818,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeParameterOrBuilderList() {
         if (typeParameterBuilder_ != null) {
           return typeParameterBuilder_.getMessageOrBuilderList();
@@ -24829,33 +24829,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() {
         return getTypeParameterFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder(
           int index) {
         return getTypeParameterFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
-      public java.util.List 
+      public java.util.List 
            getTypeParameterBuilderList() {
         return getTypeParameterFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder> 
           getTypeParameterFieldBuilder() {
         if (typeParameterBuilder_ == null) {
           typeParameterBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameterOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameterOrBuilder>(
                   typeParameter_,
                   ((bitField0_ & 0x00000004) == 0x00000004),
                   getParentForChildren(),
@@ -24865,19 +24865,19 @@ public final class DebugProtoBuf {
         return typeParameterBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type underlyingType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type underlyingType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> underlyingTypeBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> underlyingTypeBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
       public boolean hasUnderlyingType() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getUnderlyingType() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getUnderlyingType() {
         if (underlyingTypeBuilder_ == null) {
           return underlyingType_;
         } else {
@@ -24885,9 +24885,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
-      public Builder setUnderlyingType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder setUnderlyingType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (underlyingTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -24901,10 +24901,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
       public Builder setUnderlyingType(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (underlyingTypeBuilder_ == null) {
           underlyingType_ = builderForValue.build();
           onChanged();
@@ -24915,14 +24915,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
-      public Builder mergeUnderlyingType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeUnderlyingType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (underlyingTypeBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              underlyingType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              underlyingType_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) {
             underlyingType_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(underlyingType_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder(underlyingType_).mergeFrom(value).buildPartial();
           } else {
             underlyingType_ = value;
           }
@@ -24934,11 +24934,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
       public Builder clearUnderlyingType() {
         if (underlyingTypeBuilder_ == null) {
-          underlyingType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          underlyingType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           underlyingTypeBuilder_.clear();
@@ -24947,17 +24947,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getUnderlyingTypeBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getUnderlyingTypeBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getUnderlyingTypeFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getUnderlyingTypeOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getUnderlyingTypeOrBuilder() {
         if (underlyingTypeBuilder_ != null) {
           return underlyingTypeBuilder_.getMessageOrBuilder();
         } else {
@@ -24965,14 +24965,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getUnderlyingTypeFieldBuilder() {
         if (underlyingTypeBuilder_ == null) {
           underlyingTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   getUnderlyingType(),
                   getParentForChildren(),
                   isClean());
@@ -25013,19 +25013,19 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type expandedType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type expandedType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> expandedTypeBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> expandedTypeBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
       public boolean hasExpandedType() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getExpandedType() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getExpandedType() {
         if (expandedTypeBuilder_ == null) {
           return expandedType_;
         } else {
@@ -25033,9 +25033,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
-      public Builder setExpandedType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder setExpandedType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (expandedTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -25049,10 +25049,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
       public Builder setExpandedType(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (expandedTypeBuilder_ == null) {
           expandedType_ = builderForValue.build();
           onChanged();
@@ -25063,14 +25063,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
-      public Builder mergeExpandedType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeExpandedType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (expandedTypeBuilder_ == null) {
           if (((bitField0_ & 0x00000020) == 0x00000020) &&
-              expandedType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              expandedType_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) {
             expandedType_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(expandedType_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder(expandedType_).mergeFrom(value).buildPartial();
           } else {
             expandedType_ = value;
           }
@@ -25082,11 +25082,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
       public Builder clearExpandedType() {
         if (expandedTypeBuilder_ == null) {
-          expandedType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          expandedType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           expandedTypeBuilder_.clear();
@@ -25095,17 +25095,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getExpandedTypeBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getExpandedTypeBuilder() {
         bitField0_ |= 0x00000020;
         onChanged();
         return getExpandedTypeFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getExpandedTypeOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getExpandedTypeOrBuilder() {
         if (expandedTypeBuilder_ != null) {
           return expandedTypeBuilder_.getMessageOrBuilder();
         } else {
@@ -25113,14 +25113,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getExpandedTypeFieldBuilder() {
         if (expandedTypeBuilder_ == null) {
           expandedTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   getExpandedType(),
                   getParentForChildren(),
                   isClean());
@@ -25161,22 +25161,22 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private java.util.List annotation_ =
+      private java.util.List annotation_ =
         java.util.Collections.emptyList();
       private void ensureAnnotationIsMutable() {
         if (!((bitField0_ & 0x00000080) == 0x00000080)) {
-          annotation_ = new java.util.ArrayList(annotation_);
+          annotation_ = new java.util.ArrayList(annotation_);
           bitField0_ |= 0x00000080;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder> annotationBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder> annotationBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
-      public java.util.List getAnnotationList() {
+      public java.util.List getAnnotationList() {
         if (annotationBuilder_ == null) {
           return java.util.Collections.unmodifiableList(annotation_);
         } else {
@@ -25184,7 +25184,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public int getAnnotationCount() {
         if (annotationBuilder_ == null) {
@@ -25194,9 +25194,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation(int index) {
         if (annotationBuilder_ == null) {
           return annotation_.get(index);
         } else {
@@ -25204,10 +25204,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation value) {
         if (annotationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -25221,10 +25221,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder builderForValue) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           annotation_.set(index, builderForValue.build());
@@ -25235,9 +25235,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
-      public Builder addAnnotation(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
+      public Builder addAnnotation(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation value) {
         if (annotationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -25251,10 +25251,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation value) {
         if (annotationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -25268,10 +25268,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder addAnnotation(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder builderForValue) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           annotation_.add(builderForValue.build());
@@ -25282,10 +25282,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder builderForValue) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           annotation_.add(index, builderForValue.build());
@@ -25296,10 +25296,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder addAllAnnotation(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -25311,7 +25311,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder clearAnnotation() {
         if (annotationBuilder_ == null) {
@@ -25324,7 +25324,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder removeAnnotation(int index) {
         if (annotationBuilder_ == null) {
@@ -25337,16 +25337,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder getAnnotationBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder getAnnotationBuilder(
           int index) {
         return getAnnotationFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
           int index) {
         if (annotationBuilder_ == null) {
           return annotation_.get(index);  } else {
@@ -25354,9 +25354,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
-      public java.util.List 
+      public java.util.List 
            getAnnotationOrBuilderList() {
         if (annotationBuilder_ != null) {
           return annotationBuilder_.getMessageOrBuilderList();
@@ -25365,33 +25365,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder addAnnotationBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder addAnnotationBuilder() {
         return getAnnotationFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder addAnnotationBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder addAnnotationBuilder(
           int index) {
         return getAnnotationFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
-      public java.util.List 
+      public java.util.List 
            getAnnotationBuilderList() {
         return getAnnotationFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder> 
           getAnnotationFieldBuilder() {
         if (annotationBuilder_ == null) {
           annotationBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder>(
                   annotation_,
                   ((bitField0_ & 0x00000080) == 0x00000080),
                   getParentForChildren(),
@@ -25449,7 +25449,7 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.TypeAlias)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.TypeAlias)
     }
 
     static {
@@ -25457,11 +25457,11 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.TypeAlias)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.TypeAlias)
   }
 
   public interface EnumEntryOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.EnumEntry)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.EnumEntry)
       org.jetbrains.kotlin.protobuf.GeneratedMessage.
           ExtendableMessageOrBuilder {
 
@@ -25475,15 +25475,15 @@ public final class DebugProtoBuf {
     int getName();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.EnumEntry}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.EnumEntry}
    */
   public static final class EnumEntry extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
         EnumEntry> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.EnumEntry)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.EnumEntry)
       EnumEntryOrBuilder {
     // Use EnumEntry.newBuilder() to construct.
-    private EnumEntry(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+    private EnumEntry(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -25546,14 +25546,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_EnumEntry_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_EnumEntry_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_EnumEntry_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_EnumEntry_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -25608,7 +25608,7 @@ public final class DebugProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessage
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, name_);
@@ -25640,53 +25640,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -25695,7 +25695,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -25707,26 +25707,26 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.EnumEntry}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.EnumEntry}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.EnumEntry)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntryOrBuilder {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.EnumEntry)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntryOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_EnumEntry_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_EnumEntry_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_EnumEntry_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_EnumEntry_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -25757,23 +25757,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_EnumEntry_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_EnumEntry_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -25786,16 +25786,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry.getDefaultInstance()) return this;
         if (other.hasName()) {
           setName(other.getName());
         }
@@ -25816,11 +25816,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -25863,7 +25863,7 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.EnumEntry)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.EnumEntry)
     }
 
     static {
@@ -25871,11 +25871,11 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.EnumEntry)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.EnumEntry)
   }
 
   public interface VersionRequirementOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.VersionRequirement)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.VersionRequirement)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
@@ -25919,7 +25919,7 @@ public final class DebugProtoBuf {
     int getVersionFull();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
      *
      * 
      * Level of the reported diagnostic
@@ -25927,13 +25927,13 @@ public final class DebugProtoBuf {
      */
     boolean hasLevel();
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
      *
      * 
      * Level of the reported diagnostic
      * 

      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level getLevel();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Level getLevel();
 
     /**
      * optional int32 error_code = 4;
@@ -25970,7 +25970,7 @@ public final class DebugProtoBuf {
     int getMessage();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
      *
      * 
      * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
@@ -25979,21 +25979,21 @@ public final class DebugProtoBuf {
      */
     boolean hasVersionKind();
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
      *
      * 
      * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
      * (the "-api-version" argument value when compiling the call site) to be of at least the specified value
      * 

      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.VersionKind getVersionKind();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.VersionKind getVersionKind();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.VersionRequirement}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.VersionRequirement}
    */
   public static final class VersionRequirement extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.VersionRequirement)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.VersionRequirement)
       VersionRequirementOrBuilder {
     // Use VersionRequirement.newBuilder() to construct.
     private VersionRequirement(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -26052,7 +26052,7 @@ public final class DebugProtoBuf {
             }
             case 24: {
               int rawValue = input.readEnum();
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level value = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level.valueOf(rawValue);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Level value = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Level.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(3, rawValue);
               } else {
@@ -26073,7 +26073,7 @@ public final class DebugProtoBuf {
             }
             case 48: {
               int rawValue = input.readEnum();
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.VersionKind value = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.VersionKind.valueOf(rawValue);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.VersionKind value = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.VersionKind.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(6, rawValue);
               } else {
@@ -26096,14 +26096,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_VersionRequirement_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_VersionRequirement_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -26122,7 +26122,7 @@ public final class DebugProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.VersionRequirement.Level}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.VersionRequirement.Level}
      */
     public enum Level
         implements org.jetbrains.kotlin.protobuf.ProtocolMessageEnum {
@@ -26187,7 +26187,7 @@ public final class DebugProtoBuf {
       }
       public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.getDescriptor().getEnumTypes().get(0);
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final Level[] VALUES = values();
@@ -26209,11 +26209,11 @@ public final class DebugProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.VersionRequirement.Level)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.VersionRequirement.Level)
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind}
      */
     public enum VersionKind
         implements org.jetbrains.kotlin.protobuf.ProtocolMessageEnum {
@@ -26278,7 +26278,7 @@ public final class DebugProtoBuf {
       }
       public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.getDescriptor().getEnumTypes().get(1);
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.getDescriptor().getEnumTypes().get(1);
       }
 
       private static final VersionKind[] VALUES = values();
@@ -26300,7 +26300,7 @@ public final class DebugProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind)
     }
 
     private int bitField0_;
@@ -26357,9 +26357,9 @@ public final class DebugProtoBuf {
     }
 
     public static final int LEVEL_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level level_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Level level_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
      *
      * 
      * Level of the reported diagnostic
@@ -26369,13 +26369,13 @@ public final class DebugProtoBuf {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
      *
      * 
      * Level of the reported diagnostic
      * 

      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level getLevel() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Level getLevel() {
       return level_;
     }
 
@@ -26426,9 +26426,9 @@ public final class DebugProtoBuf {
     }
 
     public static final int VERSION_KIND_FIELD_NUMBER = 6;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.VersionKind versionKind_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.VersionKind versionKind_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
      *
      * 
      * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
@@ -26439,24 +26439,24 @@ public final class DebugProtoBuf {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
      *
      * 
      * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
      * (the "-api-version" argument value when compiling the call site) to be of at least the specified value
      * 

      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.VersionKind getVersionKind() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.VersionKind getVersionKind() {
       return versionKind_;
     }
 
     private void initFields() {
       version_ = 0;
       versionFull_ = 0;
-      level_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level.ERROR;
+      level_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Level.ERROR;
       errorCode_ = 0;
       message_ = 0;
-      versionKind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
+      versionKind_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -26534,53 +26534,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -26589,7 +26589,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -26601,25 +26601,25 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.VersionRequirement}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.VersionRequirement}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.VersionRequirement)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.VersionRequirement)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_VersionRequirement_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_VersionRequirement_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -26643,13 +26643,13 @@ public final class DebugProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000001);
         versionFull_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
-        level_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level.ERROR;
+        level_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Level.ERROR;
         bitField0_ = (bitField0_ & ~0x00000004);
         errorCode_ = 0;
         bitField0_ = (bitField0_ & ~0x00000008);
         message_ = 0;
         bitField0_ = (bitField0_ & ~0x00000010);
-        versionKind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
+        versionKind_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
         bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
@@ -26660,23 +26660,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_VersionRequirement_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -26709,16 +26709,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.getDefaultInstance()) return this;
         if (other.hasVersion()) {
           setVersion(other.getVersion());
         }
@@ -26749,11 +26749,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -26872,9 +26872,9 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level level_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level.ERROR;
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Level level_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Level.ERROR;
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
        *
        * 
        * Level of the reported diagnostic
@@ -26884,23 +26884,23 @@ public final class DebugProtoBuf {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
        *
        * 
        * Level of the reported diagnostic
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level getLevel() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Level getLevel() {
         return level_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
        *
        * 
        * Level of the reported diagnostic
        * 

        */
-      public Builder setLevel(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level value) {
+      public Builder setLevel(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Level value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -26910,7 +26910,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
        *
        * 
        * Level of the reported diagnostic
@@ -26918,7 +26918,7 @@ public final class DebugProtoBuf {
        */
       public Builder clearLevel() {
         bitField0_ = (bitField0_ & ~0x00000004);
-        level_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Level.ERROR;
+        level_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Level.ERROR;
         onChanged();
         return this;
       }
@@ -27019,9 +27019,9 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.VersionKind versionKind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.VersionKind versionKind_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
        *
        * 
        * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
@@ -27032,25 +27032,25 @@ public final class DebugProtoBuf {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
        *
        * 
        * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
        * (the "-api-version" argument value when compiling the call site) to be of at least the specified value
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.VersionKind getVersionKind() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.VersionKind getVersionKind() {
         return versionKind_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
        *
        * 
        * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
        * (the "-api-version" argument value when compiling the call site) to be of at least the specified value
        * 

        */
-      public Builder setVersionKind(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.VersionKind value) {
+      public Builder setVersionKind(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.VersionKind value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -27060,7 +27060,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
        *
        * 
        * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
@@ -27069,12 +27069,12 @@ public final class DebugProtoBuf {
        */
       public Builder clearVersionKind() {
         bitField0_ = (bitField0_ & ~0x00000020);
-        versionKind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
+        versionKind_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
         onChanged();
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.VersionRequirement)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.VersionRequirement)
     }
 
     static {
@@ -27082,43 +27082,43 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.VersionRequirement)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.VersionRequirement)
   }
 
   public interface VersionRequirementTableOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.VersionRequirementTable)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.VersionRequirementTable)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
-    java.util.List 
+    java.util.List 
         getRequirementList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement getRequirement(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement getRequirement(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
     int getRequirementCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
-    java.util.List 
+    java.util.List 
         getRequirementOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementOrBuilder getRequirementOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementOrBuilder getRequirementOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.VersionRequirementTable}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.VersionRequirementTable}
    */
   public static final class VersionRequirementTable extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.VersionRequirementTable)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.VersionRequirementTable)
       VersionRequirementTableOrBuilder {
     // Use VersionRequirementTable.newBuilder() to construct.
     private VersionRequirementTable(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -27167,10 +27167,10 @@ public final class DebugProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                requirement_ = new java.util.ArrayList();
+                requirement_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              requirement_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.PARSER, extensionRegistry));
+              requirement_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.PARSER, extensionRegistry));
               break;
             }
           }
@@ -27190,14 +27190,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_VersionRequirementTable_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_VersionRequirementTable_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -27216,36 +27216,36 @@ public final class DebugProtoBuf {
     }
 
     public static final int REQUIREMENT_FIELD_NUMBER = 1;
-    private java.util.List requirement_;
+    private java.util.List requirement_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
-    public java.util.List getRequirementList() {
+    public java.util.List getRequirementList() {
       return requirement_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getRequirementOrBuilderList() {
       return requirement_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
     public int getRequirementCount() {
       return requirement_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement getRequirement(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement getRequirement(int index) {
       return requirement_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementOrBuilder getRequirementOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementOrBuilder getRequirementOrBuilder(
         int index) {
       return requirement_.get(index);
     }
@@ -27294,53 +27294,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -27349,7 +27349,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -27361,25 +27361,25 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.VersionRequirementTable}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.VersionRequirementTable}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.VersionRequirementTable)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTableOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.VersionRequirementTable)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTableOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_VersionRequirementTable_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_VersionRequirementTable_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -27415,23 +27415,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_VersionRequirementTable_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable(this);
         int from_bitField0_ = bitField0_;
         if (requirementBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -27447,16 +27447,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable.getDefaultInstance()) return this;
         if (requirementBuilder_ == null) {
           if (!other.requirement_.isEmpty()) {
             if (requirement_.isEmpty()) {
@@ -27495,11 +27495,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementTable) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementTable) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -27510,22 +27510,22 @@ public final class DebugProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List requirement_ =
+      private java.util.List requirement_ =
         java.util.Collections.emptyList();
       private void ensureRequirementIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          requirement_ = new java.util.ArrayList(requirement_);
+          requirement_ = new java.util.ArrayList(requirement_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementOrBuilder> requirementBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementOrBuilder> requirementBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
-      public java.util.List getRequirementList() {
+      public java.util.List getRequirementList() {
         if (requirementBuilder_ == null) {
           return java.util.Collections.unmodifiableList(requirement_);
         } else {
@@ -27533,7 +27533,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public int getRequirementCount() {
         if (requirementBuilder_ == null) {
@@ -27543,9 +27543,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement getRequirement(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement getRequirement(int index) {
         if (requirementBuilder_ == null) {
           return requirement_.get(index);
         } else {
@@ -27553,10 +27553,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder setRequirement(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement value) {
         if (requirementBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -27570,10 +27570,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder setRequirement(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Builder builderForValue) {
         if (requirementBuilder_ == null) {
           ensureRequirementIsMutable();
           requirement_.set(index, builderForValue.build());
@@ -27584,9 +27584,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
-      public Builder addRequirement(org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement value) {
+      public Builder addRequirement(org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement value) {
         if (requirementBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -27600,10 +27600,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder addRequirement(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement value) {
         if (requirementBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -27617,10 +27617,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder addRequirement(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Builder builderForValue) {
         if (requirementBuilder_ == null) {
           ensureRequirementIsMutable();
           requirement_.add(builderForValue.build());
@@ -27631,10 +27631,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder addRequirement(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Builder builderForValue) {
         if (requirementBuilder_ == null) {
           ensureRequirementIsMutable();
           requirement_.add(index, builderForValue.build());
@@ -27645,10 +27645,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder addAllRequirement(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (requirementBuilder_ == null) {
           ensureRequirementIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -27660,7 +27660,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder clearRequirement() {
         if (requirementBuilder_ == null) {
@@ -27673,7 +27673,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder removeRequirement(int index) {
         if (requirementBuilder_ == null) {
@@ -27686,16 +27686,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder getRequirementBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Builder getRequirementBuilder(
           int index) {
         return getRequirementFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementOrBuilder getRequirementOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementOrBuilder getRequirementOrBuilder(
           int index) {
         if (requirementBuilder_ == null) {
           return requirement_.get(index);  } else {
@@ -27703,9 +27703,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getRequirementOrBuilderList() {
         if (requirementBuilder_ != null) {
           return requirementBuilder_.getMessageOrBuilderList();
@@ -27714,33 +27714,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder addRequirementBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Builder addRequirementBuilder() {
         return getRequirementFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder addRequirementBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Builder addRequirementBuilder(
           int index) {
         return getRequirementFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getRequirementBuilderList() {
         return getRequirementFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementOrBuilder> 
           getRequirementFieldBuilder() {
         if (requirementBuilder_ == null) {
           requirementBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirement.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.VersionRequirementOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirement.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.VersionRequirementOrBuilder>(
                   requirement_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
@@ -27750,7 +27750,7 @@ public final class DebugProtoBuf {
         return requirementBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.VersionRequirementTable)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.VersionRequirementTable)
     }
 
     static {
@@ -27758,79 +27758,79 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.VersionRequirementTable)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.VersionRequirementTable)
   }
 
   public interface PackageFragmentOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.PackageFragment)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.PackageFragment)
       org.jetbrains.kotlin.protobuf.GeneratedMessage.
           ExtendableMessageOrBuilder {
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
      */
     boolean hasStrings();
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable getStrings();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable getStrings();
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
      */
     boolean hasQualifiedNames();
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable getQualifiedNames();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable getQualifiedNames();
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+     * optional .org.jetbrains.kotlin.metadata.Package package = 3;
      */
     boolean hasPackage();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+     * optional .org.jetbrains.kotlin.metadata.Package package = 3;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Package getPackage();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Package getPackage();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+     * optional .org.jetbrains.kotlin.metadata.Package package = 3;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder getPackageOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageOrBuilder getPackageOrBuilder();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
-    java.util.List 
+    java.util.List 
         getClass_List();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass_(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Class getClass_(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
     int getClass_Count();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
-    java.util.List 
+    java.util.List 
         getClass_OrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.PackageFragment}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.PackageFragment}
    *
    * 
    * A part of the package, which is used to serialize .kjsm/.meta.js, .kotlin_builtins and .kotlin_metadata files.
@@ -27840,10 +27840,10 @@ public final class DebugProtoBuf {
   public static final class PackageFragment extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableMessage<
         PackageFragment> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.PackageFragment)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.PackageFragment)
       PackageFragmentOrBuilder {
     // Use PackageFragment.newBuilder() to construct.
-    private PackageFragment(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
+    private PackageFragment(org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -27888,11 +27888,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 10: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = strings_.toBuilder();
               }
-              strings_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.PARSER, extensionRegistry);
+              strings_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(strings_);
                 strings_ = subBuilder.buildPartial();
@@ -27901,11 +27901,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 18: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = qualifiedNames_.toBuilder();
               }
-              qualifiedNames_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.PARSER, extensionRegistry);
+              qualifiedNames_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(qualifiedNames_);
                 qualifiedNames_ = subBuilder.buildPartial();
@@ -27914,11 +27914,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 26: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = package_.toBuilder();
               }
-              package_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.PARSER, extensionRegistry);
+              package_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(package_);
                 package_ = subBuilder.buildPartial();
@@ -27928,10 +27928,10 @@ public final class DebugProtoBuf {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                class__ = new java.util.ArrayList();
+                class__ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000008;
               }
-              class__.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.PARSER, extensionRegistry));
+              class__.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.PARSER, extensionRegistry));
               break;
             }
           }
@@ -27951,14 +27951,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_PackageFragment_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_PackageFragment_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_PackageFragment_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_PackageFragment_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -27978,107 +27978,107 @@ public final class DebugProtoBuf {
 
     private int bitField0_;
     public static final int STRINGS_FIELD_NUMBER = 1;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable strings_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable strings_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
      */
     public boolean hasStrings() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable getStrings() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable getStrings() {
       return strings_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder() {
       return strings_;
     }
 
     public static final int QUALIFIED_NAMES_FIELD_NUMBER = 2;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNames_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable qualifiedNames_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
      */
     public boolean hasQualifiedNames() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable getQualifiedNames() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable getQualifiedNames() {
       return qualifiedNames_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder() {
       return qualifiedNames_;
     }
 
     public static final int PACKAGE_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Package package_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Package package_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+     * optional .org.jetbrains.kotlin.metadata.Package package = 3;
      */
     public boolean hasPackage() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+     * optional .org.jetbrains.kotlin.metadata.Package package = 3;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Package getPackage() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Package getPackage() {
       return package_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+     * optional .org.jetbrains.kotlin.metadata.Package package = 3;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder getPackageOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageOrBuilder getPackageOrBuilder() {
       return package_;
     }
 
     public static final int CLASS_FIELD_NUMBER = 4;
-    private java.util.List class__;
+    private java.util.List class__;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
-    public java.util.List getClass_List() {
+    public java.util.List getClass_List() {
       return class__;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
-    public java.util.List 
+    public java.util.List 
         getClass_OrBuilderList() {
       return class__;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
     public int getClass_Count() {
       return class__.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass_(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Class getClass_(int index) {
       return class__.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
         int index) {
       return class__.get(index);
     }
 
     private void initFields() {
-      strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
-      qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
-      package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance();
+      strings_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance();
+      qualifiedNames_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
+      package_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.getDefaultInstance();
       class__ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
@@ -28117,7 +28117,7 @@ public final class DebugProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessage
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeMessage(1, strings_);
@@ -28170,53 +28170,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -28225,7 +28225,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -28237,7 +28237,7 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.PackageFragment}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.PackageFragment}
      *
      * 
      * A part of the package, which is used to serialize .kjsm/.meta.js, .kotlin_builtins and .kotlin_metadata files.
@@ -28246,22 +28246,22 @@ public final class DebugProtoBuf {
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.PackageFragment)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragmentOrBuilder {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.PackageFragment)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragmentOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_PackageFragment_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_PackageFragment_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_PackageFragment_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_PackageFragment_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -28286,19 +28286,19 @@ public final class DebugProtoBuf {
       public Builder clear() {
         super.clear();
         if (stringsBuilder_ == null) {
-          strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
+          strings_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance();
         } else {
           stringsBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000001);
         if (qualifiedNamesBuilder_ == null) {
-          qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
+          qualifiedNames_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
         } else {
           qualifiedNamesBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000002);
         if (packageBuilder_ == null) {
-          package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance();
+          package_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.getDefaultInstance();
         } else {
           packageBuilder_.clear();
         }
@@ -28318,23 +28318,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_PackageFragment_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_PackageFragment_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -28376,16 +28376,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.getDefaultInstance()) return this;
         if (other.hasStrings()) {
           mergeStrings(other.getStrings());
         }
@@ -28456,11 +28456,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -28471,19 +28471,19 @@ public final class DebugProtoBuf {
       }
       private int bitField0_;
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable strings_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder> stringsBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder> stringsBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
       public boolean hasStrings() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable getStrings() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable getStrings() {
         if (stringsBuilder_ == null) {
           return strings_;
         } else {
@@ -28491,9 +28491,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
-      public Builder setStrings(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable value) {
+      public Builder setStrings(org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable value) {
         if (stringsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -28507,10 +28507,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
       public Builder setStrings(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder builderForValue) {
         if (stringsBuilder_ == null) {
           strings_ = builderForValue.build();
           onChanged();
@@ -28521,14 +28521,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
-      public Builder mergeStrings(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable value) {
+      public Builder mergeStrings(org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable value) {
         if (stringsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              strings_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance()) {
+              strings_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance()) {
             strings_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.newBuilder(strings_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.newBuilder(strings_).mergeFrom(value).buildPartial();
           } else {
             strings_ = value;
           }
@@ -28540,11 +28540,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
       public Builder clearStrings() {
         if (stringsBuilder_ == null) {
-          strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
+          strings_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance();
           onChanged();
         } else {
           stringsBuilder_.clear();
@@ -28553,17 +28553,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder getStringsBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder getStringsBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getStringsFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder() {
         if (stringsBuilder_ != null) {
           return stringsBuilder_.getMessageOrBuilder();
         } else {
@@ -28571,14 +28571,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder> 
           getStringsFieldBuilder() {
         if (stringsBuilder_ == null) {
           stringsBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder>(
                   getStrings(),
                   getParentForChildren(),
                   isClean());
@@ -28587,19 +28587,19 @@ public final class DebugProtoBuf {
         return stringsBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder> qualifiedNamesBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder> qualifiedNamesBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
       public boolean hasQualifiedNames() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable getQualifiedNames() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable getQualifiedNames() {
         if (qualifiedNamesBuilder_ == null) {
           return qualifiedNames_;
         } else {
@@ -28607,9 +28607,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
-      public Builder setQualifiedNames(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable value) {
+      public Builder setQualifiedNames(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable value) {
         if (qualifiedNamesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -28623,10 +28623,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
       public Builder setQualifiedNames(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder builderForValue) {
         if (qualifiedNamesBuilder_ == null) {
           qualifiedNames_ = builderForValue.build();
           onChanged();
@@ -28637,14 +28637,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
-      public Builder mergeQualifiedNames(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable value) {
+      public Builder mergeQualifiedNames(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable value) {
         if (qualifiedNamesBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              qualifiedNames_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance()) {
+              qualifiedNames_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance()) {
             qualifiedNames_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.newBuilder(qualifiedNames_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.newBuilder(qualifiedNames_).mergeFrom(value).buildPartial();
           } else {
             qualifiedNames_ = value;
           }
@@ -28656,11 +28656,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
       public Builder clearQualifiedNames() {
         if (qualifiedNamesBuilder_ == null) {
-          qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
+          qualifiedNames_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
           onChanged();
         } else {
           qualifiedNamesBuilder_.clear();
@@ -28669,17 +28669,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder getQualifiedNamesBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder getQualifiedNamesBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getQualifiedNamesFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder() {
         if (qualifiedNamesBuilder_ != null) {
           return qualifiedNamesBuilder_.getMessageOrBuilder();
         } else {
@@ -28687,14 +28687,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder> 
           getQualifiedNamesFieldBuilder() {
         if (qualifiedNamesBuilder_ == null) {
           qualifiedNamesBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder>(
                   getQualifiedNames(),
                   getParentForChildren(),
                   isClean());
@@ -28703,19 +28703,19 @@ public final class DebugProtoBuf {
         return qualifiedNamesBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Package package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Package package_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder> packageBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Package, org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageOrBuilder> packageBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
       public boolean hasPackage() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Package getPackage() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Package getPackage() {
         if (packageBuilder_ == null) {
           return package_;
         } else {
@@ -28723,9 +28723,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
-      public Builder setPackage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Package value) {
+      public Builder setPackage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Package value) {
         if (packageBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -28739,10 +28739,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
       public Builder setPackage(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.Builder builderForValue) {
         if (packageBuilder_ == null) {
           package_ = builderForValue.build();
           onChanged();
@@ -28753,14 +28753,14 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
-      public Builder mergePackage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Package value) {
+      public Builder mergePackage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Package value) {
         if (packageBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
-              package_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance()) {
+              package_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.getDefaultInstance()) {
             package_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.newBuilder(package_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.newBuilder(package_).mergeFrom(value).buildPartial();
           } else {
             package_ = value;
           }
@@ -28772,11 +28772,11 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
       public Builder clearPackage() {
         if (packageBuilder_ == null) {
-          package_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.getDefaultInstance();
+          package_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.getDefaultInstance();
           onChanged();
         } else {
           packageBuilder_.clear();
@@ -28785,17 +28785,17 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder getPackageBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.Builder getPackageBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getPackageFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder getPackageOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageOrBuilder getPackageOrBuilder() {
         if (packageBuilder_ != null) {
           return packageBuilder_.getMessageOrBuilder();
         } else {
@@ -28803,14 +28803,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Package, org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageOrBuilder> 
           getPackageFieldBuilder() {
         if (packageBuilder_ == null) {
           packageBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Package, org.jetbrains.kotlin.serialization.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Package, org.jetbrains.kotlin.metadata.DebugProtoBuf.Package.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageOrBuilder>(
                   getPackage(),
                   getParentForChildren(),
                   isClean());
@@ -28819,22 +28819,22 @@ public final class DebugProtoBuf {
         return packageBuilder_;
       }
 
-      private java.util.List class__ =
+      private java.util.List class__ =
         java.util.Collections.emptyList();
       private void ensureClass_IsMutable() {
         if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-          class__ = new java.util.ArrayList(class__);
+          class__ = new java.util.ArrayList(class__);
           bitField0_ |= 0x00000008;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> class_Builder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ClassOrBuilder> class_Builder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
-      public java.util.List getClass_List() {
+      public java.util.List getClass_List() {
         if (class_Builder_ == null) {
           return java.util.Collections.unmodifiableList(class__);
         } else {
@@ -28842,7 +28842,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public int getClass_Count() {
         if (class_Builder_ == null) {
@@ -28852,9 +28852,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class getClass_(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Class getClass_(int index) {
         if (class_Builder_ == null) {
           return class__.get(index);
         } else {
@@ -28862,10 +28862,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder setClass_(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Class value) {
         if (class_Builder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -28879,10 +28879,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder setClass_(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.Builder builderForValue) {
         if (class_Builder_ == null) {
           ensureClass_IsMutable();
           class__.set(index, builderForValue.build());
@@ -28893,9 +28893,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
-      public Builder addClass_(org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
+      public Builder addClass_(org.jetbrains.kotlin.metadata.DebugProtoBuf.Class value) {
         if (class_Builder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -28909,10 +28909,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder addClass_(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Class value) {
         if (class_Builder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -28926,10 +28926,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder addClass_(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.Builder builderForValue) {
         if (class_Builder_ == null) {
           ensureClass_IsMutable();
           class__.add(builderForValue.build());
@@ -28940,10 +28940,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder addClass_(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.Builder builderForValue) {
         if (class_Builder_ == null) {
           ensureClass_IsMutable();
           class__.add(index, builderForValue.build());
@@ -28954,10 +28954,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder addAllClass_(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (class_Builder_ == null) {
           ensureClass_IsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -28969,7 +28969,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder clearClass_() {
         if (class_Builder_ == null) {
@@ -28982,7 +28982,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder removeClass_(int index) {
         if (class_Builder_ == null) {
@@ -28995,16 +28995,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder getClass_Builder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.Builder getClass_Builder(
           int index) {
         return getClass_FieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ClassOrBuilder getClass_OrBuilder(
           int index) {
         if (class_Builder_ == null) {
           return class__.get(index);  } else {
@@ -29012,9 +29012,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getClass_OrBuilderList() {
         if (class_Builder_ != null) {
           return class_Builder_.getMessageOrBuilderList();
@@ -29023,33 +29023,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClass_Builder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.Builder addClass_Builder() {
         return getClass_FieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder addClass_Builder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.Builder addClass_Builder(
           int index) {
         return getClass_FieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
-      public java.util.List 
+      public java.util.List 
            getClass_BuilderList() {
         return getClass_FieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ClassOrBuilder> 
           getClass_FieldBuilder() {
         if (class_Builder_ == null) {
           class_Builder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ClassOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Class.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ClassOrBuilder>(
                   class__,
                   ((bitField0_ & 0x00000008) == 0x00000008),
                   getParentForChildren(),
@@ -29059,7 +29059,7 @@ public final class DebugProtoBuf {
         return class_Builder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.PackageFragment)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.PackageFragment)
     }
 
     static {
@@ -29067,43 +29067,43 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.PackageFragment)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.PackageFragment)
   }
 
   public interface ContractOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Contract)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Contract)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
-    java.util.List 
+    java.util.List 
         getEffectList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect getEffect(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect getEffect(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
     int getEffectCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
-    java.util.List 
+    java.util.List 
         getEffectOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.EffectOrBuilder getEffectOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.EffectOrBuilder getEffectOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Contract}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Contract}
    */
   public static final class Contract extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Contract)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Contract)
       ContractOrBuilder {
     // Use Contract.newBuilder() to construct.
     private Contract(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -29152,10 +29152,10 @@ public final class DebugProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                effect_ = new java.util.ArrayList();
+                effect_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              effect_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.PARSER, extensionRegistry));
+              effect_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.PARSER, extensionRegistry));
               break;
             }
           }
@@ -29175,14 +29175,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Contract_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Contract_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Contract_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Contract_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -29201,36 +29201,36 @@ public final class DebugProtoBuf {
     }
 
     public static final int EFFECT_FIELD_NUMBER = 1;
-    private java.util.List effect_;
+    private java.util.List effect_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
-    public java.util.List getEffectList() {
+    public java.util.List getEffectList() {
       return effect_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getEffectOrBuilderList() {
       return effect_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
     public int getEffectCount() {
       return effect_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect getEffect(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect getEffect(int index) {
       return effect_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.EffectOrBuilder getEffectOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.EffectOrBuilder getEffectOrBuilder(
         int index) {
       return effect_.get(index);
     }
@@ -29285,53 +29285,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -29340,7 +29340,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -29352,25 +29352,25 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Contract}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Contract}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Contract)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.ContractOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Contract)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.ContractOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Contract_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Contract_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Contract_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Contract_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -29406,23 +29406,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Contract_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Contract_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract(this);
         int from_bitField0_ = bitField0_;
         if (effectBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -29438,16 +29438,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract.getDefaultInstance()) return this;
         if (effectBuilder_ == null) {
           if (!other.effect_.isEmpty()) {
             if (effect_.isEmpty()) {
@@ -29492,11 +29492,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Contract) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.Contract) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -29507,22 +29507,22 @@ public final class DebugProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List effect_ =
+      private java.util.List effect_ =
         java.util.Collections.emptyList();
       private void ensureEffectIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          effect_ = new java.util.ArrayList(effect_);
+          effect_ = new java.util.ArrayList(effect_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect, org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.EffectOrBuilder> effectBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect, org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.EffectOrBuilder> effectBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
-      public java.util.List getEffectList() {
+      public java.util.List getEffectList() {
         if (effectBuilder_ == null) {
           return java.util.Collections.unmodifiableList(effect_);
         } else {
@@ -29530,7 +29530,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public int getEffectCount() {
         if (effectBuilder_ == null) {
@@ -29540,9 +29540,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect getEffect(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect getEffect(int index) {
         if (effectBuilder_ == null) {
           return effect_.get(index);
         } else {
@@ -29550,10 +29550,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder setEffect(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect value) {
         if (effectBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -29567,10 +29567,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder setEffect(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.Builder builderForValue) {
         if (effectBuilder_ == null) {
           ensureEffectIsMutable();
           effect_.set(index, builderForValue.build());
@@ -29581,9 +29581,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
-      public Builder addEffect(org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect value) {
+      public Builder addEffect(org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect value) {
         if (effectBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -29597,10 +29597,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder addEffect(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect value) {
         if (effectBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -29614,10 +29614,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder addEffect(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.Builder builderForValue) {
         if (effectBuilder_ == null) {
           ensureEffectIsMutable();
           effect_.add(builderForValue.build());
@@ -29628,10 +29628,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder addEffect(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.Builder builderForValue) {
         if (effectBuilder_ == null) {
           ensureEffectIsMutable();
           effect_.add(index, builderForValue.build());
@@ -29642,10 +29642,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder addAllEffect(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (effectBuilder_ == null) {
           ensureEffectIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -29657,7 +29657,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder clearEffect() {
         if (effectBuilder_ == null) {
@@ -29670,7 +29670,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder removeEffect(int index) {
         if (effectBuilder_ == null) {
@@ -29683,16 +29683,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.Builder getEffectBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.Builder getEffectBuilder(
           int index) {
         return getEffectFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.EffectOrBuilder getEffectOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.EffectOrBuilder getEffectOrBuilder(
           int index) {
         if (effectBuilder_ == null) {
           return effect_.get(index);  } else {
@@ -29700,9 +29700,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getEffectOrBuilderList() {
         if (effectBuilder_ != null) {
           return effectBuilder_.getMessageOrBuilderList();
@@ -29711,33 +29711,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.Builder addEffectBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.Builder addEffectBuilder() {
         return getEffectFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.Builder addEffectBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.Builder addEffectBuilder(
           int index) {
         return getEffectFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getEffectBuilderList() {
         return getEffectFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect, org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.EffectOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect, org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.EffectOrBuilder> 
           getEffectFieldBuilder() {
         if (effectBuilder_ == null) {
           effectBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect, org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.EffectOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect, org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.EffectOrBuilder>(
                   effect_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
@@ -29747,7 +29747,7 @@ public final class DebugProtoBuf {
         return effectBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Contract)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Contract)
     }
 
     static {
@@ -29755,48 +29755,48 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Contract)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Contract)
   }
 
   public interface EffectOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Effect)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Effect)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+     * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
      */
     boolean hasEffectType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+     * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.EffectType getEffectType();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.EffectType getEffectType();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
-    java.util.List 
+    java.util.List 
         getEffectConstructorArgumentList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression getEffectConstructorArgument(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression getEffectConstructorArgument(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
     int getEffectConstructorArgumentCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
-    java.util.List 
+    java.util.List 
         getEffectConstructorArgumentOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder getEffectConstructorArgumentOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder getEffectConstructorArgumentOrBuilder(
         int index);
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
      *
      * 
      * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
@@ -29805,39 +29805,39 @@ public final class DebugProtoBuf {
      */
     boolean hasConclusionOfConditionalEffect();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
      *
      * 
      * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
      * is given by other fields in this message, and 'Expression' is stored in this field.
      * 

      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression getConclusionOfConditionalEffect();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression getConclusionOfConditionalEffect();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
      *
      * 
      * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
      * is given by other fields in this message, and 'Expression' is stored in this field.
      * 

      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder getConclusionOfConditionalEffectOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder getConclusionOfConditionalEffectOrBuilder();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+     * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
      */
     boolean hasKind();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+     * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.InvocationKind getKind();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.InvocationKind getKind();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Effect}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Effect}
    */
   public static final class Effect extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Effect)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Effect)
       EffectOrBuilder {
     // Use Effect.newBuilder() to construct.
     private Effect(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -29886,7 +29886,7 @@ public final class DebugProtoBuf {
             }
             case 8: {
               int rawValue = input.readEnum();
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.EffectType value = org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.EffectType.valueOf(rawValue);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.EffectType value = org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.EffectType.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
@@ -29897,18 +29897,18 @@ public final class DebugProtoBuf {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                effectConstructorArgument_ = new java.util.ArrayList();
+                effectConstructorArgument_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              effectConstructorArgument_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.PARSER, extensionRegistry));
+              effectConstructorArgument_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.PARSER, extensionRegistry));
               break;
             }
             case 26: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = conclusionOfConditionalEffect_.toBuilder();
               }
-              conclusionOfConditionalEffect_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.PARSER, extensionRegistry);
+              conclusionOfConditionalEffect_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(conclusionOfConditionalEffect_);
                 conclusionOfConditionalEffect_ = subBuilder.buildPartial();
@@ -29918,7 +29918,7 @@ public final class DebugProtoBuf {
             }
             case 32: {
               int rawValue = input.readEnum();
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.InvocationKind value = org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.InvocationKind.valueOf(rawValue);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.InvocationKind value = org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.InvocationKind.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(4, rawValue);
               } else {
@@ -29944,14 +29944,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Effect_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Effect_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Effect_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Effect_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -29970,7 +29970,7 @@ public final class DebugProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.Effect.EffectType}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.Effect.EffectType}
      *
      * 
      * This enum controls which effect this message contains and how 'effectConstructorArguments'
@@ -30069,7 +30069,7 @@ public final class DebugProtoBuf {
       }
       public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.getDescriptor().getEnumTypes().get(0);
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final EffectType[] VALUES = values();
@@ -30091,11 +30091,11 @@ public final class DebugProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Effect.EffectType)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Effect.EffectType)
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.Effect.InvocationKind}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.Effect.InvocationKind}
      */
     public enum InvocationKind
         implements org.jetbrains.kotlin.protobuf.ProtocolMessageEnum {
@@ -30160,7 +30160,7 @@ public final class DebugProtoBuf {
       }
       public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.getDescriptor().getEnumTypes().get(1);
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.getDescriptor().getEnumTypes().get(1);
       }
 
       private static final InvocationKind[] VALUES = values();
@@ -30182,64 +30182,64 @@ public final class DebugProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Effect.InvocationKind)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Effect.InvocationKind)
     }
 
     private int bitField0_;
     public static final int EFFECT_TYPE_FIELD_NUMBER = 1;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.EffectType effectType_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.EffectType effectType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+     * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
      */
     public boolean hasEffectType() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+     * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.EffectType getEffectType() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.EffectType getEffectType() {
       return effectType_;
     }
 
     public static final int EFFECT_CONSTRUCTOR_ARGUMENT_FIELD_NUMBER = 2;
-    private java.util.List effectConstructorArgument_;
+    private java.util.List effectConstructorArgument_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
-    public java.util.List getEffectConstructorArgumentList() {
+    public java.util.List getEffectConstructorArgumentList() {
       return effectConstructorArgument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getEffectConstructorArgumentOrBuilderList() {
       return effectConstructorArgument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
     public int getEffectConstructorArgumentCount() {
       return effectConstructorArgument_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression getEffectConstructorArgument(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression getEffectConstructorArgument(int index) {
       return effectConstructorArgument_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder getEffectConstructorArgumentOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder getEffectConstructorArgumentOrBuilder(
         int index) {
       return effectConstructorArgument_.get(index);
     }
 
     public static final int CONCLUSION_OF_CONDITIONAL_EFFECT_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression conclusionOfConditionalEffect_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression conclusionOfConditionalEffect_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
      *
      * 
      * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
@@ -30250,48 +30250,48 @@ public final class DebugProtoBuf {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
      *
      * 
      * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
      * is given by other fields in this message, and 'Expression' is stored in this field.
      * 

      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression getConclusionOfConditionalEffect() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression getConclusionOfConditionalEffect() {
       return conclusionOfConditionalEffect_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
      *
      * 
      * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
      * is given by other fields in this message, and 'Expression' is stored in this field.
      * 

      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder getConclusionOfConditionalEffectOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder getConclusionOfConditionalEffectOrBuilder() {
       return conclusionOfConditionalEffect_;
     }
 
     public static final int KIND_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.InvocationKind kind_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.InvocationKind kind_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+     * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
      */
     public boolean hasKind() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+     * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.InvocationKind getKind() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.InvocationKind getKind() {
       return kind_;
     }
 
     private void initFields() {
-      effectType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
+      effectType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
       effectConstructorArgument_ = java.util.Collections.emptyList();
-      conclusionOfConditionalEffect_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.getDefaultInstance();
-      kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
+      conclusionOfConditionalEffect_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.getDefaultInstance();
+      kind_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -30367,53 +30367,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -30422,7 +30422,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -30434,25 +30434,25 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Effect}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Effect}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Effect)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.EffectOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Effect)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.EffectOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Effect_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Effect_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Effect_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Effect_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -30474,7 +30474,7 @@ public final class DebugProtoBuf {
 
       public Builder clear() {
         super.clear();
-        effectType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
+        effectType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
         bitField0_ = (bitField0_ & ~0x00000001);
         if (effectConstructorArgumentBuilder_ == null) {
           effectConstructorArgument_ = java.util.Collections.emptyList();
@@ -30483,12 +30483,12 @@ public final class DebugProtoBuf {
           effectConstructorArgumentBuilder_.clear();
         }
         if (conclusionOfConditionalEffectBuilder_ == null) {
-          conclusionOfConditionalEffect_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.getDefaultInstance();
+          conclusionOfConditionalEffect_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.getDefaultInstance();
         } else {
           conclusionOfConditionalEffectBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000004);
-        kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
+        kind_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
@@ -30499,23 +30499,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Effect_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Effect_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -30549,16 +30549,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.getDefaultInstance()) return this;
         if (other.hasEffectType()) {
           setEffectType(other.getEffectType());
         }
@@ -30618,11 +30618,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -30633,23 +30633,23 @@ public final class DebugProtoBuf {
       }
       private int bitField0_;
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.EffectType effectType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.EffectType effectType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+       * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
        */
       public boolean hasEffectType() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+       * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.EffectType getEffectType() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.EffectType getEffectType() {
         return effectType_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+       * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
        */
-      public Builder setEffectType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.EffectType value) {
+      public Builder setEffectType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.EffectType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -30659,31 +30659,31 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+       * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
        */
       public Builder clearEffectType() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        effectType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
+        effectType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
         onChanged();
         return this;
       }
 
-      private java.util.List effectConstructorArgument_ =
+      private java.util.List effectConstructorArgument_ =
         java.util.Collections.emptyList();
       private void ensureEffectConstructorArgumentIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          effectConstructorArgument_ = new java.util.ArrayList(effectConstructorArgument_);
+          effectConstructorArgument_ = new java.util.ArrayList(effectConstructorArgument_);
           bitField0_ |= 0x00000002;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder> effectConstructorArgumentBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder> effectConstructorArgumentBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
-      public java.util.List getEffectConstructorArgumentList() {
+      public java.util.List getEffectConstructorArgumentList() {
         if (effectConstructorArgumentBuilder_ == null) {
           return java.util.Collections.unmodifiableList(effectConstructorArgument_);
         } else {
@@ -30691,7 +30691,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public int getEffectConstructorArgumentCount() {
         if (effectConstructorArgumentBuilder_ == null) {
@@ -30701,9 +30701,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression getEffectConstructorArgument(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression getEffectConstructorArgument(int index) {
         if (effectConstructorArgumentBuilder_ == null) {
           return effectConstructorArgument_.get(index);
         } else {
@@ -30711,10 +30711,10 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder setEffectConstructorArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression value) {
         if (effectConstructorArgumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -30728,10 +30728,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder setEffectConstructorArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder builderForValue) {
         if (effectConstructorArgumentBuilder_ == null) {
           ensureEffectConstructorArgumentIsMutable();
           effectConstructorArgument_.set(index, builderForValue.build());
@@ -30742,9 +30742,9 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
-      public Builder addEffectConstructorArgument(org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression value) {
+      public Builder addEffectConstructorArgument(org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression value) {
         if (effectConstructorArgumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -30758,10 +30758,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder addEffectConstructorArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression value) {
         if (effectConstructorArgumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -30775,10 +30775,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder addEffectConstructorArgument(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder builderForValue) {
         if (effectConstructorArgumentBuilder_ == null) {
           ensureEffectConstructorArgumentIsMutable();
           effectConstructorArgument_.add(builderForValue.build());
@@ -30789,10 +30789,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder addEffectConstructorArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder builderForValue) {
         if (effectConstructorArgumentBuilder_ == null) {
           ensureEffectConstructorArgumentIsMutable();
           effectConstructorArgument_.add(index, builderForValue.build());
@@ -30803,10 +30803,10 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder addAllEffectConstructorArgument(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (effectConstructorArgumentBuilder_ == null) {
           ensureEffectConstructorArgumentIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -30818,7 +30818,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder clearEffectConstructorArgument() {
         if (effectConstructorArgumentBuilder_ == null) {
@@ -30831,7 +30831,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder removeEffectConstructorArgument(int index) {
         if (effectConstructorArgumentBuilder_ == null) {
@@ -30844,16 +30844,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder getEffectConstructorArgumentBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder getEffectConstructorArgumentBuilder(
           int index) {
         return getEffectConstructorArgumentFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder getEffectConstructorArgumentOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder getEffectConstructorArgumentOrBuilder(
           int index) {
         if (effectConstructorArgumentBuilder_ == null) {
           return effectConstructorArgument_.get(index);  } else {
@@ -30861,9 +30861,9 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getEffectConstructorArgumentOrBuilderList() {
         if (effectConstructorArgumentBuilder_ != null) {
           return effectConstructorArgumentBuilder_.getMessageOrBuilderList();
@@ -30872,33 +30872,33 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder addEffectConstructorArgumentBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder addEffectConstructorArgumentBuilder() {
         return getEffectConstructorArgumentFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder addEffectConstructorArgumentBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder addEffectConstructorArgumentBuilder(
           int index) {
         return getEffectConstructorArgumentFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getEffectConstructorArgumentBuilderList() {
         return getEffectConstructorArgumentFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder> 
           getEffectConstructorArgumentFieldBuilder() {
         if (effectConstructorArgumentBuilder_ == null) {
           effectConstructorArgumentBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder>(
                   effectConstructorArgument_,
                   ((bitField0_ & 0x00000002) == 0x00000002),
                   getParentForChildren(),
@@ -30908,11 +30908,11 @@ public final class DebugProtoBuf {
         return effectConstructorArgumentBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression conclusionOfConditionalEffect_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression conclusionOfConditionalEffect_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder> conclusionOfConditionalEffectBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder> conclusionOfConditionalEffectBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
@@ -30923,14 +30923,14 @@ public final class DebugProtoBuf {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
        * is given by other fields in this message, and 'Expression' is stored in this field.
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression getConclusionOfConditionalEffect() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression getConclusionOfConditionalEffect() {
         if (conclusionOfConditionalEffectBuilder_ == null) {
           return conclusionOfConditionalEffect_;
         } else {
@@ -30938,14 +30938,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
        * is given by other fields in this message, and 'Expression' is stored in this field.
        * 

        */
-      public Builder setConclusionOfConditionalEffect(org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression value) {
+      public Builder setConclusionOfConditionalEffect(org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression value) {
         if (conclusionOfConditionalEffectBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -30959,7 +30959,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
@@ -30967,7 +30967,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder setConclusionOfConditionalEffect(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder builderForValue) {
         if (conclusionOfConditionalEffectBuilder_ == null) {
           conclusionOfConditionalEffect_ = builderForValue.build();
           onChanged();
@@ -30978,19 +30978,19 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
        * is given by other fields in this message, and 'Expression' is stored in this field.
        * 

        */
-      public Builder mergeConclusionOfConditionalEffect(org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression value) {
+      public Builder mergeConclusionOfConditionalEffect(org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression value) {
         if (conclusionOfConditionalEffectBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
-              conclusionOfConditionalEffect_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.getDefaultInstance()) {
+              conclusionOfConditionalEffect_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.getDefaultInstance()) {
             conclusionOfConditionalEffect_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.newBuilder(conclusionOfConditionalEffect_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.newBuilder(conclusionOfConditionalEffect_).mergeFrom(value).buildPartial();
           } else {
             conclusionOfConditionalEffect_ = value;
           }
@@ -31002,7 +31002,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
@@ -31011,7 +31011,7 @@ public final class DebugProtoBuf {
        */
       public Builder clearConclusionOfConditionalEffect() {
         if (conclusionOfConditionalEffectBuilder_ == null) {
-          conclusionOfConditionalEffect_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.getDefaultInstance();
+          conclusionOfConditionalEffect_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.getDefaultInstance();
           onChanged();
         } else {
           conclusionOfConditionalEffectBuilder_.clear();
@@ -31020,27 +31020,27 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
        * is given by other fields in this message, and 'Expression' is stored in this field.
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder getConclusionOfConditionalEffectBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder getConclusionOfConditionalEffectBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getConclusionOfConditionalEffectFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
        * is given by other fields in this message, and 'Expression' is stored in this field.
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder getConclusionOfConditionalEffectOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder getConclusionOfConditionalEffectOrBuilder() {
         if (conclusionOfConditionalEffectBuilder_ != null) {
           return conclusionOfConditionalEffectBuilder_.getMessageOrBuilder();
         } else {
@@ -31048,7 +31048,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
@@ -31056,11 +31056,11 @@ public final class DebugProtoBuf {
        * 

        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder> 
           getConclusionOfConditionalEffectFieldBuilder() {
         if (conclusionOfConditionalEffectBuilder_ == null) {
           conclusionOfConditionalEffectBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder>(
                   getConclusionOfConditionalEffect(),
                   getParentForChildren(),
                   isClean());
@@ -31069,23 +31069,23 @@ public final class DebugProtoBuf {
         return conclusionOfConditionalEffectBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.InvocationKind kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.InvocationKind kind_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+       * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
        */
       public boolean hasKind() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+       * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.InvocationKind getKind() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.InvocationKind getKind() {
         return kind_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+       * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
        */
-      public Builder setKind(org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.InvocationKind value) {
+      public Builder setKind(org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.InvocationKind value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -31095,16 +31095,16 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+       * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
        */
       public Builder clearKind() {
         bitField0_ = (bitField0_ & ~0x00000008);
-        kind_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
+        kind_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
         onChanged();
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Effect)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Effect)
     }
 
     static {
@@ -31112,11 +31112,11 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Effect)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Effect)
   }
 
   public interface ExpressionOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Expression)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Expression)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
@@ -31158,16 +31158,16 @@ public final class DebugProtoBuf {
     int getValueParameterReference();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
      */
     boolean hasConstantValue();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.ConstantValue getConstantValue();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.ConstantValue getConstantValue();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
      *
      * 
      * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
@@ -31176,23 +31176,23 @@ public final class DebugProtoBuf {
      */
     boolean hasIsInstanceType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
      *
      * 
      * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
      * and with type encoded in either one of next two fields as RHS.
      * 

      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getIsInstanceType();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getIsInstanceType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
      *
      * 
      * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
      * and with type encoded in either one of next two fields as RHS.
      * 

      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getIsInstanceTypeOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getIsInstanceTypeOrBuilder();
 
     /**
      * optional int32 is_instance_type_id = 5;
@@ -31204,7 +31204,7 @@ public final class DebugProtoBuf {
     int getIsInstanceTypeId();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -31212,10 +31212,10 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message
      * 

      */
-    java.util.List 
+    java.util.List 
         getAndArgumentList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -31223,9 +31223,9 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message
      * 

      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression getAndArgument(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression getAndArgument(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -31235,7 +31235,7 @@ public final class DebugProtoBuf {
      */
     int getAndArgumentCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -31243,10 +31243,10 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message
      * 

      */
-    java.util.List 
+    java.util.List 
         getAndArgumentOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -31254,11 +31254,11 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message
      * 

      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder getAndArgumentOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder getAndArgumentOrBuilder(
         int index);
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -31266,10 +31266,10 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message.
      * 

      */
-    java.util.List 
+    java.util.List 
         getOrArgumentList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -31277,9 +31277,9 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message.
      * 

      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression getOrArgument(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression getOrArgument(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -31289,7 +31289,7 @@ public final class DebugProtoBuf {
      */
     int getOrArgumentCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -31297,10 +31297,10 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message.
      * 

      */
-    java.util.List 
+    java.util.List 
         getOrArgumentOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -31308,11 +31308,11 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message.
      * 

      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder getOrArgumentOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder getOrArgumentOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Expression}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Expression}
    *
    * 
    * We use some trickery to optimize memory footprint of contract-expressions:
@@ -31321,7 +31321,7 @@ public final class DebugProtoBuf {
    */
   public static final class Expression extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Expression)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Expression)
       ExpressionOrBuilder {
     // Use Expression.newBuilder() to construct.
     private Expression(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -31380,7 +31380,7 @@ public final class DebugProtoBuf {
             }
             case 24: {
               int rawValue = input.readEnum();
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.ConstantValue value = org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.ConstantValue.valueOf(rawValue);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.ConstantValue value = org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.ConstantValue.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(3, rawValue);
               } else {
@@ -31390,11 +31390,11 @@ public final class DebugProtoBuf {
               break;
             }
             case 34: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = isInstanceType_.toBuilder();
               }
-              isInstanceType_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry);
+              isInstanceType_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(isInstanceType_);
                 isInstanceType_ = subBuilder.buildPartial();
@@ -31409,18 +31409,18 @@ public final class DebugProtoBuf {
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                andArgument_ = new java.util.ArrayList();
+                andArgument_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              andArgument_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.PARSER, extensionRegistry));
+              andArgument_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.PARSER, extensionRegistry));
               break;
             }
             case 58: {
               if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
-                orArgument_ = new java.util.ArrayList();
+                orArgument_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000040;
               }
-              orArgument_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.PARSER, extensionRegistry));
+              orArgument_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.PARSER, extensionRegistry));
               break;
             }
           }
@@ -31443,14 +31443,14 @@ public final class DebugProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Expression_descriptor;
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Expression_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Expression_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Expression_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder.class);
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -31469,7 +31469,7 @@ public final class DebugProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.Expression.ConstantValue}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.Expression.ConstantValue}
      */
     public enum ConstantValue
         implements org.jetbrains.kotlin.protobuf.ProtocolMessageEnum {
@@ -31534,7 +31534,7 @@ public final class DebugProtoBuf {
       }
       public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.getDescriptor().getEnumTypes().get(0);
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final ConstantValue[] VALUES = values();
@@ -31556,7 +31556,7 @@ public final class DebugProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Expression.ConstantValue)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Expression.ConstantValue)
     }
 
     private int bitField0_;
@@ -31611,24 +31611,24 @@ public final class DebugProtoBuf {
     }
 
     public static final int CONSTANT_VALUE_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.ConstantValue constantValue_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.ConstantValue constantValue_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
      */
     public boolean hasConstantValue() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.ConstantValue getConstantValue() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.ConstantValue getConstantValue() {
       return constantValue_;
     }
 
     public static final int IS_INSTANCE_TYPE_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type isInstanceType_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type isInstanceType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
      *
      * 
      * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
@@ -31639,25 +31639,25 @@ public final class DebugProtoBuf {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
      *
      * 
      * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
      * and with type encoded in either one of next two fields as RHS.
      * 

      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getIsInstanceType() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getIsInstanceType() {
       return isInstanceType_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
      *
      * 
      * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
      * and with type encoded in either one of next two fields as RHS.
      * 

      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getIsInstanceTypeOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getIsInstanceTypeOrBuilder() {
       return isInstanceType_;
     }
 
@@ -31677,9 +31677,9 @@ public final class DebugProtoBuf {
     }
 
     public static final int AND_ARGUMENT_FIELD_NUMBER = 6;
-    private java.util.List andArgument_;
+    private java.util.List andArgument_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -31687,11 +31687,11 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message
      * 

      */
-    public java.util.List getAndArgumentList() {
+    public java.util.List getAndArgumentList() {
       return andArgument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -31699,12 +31699,12 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message
      * 

      */
-    public java.util.List 
+    public java.util.List 
         getAndArgumentOrBuilderList() {
       return andArgument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -31716,7 +31716,7 @@ public final class DebugProtoBuf {
       return andArgument_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -31724,11 +31724,11 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message
      * 

      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression getAndArgument(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression getAndArgument(int index) {
       return andArgument_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -31736,15 +31736,15 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message
      * 

      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder getAndArgumentOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder getAndArgumentOrBuilder(
         int index) {
       return andArgument_.get(index);
     }
 
     public static final int OR_ARGUMENT_FIELD_NUMBER = 7;
-    private java.util.List orArgument_;
+    private java.util.List orArgument_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -31752,11 +31752,11 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message.
      * 

      */
-    public java.util.List getOrArgumentList() {
+    public java.util.List getOrArgumentList() {
       return orArgument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -31764,12 +31764,12 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message.
      * 

      */
-    public java.util.List 
+    public java.util.List 
         getOrArgumentOrBuilderList() {
       return orArgument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -31781,7 +31781,7 @@ public final class DebugProtoBuf {
       return orArgument_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -31789,11 +31789,11 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message.
      * 

      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression getOrArgument(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression getOrArgument(int index) {
       return orArgument_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -31801,7 +31801,7 @@ public final class DebugProtoBuf {
      * it is optimized and embedded straight into this message.
      * 

      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder getOrArgumentOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder getOrArgumentOrBuilder(
         int index) {
       return orArgument_.get(index);
     }
@@ -31809,8 +31809,8 @@ public final class DebugProtoBuf {
     private void initFields() {
       flags_ = 0;
       valueParameterReference_ = 0;
-      constantValue_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.ConstantValue.TRUE;
-      isInstanceType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      constantValue_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.ConstantValue.TRUE;
+      isInstanceType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       isInstanceTypeId_ = 0;
       andArgument_ = java.util.Collections.emptyList();
       orArgument_ = java.util.Collections.emptyList();
@@ -31916,53 +31916,53 @@ public final class DebugProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression parseFrom(
+    public static org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -31971,7 +31971,7 @@ public final class DebugProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -31983,7 +31983,7 @@ public final class DebugProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Expression}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Expression}
      *
      * 
      * We use some trickery to optimize memory footprint of contract-expressions:
@@ -31992,21 +31992,21 @@ public final class DebugProtoBuf {
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Expression)
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Expression)
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Expression_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Expression_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Expression_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Expression_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.class, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder.class);
+                org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.class, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -32033,10 +32033,10 @@ public final class DebugProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000001);
         valueParameterReference_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
-        constantValue_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.ConstantValue.TRUE;
+        constantValue_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.ConstantValue.TRUE;
         bitField0_ = (bitField0_ & ~0x00000004);
         if (isInstanceTypeBuilder_ == null) {
-          isInstanceType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          isInstanceType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
         } else {
           isInstanceTypeBuilder_.clear();
         }
@@ -32064,23 +32064,23 @@ public final class DebugProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.internal_static_org_jetbrains_kotlin_serialization_Expression_descriptor;
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.internal_static_org_jetbrains_kotlin_metadata_Expression_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression build() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression result = buildPartial();
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression build() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression buildPartial() {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression result = new org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression(this);
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression buildPartial() {
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression result = new org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -32131,16 +32131,16 @@ public final class DebugProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression other) {
-        if (other == org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression other) {
+        if (other == org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -32238,11 +32238,11 @@ public final class DebugProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression parsedMessage = null;
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -32357,23 +32357,23 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.ConstantValue constantValue_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.ConstantValue.TRUE;
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.ConstantValue constantValue_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.ConstantValue.TRUE;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
        */
       public boolean hasConstantValue() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.ConstantValue getConstantValue() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.ConstantValue getConstantValue() {
         return constantValue_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
        */
-      public Builder setConstantValue(org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.ConstantValue value) {
+      public Builder setConstantValue(org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.ConstantValue value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -32383,20 +32383,20 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
        */
       public Builder clearConstantValue() {
         bitField0_ = (bitField0_ & ~0x00000004);
-        constantValue_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.ConstantValue.TRUE;
+        constantValue_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.ConstantValue.TRUE;
         onChanged();
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.Type isInstanceType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.Type isInstanceType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> isInstanceTypeBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> isInstanceTypeBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
@@ -32407,14 +32407,14 @@ public final class DebugProtoBuf {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
        * and with type encoded in either one of next two fields as RHS.
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type getIsInstanceType() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type getIsInstanceType() {
         if (isInstanceTypeBuilder_ == null) {
           return isInstanceType_;
         } else {
@@ -32422,14 +32422,14 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
        * and with type encoded in either one of next two fields as RHS.
        * 

        */
-      public Builder setIsInstanceType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder setIsInstanceType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (isInstanceTypeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -32443,7 +32443,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
@@ -32451,7 +32451,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder setIsInstanceType(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder builderForValue) {
         if (isInstanceTypeBuilder_ == null) {
           isInstanceType_ = builderForValue.build();
           onChanged();
@@ -32462,19 +32462,19 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
        * and with type encoded in either one of next two fields as RHS.
        * 

        */
-      public Builder mergeIsInstanceType(org.jetbrains.kotlin.serialization.DebugProtoBuf.Type value) {
+      public Builder mergeIsInstanceType(org.jetbrains.kotlin.metadata.DebugProtoBuf.Type value) {
         if (isInstanceTypeBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              isInstanceType_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance()) {
+              isInstanceType_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance()) {
             isInstanceType_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.newBuilder(isInstanceType_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.newBuilder(isInstanceType_).mergeFrom(value).buildPartial();
           } else {
             isInstanceType_ = value;
           }
@@ -32486,7 +32486,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
@@ -32495,7 +32495,7 @@ public final class DebugProtoBuf {
        */
       public Builder clearIsInstanceType() {
         if (isInstanceTypeBuilder_ == null) {
-          isInstanceType_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.getDefaultInstance();
+          isInstanceType_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.getDefaultInstance();
           onChanged();
         } else {
           isInstanceTypeBuilder_.clear();
@@ -32504,27 +32504,27 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
        * and with type encoded in either one of next two fields as RHS.
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder getIsInstanceTypeBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder getIsInstanceTypeBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getIsInstanceTypeFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
        * and with type encoded in either one of next two fields as RHS.
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder getIsInstanceTypeOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder getIsInstanceTypeOrBuilder() {
         if (isInstanceTypeBuilder_ != null) {
           return isInstanceTypeBuilder_.getMessageOrBuilder();
         } else {
@@ -32532,7 +32532,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
@@ -32540,11 +32540,11 @@ public final class DebugProtoBuf {
        * 

        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder> 
           getIsInstanceTypeFieldBuilder() {
         if (isInstanceTypeBuilder_ == null) {
           isInstanceTypeBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Type, org.jetbrains.kotlin.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Type, org.jetbrains.kotlin.metadata.DebugProtoBuf.Type.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeOrBuilder>(
                   getIsInstanceType(),
                   getParentForChildren(),
                   isClean());
@@ -32585,20 +32585,20 @@ public final class DebugProtoBuf {
         return this;
       }
 
-      private java.util.List andArgument_ =
+      private java.util.List andArgument_ =
         java.util.Collections.emptyList();
       private void ensureAndArgumentIsMutable() {
         if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          andArgument_ = new java.util.ArrayList(andArgument_);
+          andArgument_ = new java.util.ArrayList(andArgument_);
           bitField0_ |= 0x00000020;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder> andArgumentBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder> andArgumentBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32606,7 +32606,7 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message
        * 

        */
-      public java.util.List getAndArgumentList() {
+      public java.util.List getAndArgumentList() {
         if (andArgumentBuilder_ == null) {
           return java.util.Collections.unmodifiableList(andArgument_);
         } else {
@@ -32614,7 +32614,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32630,7 +32630,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32638,7 +32638,7 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression getAndArgument(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression getAndArgument(int index) {
         if (andArgumentBuilder_ == null) {
           return andArgument_.get(index);
         } else {
@@ -32646,7 +32646,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32655,7 +32655,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder setAndArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression value) {
         if (andArgumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -32669,7 +32669,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32678,7 +32678,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder setAndArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder builderForValue) {
         if (andArgumentBuilder_ == null) {
           ensureAndArgumentIsMutable();
           andArgument_.set(index, builderForValue.build());
@@ -32689,7 +32689,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32697,7 +32697,7 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message
        * 

        */
-      public Builder addAndArgument(org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression value) {
+      public Builder addAndArgument(org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression value) {
         if (andArgumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -32711,7 +32711,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32720,7 +32720,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder addAndArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression value) {
         if (andArgumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -32734,7 +32734,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32743,7 +32743,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder addAndArgument(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder builderForValue) {
         if (andArgumentBuilder_ == null) {
           ensureAndArgumentIsMutable();
           andArgument_.add(builderForValue.build());
@@ -32754,7 +32754,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32763,7 +32763,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder addAndArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder builderForValue) {
         if (andArgumentBuilder_ == null) {
           ensureAndArgumentIsMutable();
           andArgument_.add(index, builderForValue.build());
@@ -32774,7 +32774,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32783,7 +32783,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder addAllAndArgument(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (andArgumentBuilder_ == null) {
           ensureAndArgumentIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -32795,7 +32795,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32814,7 +32814,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32833,7 +32833,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32841,12 +32841,12 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder getAndArgumentBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder getAndArgumentBuilder(
           int index) {
         return getAndArgumentFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32854,7 +32854,7 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder getAndArgumentOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder getAndArgumentOrBuilder(
           int index) {
         if (andArgumentBuilder_ == null) {
           return andArgument_.get(index);  } else {
@@ -32862,7 +32862,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32870,7 +32870,7 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message
        * 

        */
-      public java.util.List 
+      public java.util.List 
            getAndArgumentOrBuilderList() {
         if (andArgumentBuilder_ != null) {
           return andArgumentBuilder_.getMessageOrBuilderList();
@@ -32879,7 +32879,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32887,12 +32887,12 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder addAndArgumentBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder addAndArgumentBuilder() {
         return getAndArgumentFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32900,13 +32900,13 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder addAndArgumentBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder addAndArgumentBuilder(
           int index) {
         return getAndArgumentFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -32914,16 +32914,16 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message
        * 

        */
-      public java.util.List 
+      public java.util.List 
            getAndArgumentBuilderList() {
         return getAndArgumentFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder> 
           getAndArgumentFieldBuilder() {
         if (andArgumentBuilder_ == null) {
           andArgumentBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder>(
                   andArgument_,
                   ((bitField0_ & 0x00000020) == 0x00000020),
                   getParentForChildren(),
@@ -32933,20 +32933,20 @@ public final class DebugProtoBuf {
         return andArgumentBuilder_;
       }
 
-      private java.util.List orArgument_ =
+      private java.util.List orArgument_ =
         java.util.Collections.emptyList();
       private void ensureOrArgumentIsMutable() {
         if (!((bitField0_ & 0x00000040) == 0x00000040)) {
-          orArgument_ = new java.util.ArrayList(orArgument_);
+          orArgument_ = new java.util.ArrayList(orArgument_);
           bitField0_ |= 0x00000040;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder> orArgumentBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder> orArgumentBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -32954,7 +32954,7 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message.
        * 

        */
-      public java.util.List getOrArgumentList() {
+      public java.util.List getOrArgumentList() {
         if (orArgumentBuilder_ == null) {
           return java.util.Collections.unmodifiableList(orArgument_);
         } else {
@@ -32962,7 +32962,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -32978,7 +32978,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -32986,7 +32986,7 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message.
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression getOrArgument(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression getOrArgument(int index) {
         if (orArgumentBuilder_ == null) {
           return orArgument_.get(index);
         } else {
@@ -32994,7 +32994,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33003,7 +33003,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder setOrArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression value) {
         if (orArgumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -33017,7 +33017,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33026,7 +33026,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder setOrArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder builderForValue) {
         if (orArgumentBuilder_ == null) {
           ensureOrArgumentIsMutable();
           orArgument_.set(index, builderForValue.build());
@@ -33037,7 +33037,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33045,7 +33045,7 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message.
        * 

        */
-      public Builder addOrArgument(org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression value) {
+      public Builder addOrArgument(org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression value) {
         if (orArgumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -33059,7 +33059,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33068,7 +33068,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder addOrArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression value) {
         if (orArgumentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -33082,7 +33082,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33091,7 +33091,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder addOrArgument(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder builderForValue) {
         if (orArgumentBuilder_ == null) {
           ensureOrArgumentIsMutable();
           orArgument_.add(builderForValue.build());
@@ -33102,7 +33102,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33111,7 +33111,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder addOrArgument(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder builderForValue) {
         if (orArgumentBuilder_ == null) {
           ensureOrArgumentIsMutable();
           orArgument_.add(index, builderForValue.build());
@@ -33122,7 +33122,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33131,7 +33131,7 @@ public final class DebugProtoBuf {
        * 

        */
       public Builder addAllOrArgument(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (orArgumentBuilder_ == null) {
           ensureOrArgumentIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -33143,7 +33143,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33162,7 +33162,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33181,7 +33181,7 @@ public final class DebugProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33189,12 +33189,12 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message.
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder getOrArgumentBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder getOrArgumentBuilder(
           int index) {
         return getOrArgumentFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33202,7 +33202,7 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message.
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder getOrArgumentOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder getOrArgumentOrBuilder(
           int index) {
         if (orArgumentBuilder_ == null) {
           return orArgument_.get(index);  } else {
@@ -33210,7 +33210,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33218,7 +33218,7 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message.
        * 

        */
-      public java.util.List 
+      public java.util.List 
            getOrArgumentOrBuilderList() {
         if (orArgumentBuilder_ != null) {
           return orArgumentBuilder_.getMessageOrBuilderList();
@@ -33227,7 +33227,7 @@ public final class DebugProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33235,12 +33235,12 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message.
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder addOrArgumentBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder addOrArgumentBuilder() {
         return getOrArgumentFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33248,13 +33248,13 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message.
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder addOrArgumentBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder addOrArgumentBuilder(
           int index) {
         return getOrArgumentFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -33262,16 +33262,16 @@ public final class DebugProtoBuf {
        * it is optimized and embedded straight into this message.
        * 

        */
-      public java.util.List 
+      public java.util.List 
            getOrArgumentBuilderList() {
         return getOrArgumentFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder> 
           getOrArgumentFieldBuilder() {
         if (orArgumentBuilder_ == null) {
           orArgumentBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression, org.jetbrains.kotlin.serialization.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.ExpressionOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression, org.jetbrains.kotlin.metadata.DebugProtoBuf.Expression.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.ExpressionOrBuilder>(
                   orArgument_,
                   ((bitField0_ & 0x00000040) == 0x00000040),
                   getParentForChildren(),
@@ -33281,7 +33281,7 @@ public final class DebugProtoBuf {
         return orArgumentBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Expression)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Expression)
     }
 
     static {
@@ -33289,129 +33289,129 @@ public final class DebugProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Expression)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Expression)
   }
 
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_StringTable_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_StringTable_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_StringTable_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_QualifiedName_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_QualifiedName_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_Annotation_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Annotation_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_Annotation_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_Value_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_Value_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Type_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_Type_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Type_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_Type_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_Type_Argument_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Type_Argument_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_Type_Argument_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_TypeParameter_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_TypeParameter_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_TypeParameter_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Class_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_Class_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_Class_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Package_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_Package_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Package_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_Package_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_TypeTable_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_TypeTable_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_TypeTable_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_TypeTable_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Constructor_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_Constructor_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Constructor_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_Constructor_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Function_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_Function_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Function_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_Function_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Property_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_Property_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Property_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_Property_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_ValueParameter_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_ValueParameter_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_ValueParameter_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_TypeAlias_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_TypeAlias_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_TypeAlias_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_TypeAlias_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_EnumEntry_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_EnumEntry_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_EnumEntry_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_EnumEntry_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_VersionRequirement_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_VersionRequirement_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_VersionRequirementTable_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_VersionRequirementTable_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_PackageFragment_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_PackageFragment_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_PackageFragment_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_PackageFragment_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Contract_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_Contract_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Contract_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_Contract_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Effect_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_Effect_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Effect_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_Effect_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_Expression_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_Expression_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_Expression_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_Expression_fieldAccessorTable;
 
   public static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -33422,195 +33422,187 @@ public final class DebugProtoBuf {
   static {
     java.lang.String[] descriptorData = {
       "\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" +
+      "\022\035org.jetbrains.kotlin.metadata\032)core/me" +
+      "tadata/src/ext_options.debug.proto\"\035\n\013St" +
+      "ringTable\022\016\n\006string\030\001 \003(\t\"\276\002\n\022QualifiedN" +
+      "ameTable\022W\n\016qualified_name\030\001 \003(\0132?.org.j" +
+      "etbrains.kotlin.metadata.QualifiedNameTa" +
+      "ble.QualifiedName\032\316\001\n\rQualifiedName\022!\n\025p" +
+      "arent_qualified_name\030\001 \001(\005:\002-1\022\022\n\nshort_" +
+      "name\030\002 \002(\005\022[\n\004kind\030\003 \001(\0162D.org.jetbrains" +
+      ".kotlin.metadata.QualifiedNameTable.Qual",
+      "ifiedName.Kind:\007PACKAGE\")\n\004Kind\022\t\n\005CLASS" +
+      "\020\000\022\013\n\007PACKAGE\020\001\022\t\n\005LOCAL\020\002\"\342\005\n\nAnnotatio" +
+      "n\022\020\n\002id\030\001 \002(\005B\004\220\265\030\001\022D\n\010argument\030\002 \003(\01322." +
+      "org.jetbrains.kotlin.metadata.Annotation" +
+      ".Argument\032\373\004\n\010Argument\022\025\n\007name_id\030\001 \002(\005B" +
+      "\004\210\265\030\001\022G\n\005value\030\002 \002(\01328.org.jetbrains.kot" +
+      "lin.metadata.Annotation.Argument.Value\032\216" +
+      "\004\n\005Value\022K\n\004type\030\001 \001(\0162=.org.jetbrains.k" +
+      "otlin.metadata.Annotation.Argument.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\014string_va" +
+      "lue\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_value_id\030\007 \001(\005B\004\210\265\030\001\022=\n\nannotati" +
+      "on\030\010 \001(\0132).org.jetbrains.kotlin.metadata" +
+      ".Annotation\022O\n\rarray_element\030\t \003(\01328.org" +
+      ".jetbrains.kotlin.metadata.Annotation.Ar" +
       "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" +
+      "\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\"\373\005\n\004Type\022>\n\010argument\030\002 \003(\0132,.org" +
+      ".jetbrains.kotlin.metadata.Type.Argument" +
+      "\022\027\n\010nullable\030\003 \001(\010:\005false\022+\n\035flexible_ty" +
+      "pe_capabilities_id\030\004 \001(\005B\004\230\265\030\001\022A\n\024flexib" +
+      "le_upper_bound\030\005 \001(\0132#.org.jetbrains.kot" +
+      "lin.metadata.Type\022\037\n\027flexible_upper_boun" +
+      "d_id\030\010 \001(\005\022\030\n\nclass_name\030\006 \001(\005B\004\220\265\030\001\022\026\n\016" +
+      "type_parameter\030\007 \001(\005\022!\n\023type_parameter_n" +
+      "ame\030\t \001(\005B\004\210\265\030\001\022\035\n\017type_alias_name\030\014 \001(\005" +
+      "B\004\220\265\030\001\0227\n\nouter_type\030\n \001(\0132#.org.jetbrai",
+      "ns.kotlin.metadata.Type\022\025\n\router_type_id" +
+      "\030\013 \001(\005\022=\n\020abbreviated_type\030\r \001(\0132#.org.j" +
+      "etbrains.kotlin.metadata.Type\022\033\n\023abbrevi" +
+      "ated_type_id\030\016 \001(\005\022\r\n\005flags\030\001 \001(\005\032\322\001\n\010Ar" +
+      "gument\022P\n\nprojection\030\001 \001(\01627.org.jetbrai" +
+      "ns.kotlin.metadata.Type.Argument.Project" +
+      "ion:\003INV\0221\n\004type\030\002 \001(\0132#.org.jetbrains.k" +
+      "otlin.metadata.Type\022\017\n\007type_id\030\003 \001(\005\"0\n\n" +
+      "Projection\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\022\010\n\004" +
+      "STAR\020\003*\005\010d\020\310\001\"\224\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\007reified\030\003 \001(\010" +
+      ":\005false\022L\n\010variance\030\004 \001(\01625.org.jetbrain" +
+      "s.kotlin.metadata.TypeParameter.Variance" +
+      ":\003INV\0228\n\013upper_bound\030\005 \003(\0132#.org.jetbrai" +
+      "ns.kotlin.metadata.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" +
-      "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" +
+      "INV\020\002*\005\010d\020\350\007\"\244\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\022D\n\016type_parameter\030\005" +
+      " \003(\0132,.org.jetbrains.kotlin.metadata.Typ",
+      "eParameter\0226\n\tsupertype\030\006 \003(\0132#.org.jetb" +
+      "rains.kotlin.metadata.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\022?\n\013constructor\030\010 \003(\0132*.org.jetbr" +
+      "ains.kotlin.metadata.Constructor\0229\n\010func" +
+      "tion\030\t \003(\0132\'.org.jetbrains.kotlin.metada" +
+      "ta.Function\0229\n\010property\030\n \003(\0132\'.org.jetb" +
+      "rains.kotlin.metadata.Property\022<\n\ntype_a" +
+      "lias\030\013 \003(\0132(.org.jetbrains.kotlin.metada" +
+      "ta.TypeAlias\022<\n\nenum_entry\030\r \003(\0132(.org.j",
+      "etbrains.kotlin.metadata.EnumEntry\022\'\n\027se" +
+      "aled_subclass_fq_name\030\020 \003(\005B\006\020\001\220\265\030\001\022<\n\nt" +
+      "ype_table\030\036 \001(\0132(.org.jetbrains.kotlin.m" +
+      "etadata.TypeTable\022\033\n\023version_requirement" +
+      "\030\037 \001(\005\022Y\n\031version_requirement_table\030  \001(" +
+      "\01326.org.jetbrains.kotlin.metadata.Versio" +
+      "nRequirementTable\"x\n\004Kind\022\t\n\005CLASS\020\000\022\r\n\t" +
+      "INTERFACE\020\001\022\016\n\nENUM_CLASS\020\002\022\016\n\nENUM_ENTR" +
+      "Y\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\"\335\002\n\007Package\022",
+      "9\n\010function\030\003 \003(\0132\'.org.jetbrains.kotlin" +
+      ".metadata.Function\0229\n\010property\030\004 \003(\0132\'.o" +
+      "rg.jetbrains.kotlin.metadata.Property\022<\n" +
+      "\ntype_alias\030\005 \003(\0132(.org.jetbrains.kotlin" +
+      ".metadata.TypeAlias\022<\n\ntype_table\030\036 \001(\0132" +
+      "(.org.jetbrains.kotlin.metadata.TypeTabl" +
+      "e\022Y\n\031version_requirement_table\030  \001(\01326.o" +
+      "rg.jetbrains.kotlin.metadata.VersionRequ" +
+      "irementTable*\005\010d\020\310\001\"Z\n\tTypeTable\0221\n\004type" +
+      "\030\001 \003(\0132#.org.jetbrains.kotlin.metadata.T",
+      "ype\022\032\n\016first_nullable\030\002 \001(\005:\002-1\"\214\001\n\013Cons" +
+      "tructor\022\020\n\005flags\030\001 \001(\005:\0016\022F\n\017value_param" +
+      "eter\030\002 \003(\0132-.org.jetbrains.kotlin.metada" +
+      "ta.ValueParameter\022\033\n\023version_requirement" +
+      "\030\037 \001(\005*\006\010d\020\270\224\001\"\232\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\0228\n\013return_type\030\003 \001(\0132#.org.jetbr" +
+      "ains.kotlin.metadata.Type\022\026\n\016return_type" +
+      "_id\030\007 \001(\005\022D\n\016type_parameter\030\004 \003(\0132,.org." +
+      "jetbrains.kotlin.metadata.TypeParameter\022",
+      ":\n\rreceiver_type\030\005 \001(\0132#.org.jetbrains.k" +
+      "otlin.metadata.Type\022\030\n\020receiver_type_id\030" +
+      "\010 \001(\005\022F\n\017value_parameter\030\006 \003(\0132-.org.jet" +
+      "brains.kotlin.metadata.ValueParameter\022<\n" +
+      "\ntype_table\030\036 \001(\0132(.org.jetbrains.kotlin" +
+      ".metadata.TypeTable\022\033\n\023version_requireme" +
+      "nt\030\037 \001(\005\0229\n\010contract\030  \001(\0132\'.org.jetbrai" +
+      "ns.kotlin.metadata.Contract*\006\010d\020\270\224\001\"\331\003\n\010" +
+      "Property\022\022\n\005flags\030\013 \001(\005:\003518\022\027\n\told_flag" +
+      "s\030\001 \001(\005:\0042054\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\0228\n\013ret",
+      "urn_type\030\003 \001(\0132#.org.jetbrains.kotlin.me" +
+      "tadata.Type\022\026\n\016return_type_id\030\t \001(\005\022D\n\016t" +
+      "ype_parameter\030\004 \003(\0132,.org.jetbrains.kotl" +
+      "in.metadata.TypeParameter\022:\n\rreceiver_ty" +
+      "pe\030\005 \001(\0132#.org.jetbrains.kotlin.metadata" +
+      ".Type\022\030\n\020receiver_type_id\030\n \001(\005\022M\n\026sette" +
+      "r_value_parameter\030\006 \001(\0132-.org.jetbrains." +
+      "kotlin.metadata.ValueParameter\022\024\n\014getter" +
+      "_flags\030\007 \001(\005\022\024\n\014setter_flags\030\010 \001(\005\022\033\n\023ve" +
+      "rsion_requirement\030\037 \001(\005*\006\010d\020\270\224\001\"\343\001\n\016Valu",
+      "eParameter\022\020\n\005flags\030\001 \001(\005:\0010\022\022\n\004name\030\002 \002" +
+      "(\005B\004\210\265\030\001\0221\n\004type\030\003 \001(\0132#.org.jetbrains.k" +
+      "otlin.metadata.Type\022\017\n\007type_id\030\005 \001(\005\022@\n\023" +
+      "vararg_element_type\030\004 \001(\0132#.org.jetbrain" +
+      "s.kotlin.metadata.Type\022\036\n\026vararg_element" +
+      "_type_id\030\006 \001(\005*\005\010d\020\310\001\"\212\003\n\tTypeAlias\022\020\n\005f" +
+      "lags\030\001 \001(\005:\0016\022\022\n\004name\030\002 \002(\005B\004\210\265\030\001\022D\n\016typ" +
+      "e_parameter\030\003 \003(\0132,.org.jetbrains.kotlin" +
+      ".metadata.TypeParameter\022<\n\017underlying_ty" +
+      "pe\030\004 \001(\0132#.org.jetbrains.kotlin.metadata",
+      ".Type\022\032\n\022underlying_type_id\030\005 \001(\005\022:\n\rexp" +
+      "anded_type\030\006 \001(\0132#.org.jetbrains.kotlin." +
+      "metadata.Type\022\030\n\020expanded_type_id\030\007 \001(\005\022" +
+      "=\n\nannotation\030\010 \003(\0132).org.jetbrains.kotl" +
+      "in.metadata.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" +
+      "\001 \001(\005B\004\210\265\030\001*\005\010d\020\310\001\"\225\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." +
+      "\022M\n\005level\030\003 \001(\01627.org.jetbrains.kotlin.m" +
+      "etadata.VersionRequirement.Level:\005ERROR\022",
+      "\022\n\nerror_code\030\004 \001(\005\022\025\n\007message\030\005 \001(\005B\004\230\265" +
+      "\030\001\022e\n\014version_kind\030\006 \001(\0162=.org.jetbrains" +
+      ".kotlin.metadata.VersionRequirement.Vers" +
+      "ionKind:\020LANGUAGE_VERSION\"+\n\005Level\022\013\n\007WA" +
+      "RNING\020\000\022\t\n\005ERROR\020\001\022\n\n\006HIDDEN\020\002\"J\n\013Versio" +
+      "nKind\022\024\n\020LANGUAGE_VERSION\020\000\022\024\n\020COMPILER_" +
+      "VERSION\020\001\022\017\n\013API_VERSION\020\002\"a\n\027VersionReq" +
+      "uirementTable\022F\n\013requirement\030\001 \003(\01321.org" +
+      ".jetbrains.kotlin.metadata.VersionRequir" +
+      "ement\"\217\002\n\017PackageFragment\022;\n\007strings\030\001 \001",
+      "(\0132*.org.jetbrains.kotlin.metadata.Strin" +
+      "gTable\022J\n\017qualified_names\030\002 \001(\01321.org.je" +
+      "tbrains.kotlin.metadata.QualifiedNameTab" +
+      "le\0227\n\007package\030\003 \001(\0132&.org.jetbrains.kotl" +
+      "in.metadata.Package\0223\n\005class\030\004 \003(\0132$.org" +
+      ".jetbrains.kotlin.metadata.Class*\005\010d\020\310\001\"" +
+      "A\n\010Contract\0225\n\006effect\030\001 \003(\0132%.org.jetbra" +
+      "ins.kotlin.metadata.Effect\"\306\003\n\006Effect\022E\n" +
+      "\013effect_type\030\001 \001(\01620.org.jetbrains.kotli" +
+      "n.metadata.Effect.EffectType\022N\n\033effect_c",
+      "onstructor_argument\030\002 \003(\0132).org.jetbrain" +
+      "s.kotlin.metadata.Expression\022S\n conclusi" +
+      "on_of_conditional_effect\030\003 \001(\0132).org.jet" +
+      "brains.kotlin.metadata.Expression\022B\n\004kin" +
+      "d\030\004 \001(\01624.org.jetbrains.kotlin.metadata." +
+      "Effect.InvocationKind\"C\n\nEffectType\022\024\n\020R" +
+      "ETURNS_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_" +
+      "ONCE\020\000\022\020\n\014EXACTLY_ONCE\020\001\022\021\n\rAT_LEAST_ONC" +
+      "E\020\002\"\234\003\n\nExpression\022\r\n\005flags\030\001 \001(\005\022!\n\031val",
+      "ue_parameter_reference\030\002 \001(\005\022O\n\016constant" +
+      "_value\030\003 \001(\01627.org.jetbrains.kotlin.meta" +
+      "data.Expression.ConstantValue\022=\n\020is_inst" +
+      "ance_type\030\004 \001(\0132#.org.jetbrains.kotlin.m" +
+      "etadata.Type\022\033\n\023is_instance_type_id\030\005 \001(" +
+      "\005\022?\n\014and_argument\030\006 \003(\0132).org.jetbrains." +
+      "kotlin.metadata.Expression\022>\n\013or_argumen" +
+      "t\030\007 \003(\0132).org.jetbrains.kotlin.metadata." +
       "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" +
+      "\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",
+      "\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" +
@@ -33627,177 +33619,177 @@ public final class DebugProtoBuf {
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
-          org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.getDescriptor(),
+          org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.getDescriptor(),
         }, assigner);
-    internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_StringTable_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_org_jetbrains_kotlin_serialization_StringTable_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_StringTable_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_StringTable_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_StringTable_descriptor,
         new java.lang.String[] { "String", });
-    internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_descriptor =
       getDescriptor().getMessageTypes().get(1);
-    internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_descriptor,
         new java.lang.String[] { "QualifiedName", });
-    internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor =
-      internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_descriptor.getNestedTypes().get(0);
-    internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_QualifiedName_descriptor =
+      internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_descriptor.getNestedTypes().get(0);
+    internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_QualifiedName_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_QualifiedNameTable_QualifiedName_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_QualifiedNameTable_QualifiedName_descriptor,
         new java.lang.String[] { "ParentQualifiedName", "ShortName", "Kind", });
-    internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_Annotation_descriptor =
       getDescriptor().getMessageTypes().get(2);
-    internal_static_org_jetbrains_kotlin_serialization_Annotation_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_Annotation_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_Annotation_descriptor,
         new java.lang.String[] { "Id", "Argument", });
-    internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor =
-      internal_static_org_jetbrains_kotlin_serialization_Annotation_descriptor.getNestedTypes().get(0);
-    internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_descriptor =
+      internal_static_org_jetbrains_kotlin_metadata_Annotation_descriptor.getNestedTypes().get(0);
+    internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_descriptor,
         new java.lang.String[] { "NameId", "Value", });
-    internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor =
-      internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_descriptor.getNestedTypes().get(0);
-    internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_Value_descriptor =
+      internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_descriptor.getNestedTypes().get(0);
+    internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_Value_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_Annotation_Argument_Value_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_Annotation_Argument_Value_descriptor,
         new java.lang.String[] { "Type", "IntValue", "FloatValue", "DoubleValue", "StringValue", "ClassId", "EnumValueId", "Annotation", "ArrayElement", });
-    internal_static_org_jetbrains_kotlin_serialization_Type_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_Type_descriptor =
       getDescriptor().getMessageTypes().get(3);
-    internal_static_org_jetbrains_kotlin_serialization_Type_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_Type_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_Type_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_Type_descriptor,
         new java.lang.String[] { "Argument", "Nullable", "FlexibleTypeCapabilitiesId", "FlexibleUpperBound", "FlexibleUpperBoundId", "ClassName", "TypeParameter", "TypeParameterName", "TypeAliasName", "OuterType", "OuterTypeId", "AbbreviatedType", "AbbreviatedTypeId", "Flags", });
-    internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor =
-      internal_static_org_jetbrains_kotlin_serialization_Type_descriptor.getNestedTypes().get(0);
-    internal_static_org_jetbrains_kotlin_serialization_Type_Argument_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_Type_Argument_descriptor =
+      internal_static_org_jetbrains_kotlin_metadata_Type_descriptor.getNestedTypes().get(0);
+    internal_static_org_jetbrains_kotlin_metadata_Type_Argument_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_Type_Argument_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_Type_Argument_descriptor,
         new java.lang.String[] { "Projection", "Type", "TypeId", });
-    internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_TypeParameter_descriptor =
       getDescriptor().getMessageTypes().get(4);
-    internal_static_org_jetbrains_kotlin_serialization_TypeParameter_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_TypeParameter_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_TypeParameter_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_TypeParameter_descriptor,
         new java.lang.String[] { "Id", "Name", "Reified", "Variance", "UpperBound", "UpperBoundId", });
-    internal_static_org_jetbrains_kotlin_serialization_Class_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_Class_descriptor =
       getDescriptor().getMessageTypes().get(5);
-    internal_static_org_jetbrains_kotlin_serialization_Class_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_Class_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_Class_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_Class_descriptor,
         new java.lang.String[] { "Flags", "FqName", "CompanionObjectName", "TypeParameter", "Supertype", "SupertypeId", "NestedClassName", "Constructor", "Function", "Property", "TypeAlias", "EnumEntry", "SealedSubclassFqName", "TypeTable", "VersionRequirement", "VersionRequirementTable", });
-    internal_static_org_jetbrains_kotlin_serialization_Package_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_Package_descriptor =
       getDescriptor().getMessageTypes().get(6);
-    internal_static_org_jetbrains_kotlin_serialization_Package_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_Package_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_Package_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_Package_descriptor,
         new java.lang.String[] { "Function", "Property", "TypeAlias", "TypeTable", "VersionRequirementTable", });
-    internal_static_org_jetbrains_kotlin_serialization_TypeTable_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_TypeTable_descriptor =
       getDescriptor().getMessageTypes().get(7);
-    internal_static_org_jetbrains_kotlin_serialization_TypeTable_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_TypeTable_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_TypeTable_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_TypeTable_descriptor,
         new java.lang.String[] { "Type", "FirstNullable", });
-    internal_static_org_jetbrains_kotlin_serialization_Constructor_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_Constructor_descriptor =
       getDescriptor().getMessageTypes().get(8);
-    internal_static_org_jetbrains_kotlin_serialization_Constructor_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_Constructor_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_Constructor_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_Constructor_descriptor,
         new java.lang.String[] { "Flags", "ValueParameter", "VersionRequirement", });
-    internal_static_org_jetbrains_kotlin_serialization_Function_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_Function_descriptor =
       getDescriptor().getMessageTypes().get(9);
-    internal_static_org_jetbrains_kotlin_serialization_Function_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_Function_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_Function_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_Function_descriptor,
         new java.lang.String[] { "Flags", "OldFlags", "Name", "ReturnType", "ReturnTypeId", "TypeParameter", "ReceiverType", "ReceiverTypeId", "ValueParameter", "TypeTable", "VersionRequirement", "Contract", });
-    internal_static_org_jetbrains_kotlin_serialization_Property_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_Property_descriptor =
       getDescriptor().getMessageTypes().get(10);
-    internal_static_org_jetbrains_kotlin_serialization_Property_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_Property_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_Property_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_Property_descriptor,
         new java.lang.String[] { "Flags", "OldFlags", "Name", "ReturnType", "ReturnTypeId", "TypeParameter", "ReceiverType", "ReceiverTypeId", "SetterValueParameter", "GetterFlags", "SetterFlags", "VersionRequirement", });
-    internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_ValueParameter_descriptor =
       getDescriptor().getMessageTypes().get(11);
-    internal_static_org_jetbrains_kotlin_serialization_ValueParameter_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_ValueParameter_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_ValueParameter_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_ValueParameter_descriptor,
         new java.lang.String[] { "Flags", "Name", "Type", "TypeId", "VarargElementType", "VarargElementTypeId", });
-    internal_static_org_jetbrains_kotlin_serialization_TypeAlias_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_TypeAlias_descriptor =
       getDescriptor().getMessageTypes().get(12);
-    internal_static_org_jetbrains_kotlin_serialization_TypeAlias_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_TypeAlias_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_TypeAlias_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_TypeAlias_descriptor,
         new java.lang.String[] { "Flags", "Name", "TypeParameter", "UnderlyingType", "UnderlyingTypeId", "ExpandedType", "ExpandedTypeId", "Annotation", "VersionRequirement", });
-    internal_static_org_jetbrains_kotlin_serialization_EnumEntry_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_EnumEntry_descriptor =
       getDescriptor().getMessageTypes().get(13);
-    internal_static_org_jetbrains_kotlin_serialization_EnumEntry_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_EnumEntry_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_EnumEntry_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_EnumEntry_descriptor,
         new java.lang.String[] { "Name", });
-    internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_VersionRequirement_descriptor =
       getDescriptor().getMessageTypes().get(14);
-    internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_VersionRequirement_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_VersionRequirement_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_VersionRequirement_descriptor,
         new java.lang.String[] { "Version", "VersionFull", "Level", "ErrorCode", "Message", "VersionKind", });
-    internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_VersionRequirementTable_descriptor =
       getDescriptor().getMessageTypes().get(15);
-    internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_VersionRequirementTable_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_VersionRequirementTable_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_VersionRequirementTable_descriptor,
         new java.lang.String[] { "Requirement", });
-    internal_static_org_jetbrains_kotlin_serialization_PackageFragment_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_PackageFragment_descriptor =
       getDescriptor().getMessageTypes().get(16);
-    internal_static_org_jetbrains_kotlin_serialization_PackageFragment_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_PackageFragment_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_PackageFragment_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_PackageFragment_descriptor,
         new java.lang.String[] { "Strings", "QualifiedNames", "Package", "Class_", });
-    internal_static_org_jetbrains_kotlin_serialization_Contract_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_Contract_descriptor =
       getDescriptor().getMessageTypes().get(17);
-    internal_static_org_jetbrains_kotlin_serialization_Contract_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_Contract_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_Contract_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_Contract_descriptor,
         new java.lang.String[] { "Effect", });
-    internal_static_org_jetbrains_kotlin_serialization_Effect_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_Effect_descriptor =
       getDescriptor().getMessageTypes().get(18);
-    internal_static_org_jetbrains_kotlin_serialization_Effect_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_Effect_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_Effect_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_Effect_descriptor,
         new java.lang.String[] { "EffectType", "EffectConstructorArgument", "ConclusionOfConditionalEffect", "Kind", });
-    internal_static_org_jetbrains_kotlin_serialization_Expression_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_Expression_descriptor =
       getDescriptor().getMessageTypes().get(19);
-    internal_static_org_jetbrains_kotlin_serialization_Expression_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_Expression_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_Expression_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_Expression_descriptor,
         new java.lang.String[] { "Flags", "ValueParameterReference", "ConstantValue", "IsInstanceType", "IsInstanceTypeId", "AndArgument", "OrArgument", });
     org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
         org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.fqNameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.nameIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.fqNameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.fqNameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.fqNameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.fqNameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.fqNameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.fqNameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.nameIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.stringIdInTable);
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
         .internalUpdateFileDescriptor(descriptor, registry);
-    org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.getDescriptor();
+    org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/build-common/test/org/jetbrains/kotlin/metadata/builtins/DebugBuiltInsProtoBuf.java b/build-common/test/org/jetbrains/kotlin/metadata/builtins/DebugBuiltInsProtoBuf.java
new file mode 100644
index 00000000000..754d1e23696
--- /dev/null
+++ b/build-common/test/org/jetbrains/kotlin/metadata/builtins/DebugBuiltInsProtoBuf.java
@@ -0,0 +1,200 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: core/metadata/src/builtins.debug.proto
+
+package org.jetbrains.kotlin.metadata.builtins;
+
+public final class DebugBuiltInsProtoBuf {
+  private DebugBuiltInsProtoBuf() {}
+  public static void registerAllExtensions(
+      org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
+    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.packageFqName);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.classAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.constructorAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.functionAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.propertyAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.compileTimeValue);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.enumEntryAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.parameterAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.typeAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf.typeParameterAnnotation);
+  }
+  public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 151;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.Package { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Package,
+      java.lang.Integer> packageFqName = org.jetbrains.kotlin.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        java.lang.Integer.class,
+        null);
+  public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.Class { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Class,
+      java.util.List> classAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
+  public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.Constructor { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor,
+      java.util.List> constructorAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
+  public static final int FUNCTION_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.Function { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Function,
+      java.util.List> functionAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
+  public static final int PROPERTY_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.Property { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
+      java.util.List> propertyAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
+  public static final int COMPILE_TIME_VALUE_FIELD_NUMBER = 151;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.Property { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value> compileTimeValue = org.jetbrains.kotlin.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
+  public static final int ENUM_ENTRY_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.EnumEntry { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry,
+      java.util.List> enumEntryAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
+  public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.ValueParameter { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter,
+      java.util.List> parameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
+  public static final int TYPE_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.Type { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Type,
+      java.util.List> typeAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
+  public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.TypeParameter { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter,
+      java.util.List> typeParameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+          .newFileScopedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
+
+  public static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n&core/metadata/src/builtins.debug.proto" +
+      "\022&org.jetbrains.kotlin.metadata.builtins" +
+      "\032&core/metadata/src/metadata.debug.proto" +
+      ":@\n\017package_fq_name\022&.org.jetbrains.kotl" +
+      "in.metadata.Package\030\227\001 \001(\005:j\n\020class_anno" +
+      "tation\022$.org.jetbrains.kotlin.metadata.C" +
+      "lass\030\226\001 \003(\0132).org.jetbrains.kotlin.metad" +
+      "ata.Annotation:v\n\026constructor_annotation" +
+      "\022*.org.jetbrains.kotlin.metadata.Constru" +
+      "ctor\030\226\001 \003(\0132).org.jetbrains.kotlin.metad",
+      "ata.Annotation:p\n\023function_annotation\022\'." +
+      "org.jetbrains.kotlin.metadata.Function\030\226" +
+      "\001 \003(\0132).org.jetbrains.kotlin.metadata.An" +
+      "notation:p\n\023property_annotation\022\'.org.je" +
+      "tbrains.kotlin.metadata.Property\030\226\001 \003(\0132" +
+      ").org.jetbrains.kotlin.metadata.Annotati" +
+      "on:~\n\022compile_time_value\022\'.org.jetbrains" +
+      ".kotlin.metadata.Property\030\227\001 \001(\01328.org.j" +
+      "etbrains.kotlin.metadata.Annotation.Argu" +
+      "ment.Value:s\n\025enum_entry_annotation\022(.or",
+      "g.jetbrains.kotlin.metadata.EnumEntry\030\226\001" +
+      " \003(\0132).org.jetbrains.kotlin.metadata.Ann" +
+      "otation:w\n\024parameter_annotation\022-.org.je" +
+      "tbrains.kotlin.metadata.ValueParameter\030\226" +
+      "\001 \003(\0132).org.jetbrains.kotlin.metadata.An" +
+      "notation:h\n\017type_annotation\022#.org.jetbra" +
+      "ins.kotlin.metadata.Type\030\226\001 \003(\0132).org.je" +
+      "tbrains.kotlin.metadata.Annotation:{\n\031ty" +
+      "pe_parameter_annotation\022,.org.jetbrains." +
+      "kotlin.metadata.TypeParameter\030\226\001 \003(\0132).o",
+      "rg.jetbrains.kotlin.metadata.AnnotationB" +
+      "\027B\025DebugBuiltInsProtoBuf"
+    };
+    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
+        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
+              org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
+    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor(),
+        }, assigner);
+    packageFqName.internalInit(descriptor.getExtensions().get(0));
+    classAnnotation.internalInit(descriptor.getExtensions().get(1));
+    constructorAnnotation.internalInit(descriptor.getExtensions().get(2));
+    functionAnnotation.internalInit(descriptor.getExtensions().get(3));
+    propertyAnnotation.internalInit(descriptor.getExtensions().get(4));
+    compileTimeValue.internalInit(descriptor.getExtensions().get(5));
+    enumEntryAnnotation.internalInit(descriptor.getExtensions().get(6));
+    parameterAnnotation.internalInit(descriptor.getExtensions().get(7));
+    typeAnnotation.internalInit(descriptor.getExtensions().get(8));
+    typeParameterAnnotation.internalInit(descriptor.getExtensions().get(9));
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
\ No newline at end of file
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/java/DebugJavaClassProtoBuf.java b/build-common/test/org/jetbrains/kotlin/metadata/java/DebugJavaClassProtoBuf.java
similarity index 60%
rename from build-common/test/org/jetbrains/kotlin/serialization/java/DebugJavaClassProtoBuf.java
rename to build-common/test/org/jetbrains/kotlin/metadata/java/DebugJavaClassProtoBuf.java
index cc2b2ffbf72..68a5e33b828 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/java/DebugJavaClassProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/metadata/java/DebugJavaClassProtoBuf.java
@@ -1,81 +1,81 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: build-common/src/java_descriptors.debug.proto
 
-package org.jetbrains.kotlin.serialization.java;
+package org.jetbrains.kotlin.metadata.java;
 
 public final class DebugJavaClassProtoBuf {
   private DebugJavaClassProtoBuf() {}
   public static void registerAllExtensions(
       org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
-    registry.add(org.jetbrains.kotlin.serialization.java.DebugJavaClassProtoBuf.isStaticMethod);
-    registry.add(org.jetbrains.kotlin.serialization.java.DebugJavaClassProtoBuf.isPackagePrivateMethod);
-    registry.add(org.jetbrains.kotlin.serialization.java.DebugJavaClassProtoBuf.isStaticField);
-    registry.add(org.jetbrains.kotlin.serialization.java.DebugJavaClassProtoBuf.isPackagePrivateField);
-    registry.add(org.jetbrains.kotlin.serialization.java.DebugJavaClassProtoBuf.isPackagePrivateClass);
-    registry.add(org.jetbrains.kotlin.serialization.java.DebugJavaClassProtoBuf.isPackagePrivateConstructor);
+    registry.add(org.jetbrains.kotlin.metadata.java.DebugJavaClassProtoBuf.isStaticMethod);
+    registry.add(org.jetbrains.kotlin.metadata.java.DebugJavaClassProtoBuf.isPackagePrivateMethod);
+    registry.add(org.jetbrains.kotlin.metadata.java.DebugJavaClassProtoBuf.isStaticField);
+    registry.add(org.jetbrains.kotlin.metadata.java.DebugJavaClassProtoBuf.isPackagePrivateField);
+    registry.add(org.jetbrains.kotlin.metadata.java.DebugJavaClassProtoBuf.isPackagePrivateClass);
+    registry.add(org.jetbrains.kotlin.metadata.java.DebugJavaClassProtoBuf.isPackagePrivateConstructor);
   }
   public static final int IS_STATIC_METHOD_FIELD_NUMBER = 1000;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Function { ... }
+   * extend .org.jetbrains.kotlin.metadata.Function { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Function,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Function,
       java.lang.Boolean> isStaticMethod = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Boolean.class,
         null);
   public static final int IS_PACKAGE_PRIVATE_METHOD_FIELD_NUMBER = 1001;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Function { ... }
+   * extend .org.jetbrains.kotlin.metadata.Function { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Function,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Function,
       java.lang.Boolean> isPackagePrivateMethod = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Boolean.class,
         null);
   public static final int IS_STATIC_FIELD_FIELD_NUMBER = 1000;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Property { ... }
+   * extend .org.jetbrains.kotlin.metadata.Property { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Property,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
       java.lang.Boolean> isStaticField = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Boolean.class,
         null);
   public static final int IS_PACKAGE_PRIVATE_FIELD_FIELD_NUMBER = 1001;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Property { ... }
+   * extend .org.jetbrains.kotlin.metadata.Property { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Property,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
       java.lang.Boolean> isPackagePrivateField = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Boolean.class,
         null);
   public static final int IS_PACKAGE_PRIVATE_CLASS_FIELD_NUMBER = 1000;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Class { ... }
+   * extend .org.jetbrains.kotlin.metadata.Class { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Class,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Class,
       java.lang.Boolean> isPackagePrivateClass = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Boolean.class,
         null);
   public static final int IS_PACKAGE_PRIVATE_CONSTRUCTOR_FIELD_NUMBER = 1000;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Constructor { ... }
+   * extend .org.jetbrains.kotlin.metadata.Constructor { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor,
       java.lang.Boolean> isPackagePrivateConstructor = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Boolean.class,
@@ -90,21 +90,20 @@ public final class DebugJavaClassProtoBuf {
   static {
     java.lang.String[] descriptorData = {
       "\n-build-common/src/java_descriptors.debu" +
-      "g.proto\022\'org.jetbrains.kotlin.serializat" +
-      "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"
+      "g.proto\022\"org.jetbrains.kotlin.metadata.j" +
+      "ava\032&core/metadata/src/metadata.debug.pr" +
+      "oto:B\n\020is_static_method\022\'.org.jetbrains." +
+      "kotlin.metadata.Function\030\350\007 \001(\010:K\n\031is_pa" +
+      "ckage_private_method\022\'.org.jetbrains.kot" +
+      "lin.metadata.Function\030\351\007 \001(\010:A\n\017is_stati" +
+      "c_field\022\'.org.jetbrains.kotlin.metadata." +
+      "Property\030\350\007 \001(\010:J\n\030is_package_private_fi" +
+      "eld\022\'.org.jetbrains.kotlin.metadata.Prop",
+      "erty\030\351\007 \001(\010:G\n\030is_package_private_class\022" +
+      "$.org.jetbrains.kotlin.metadata.Class\030\350\007" +
+      " \001(\010:S\n\036is_package_private_constructor\022*" +
+      ".org.jetbrains.kotlin.metadata.Construct" +
+      "or\030\350\007 \001(\010B\030B\026DebugJavaClassProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -117,7 +116,7 @@ public final class DebugJavaClassProtoBuf {
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor(),
         }, assigner);
     isStaticMethod.internalInit(descriptor.getExtensions().get(0));
     isPackagePrivateMethod.internalInit(descriptor.getExtensions().get(1));
@@ -125,7 +124,7 @@ public final class DebugJavaClassProtoBuf {
     isPackagePrivateField.internalInit(descriptor.getExtensions().get(3));
     isPackagePrivateClass.internalInit(descriptor.getExtensions().get(4));
     isPackagePrivateConstructor.internalInit(descriptor.getExtensions().get(5));
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java b/build-common/test/org/jetbrains/kotlin/metadata/js/DebugJsProtoBuf.java
similarity index 66%
rename from build-common/test/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
rename to build-common/test/org/jetbrains/kotlin/metadata/js/DebugJsProtoBuf.java
index 1db08d40852..7cf870b9ab5 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/js/DebugJsProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/metadata/js/DebugJsProtoBuf.java
@@ -1,29 +1,29 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: js/js.serializer/src/js.debug.proto
 
-package org.jetbrains.kotlin.serialization.js;
+package org.jetbrains.kotlin.metadata.js;
 
 public final class DebugJsProtoBuf {
   private DebugJsProtoBuf() {}
   public static void registerAllExtensions(
       org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.packageFqName);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.classAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.classContainingFileId);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.constructorAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.functionAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.functionContainingFileId);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.propertyAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.compileTimeValue);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.propertyContainingFileId);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.enumEntryAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.parameterAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.typeAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.typeParameterAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.packageFragmentFiles);
+    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.packageFqName);
+    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.classAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.classContainingFileId);
+    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.constructorAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.functionAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.functionContainingFileId);
+    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.propertyAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.compileTimeValue);
+    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.propertyContainingFileId);
+    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.enumEntryAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.parameterAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.typeAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.typeParameterAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.packageFragmentFiles);
   }
   public interface HeaderOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Header)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.js.Header)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
@@ -75,50 +75,50 @@ public final class DebugJsProtoBuf {
         getPackageFqNameBytes();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
      */
     boolean hasStrings();
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable getStrings();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable getStrings();
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
      */
     boolean hasQualifiedNames();
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable getQualifiedNames();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable getQualifiedNames();
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    java.util.List 
+    java.util.List 
         getAnnotationList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
@@ -126,30 +126,30 @@ public final class DebugJsProtoBuf {
      */
     int getAnnotationCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    java.util.List 
+    java.util.List 
         getAnnotationOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Header}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Header}
    */
   public static final class Header extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Header)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.js.Header)
       HeaderOrBuilder {
     // Use Header.newBuilder() to construct.
     private Header(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -213,11 +213,11 @@ public final class DebugJsProtoBuf {
               break;
             }
             case 34: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = strings_.toBuilder();
               }
-              strings_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.PARSER, extensionRegistry);
+              strings_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(strings_);
                 strings_ = subBuilder.buildPartial();
@@ -226,11 +226,11 @@ public final class DebugJsProtoBuf {
               break;
             }
             case 42: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000010) == 0x00000010)) {
                 subBuilder = qualifiedNames_.toBuilder();
               }
-              qualifiedNames_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.PARSER, extensionRegistry);
+              qualifiedNames_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(qualifiedNames_);
                 qualifiedNames_ = subBuilder.buildPartial();
@@ -240,10 +240,10 @@ public final class DebugJsProtoBuf {
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                annotation_ = new java.util.ArrayList();
+                annotation_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              annotation_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.PARSER, extensionRegistry));
+              annotation_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.PARSER, extensionRegistry));
               break;
             }
           }
@@ -263,14 +263,14 @@ public final class DebugJsProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Header_descriptor;
+      return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Header_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Header_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Header_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header.class, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header.Builder.class);
+              org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header.class, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser
 PARSER =
@@ -378,72 +378,72 @@ public final class DebugJsProtoBuf {
     }
 
     public static final int STRINGS_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable strings_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable strings_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
      */
     public boolean hasStrings() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable getStrings() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable getStrings() {
       return strings_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder() {
       return strings_;
     }
 
     public static final int QUALIFIED_NAMES_FIELD_NUMBER = 5;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNames_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable qualifiedNames_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
      */
     public boolean hasQualifiedNames() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable getQualifiedNames() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable getQualifiedNames() {
       return qualifiedNames_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder() {
       return qualifiedNames_;
     }
 
     public static final int ANNOTATION_FIELD_NUMBER = 6;
-    private java.util.List annotation_;
+    private java.util.List annotation_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public java.util.List getAnnotationList() {
+    public java.util.List getAnnotationList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public java.util.List 
+    public java.util.List 
         getAnnotationOrBuilderList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
@@ -453,23 +453,23 @@ public final class DebugJsProtoBuf {
       return annotation_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation(int index) {
       return annotation_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
         int index) {
       return annotation_.get(index);
     }
@@ -478,8 +478,8 @@ public final class DebugJsProtoBuf {
       flags_ = 0;
       jsCodeBinaryVersion_ = 1;
       packageFqName_ = "";
-      strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
-      qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
+      strings_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance();
+      qualifiedNames_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
       annotation_ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
@@ -570,53 +570,53 @@ public final class DebugJsProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -625,7 +625,7 @@ public final class DebugJsProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -637,25 +637,25 @@ public final class DebugJsProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Header}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Header}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Header)
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.HeaderOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.js.Header)
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.HeaderOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Header_descriptor;
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Header_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Header_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Header_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header.class, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header.Builder.class);
+                org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header.class, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -685,13 +685,13 @@ public final class DebugJsProtoBuf {
         packageFqName_ = "";
         bitField0_ = (bitField0_ & ~0x00000004);
         if (stringsBuilder_ == null) {
-          strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
+          strings_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance();
         } else {
           stringsBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000008);
         if (qualifiedNamesBuilder_ == null) {
-          qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
+          qualifiedNames_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
         } else {
           qualifiedNamesBuilder_.clear();
         }
@@ -711,23 +711,23 @@ public final class DebugJsProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Header_descriptor;
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Header_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header build() {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header result = buildPartial();
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header build() {
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header buildPartial() {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header result = new org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header(this);
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header buildPartial() {
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header result = new org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -773,16 +773,16 @@ public final class DebugJsProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header other) {
-        if (other == org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header other) {
+        if (other == org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -850,11 +850,11 @@ public final class DebugJsProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header parsedMessage = null;
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Header) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Header) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -1037,19 +1037,19 @@ public final class DebugJsProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable strings_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder> stringsBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder> stringsBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
       public boolean hasStrings() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable getStrings() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable getStrings() {
         if (stringsBuilder_ == null) {
           return strings_;
         } else {
@@ -1057,9 +1057,9 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
-      public Builder setStrings(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable value) {
+      public Builder setStrings(org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable value) {
         if (stringsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1073,10 +1073,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
       public Builder setStrings(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder builderForValue) {
         if (stringsBuilder_ == null) {
           strings_ = builderForValue.build();
           onChanged();
@@ -1087,14 +1087,14 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
-      public Builder mergeStrings(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable value) {
+      public Builder mergeStrings(org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable value) {
         if (stringsBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              strings_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance()) {
+              strings_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance()) {
             strings_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.newBuilder(strings_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.newBuilder(strings_).mergeFrom(value).buildPartial();
           } else {
             strings_ = value;
           }
@@ -1106,11 +1106,11 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
       public Builder clearStrings() {
         if (stringsBuilder_ == null) {
-          strings_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
+          strings_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance();
           onChanged();
         } else {
           stringsBuilder_.clear();
@@ -1119,17 +1119,17 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder getStringsBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder getStringsBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getStringsFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder getStringsOrBuilder() {
         if (stringsBuilder_ != null) {
           return stringsBuilder_.getMessageOrBuilder();
         } else {
@@ -1137,14 +1137,14 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder> 
           getStringsFieldBuilder() {
         if (stringsBuilder_ == null) {
           stringsBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder>(
                   getStrings(),
                   getParentForChildren(),
                   isClean());
@@ -1153,19 +1153,19 @@ public final class DebugJsProtoBuf {
         return stringsBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder> qualifiedNamesBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder> qualifiedNamesBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
       public boolean hasQualifiedNames() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable getQualifiedNames() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable getQualifiedNames() {
         if (qualifiedNamesBuilder_ == null) {
           return qualifiedNames_;
         } else {
@@ -1173,9 +1173,9 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
-      public Builder setQualifiedNames(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable value) {
+      public Builder setQualifiedNames(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable value) {
         if (qualifiedNamesBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1189,10 +1189,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
       public Builder setQualifiedNames(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder builderForValue) {
         if (qualifiedNamesBuilder_ == null) {
           qualifiedNames_ = builderForValue.build();
           onChanged();
@@ -1203,14 +1203,14 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
-      public Builder mergeQualifiedNames(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable value) {
+      public Builder mergeQualifiedNames(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable value) {
         if (qualifiedNamesBuilder_ == null) {
           if (((bitField0_ & 0x00000010) == 0x00000010) &&
-              qualifiedNames_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance()) {
+              qualifiedNames_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance()) {
             qualifiedNames_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.newBuilder(qualifiedNames_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.newBuilder(qualifiedNames_).mergeFrom(value).buildPartial();
           } else {
             qualifiedNames_ = value;
           }
@@ -1222,11 +1222,11 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
       public Builder clearQualifiedNames() {
         if (qualifiedNamesBuilder_ == null) {
-          qualifiedNames_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
+          qualifiedNames_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
           onChanged();
         } else {
           qualifiedNamesBuilder_.clear();
@@ -1235,17 +1235,17 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder getQualifiedNamesBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder getQualifiedNamesBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
         return getQualifiedNamesFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNamesOrBuilder() {
         if (qualifiedNamesBuilder_ != null) {
           return qualifiedNamesBuilder_.getMessageOrBuilder();
         } else {
@@ -1253,14 +1253,14 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder> 
           getQualifiedNamesFieldBuilder() {
         if (qualifiedNamesBuilder_ == null) {
           qualifiedNamesBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder>(
                   getQualifiedNames(),
                   getParentForChildren(),
                   isClean());
@@ -1269,26 +1269,26 @@ public final class DebugJsProtoBuf {
         return qualifiedNamesBuilder_;
       }
 
-      private java.util.List annotation_ =
+      private java.util.List annotation_ =
         java.util.Collections.emptyList();
       private void ensureAnnotationIsMutable() {
         if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          annotation_ = new java.util.ArrayList(annotation_);
+          annotation_ = new java.util.ArrayList(annotation_);
           bitField0_ |= 0x00000020;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder> annotationBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder> annotationBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public java.util.List getAnnotationList() {
+      public java.util.List getAnnotationList() {
         if (annotationBuilder_ == null) {
           return java.util.Collections.unmodifiableList(annotation_);
         } else {
@@ -1296,7 +1296,7 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
@@ -1310,13 +1310,13 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation(int index) {
         if (annotationBuilder_ == null) {
           return annotation_.get(index);
         } else {
@@ -1324,14 +1324,14 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation value) {
         if (annotationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1345,14 +1345,14 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder builderForValue) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           annotation_.set(index, builderForValue.build());
@@ -1363,13 +1363,13 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public Builder addAnnotation(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
+      public Builder addAnnotation(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation value) {
         if (annotationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1383,14 +1383,14 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation value) {
         if (annotationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1404,14 +1404,14 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAnnotation(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder builderForValue) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           annotation_.add(builderForValue.build());
@@ -1422,14 +1422,14 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder builderForValue) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           annotation_.add(index, builderForValue.build());
@@ -1440,14 +1440,14 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAllAnnotation(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -1459,7 +1459,7 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
@@ -1476,7 +1476,7 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
@@ -1493,24 +1493,24 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder getAnnotationBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder getAnnotationBuilder(
           int index) {
         return getAnnotationFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
           int index) {
         if (annotationBuilder_ == null) {
           return annotation_.get(index);  } else {
@@ -1518,13 +1518,13 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public java.util.List 
+      public java.util.List 
            getAnnotationOrBuilderList() {
         if (annotationBuilder_ != null) {
           return annotationBuilder_.getMessageOrBuilderList();
@@ -1533,45 +1533,45 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder addAnnotationBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder addAnnotationBuilder() {
         return getAnnotationFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder addAnnotationBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder addAnnotationBuilder(
           int index) {
         return getAnnotationFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public java.util.List 
+      public java.util.List 
            getAnnotationBuilderList() {
         return getAnnotationFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder> 
           getAnnotationFieldBuilder() {
         if (annotationBuilder_ == null) {
           annotationBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder>(
                   annotation_,
                   ((bitField0_ & 0x00000020) == 0x00000020),
                   getParentForChildren(),
@@ -1581,7 +1581,7 @@ public final class DebugJsProtoBuf {
         return annotationBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.Header)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.js.Header)
     }
 
     static {
@@ -1589,11 +1589,11 @@ public final class DebugJsProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Header)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.js.Header)
   }
 
   public interface FileOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.File)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.js.File)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
@@ -1614,35 +1614,35 @@ public final class DebugJsProtoBuf {
     int getId();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
-    java.util.List 
+    java.util.List 
         getAnnotationList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
     int getAnnotationCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
-    java.util.List 
+    java.util.List 
         getAnnotationOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.js.File}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.js.File}
    */
   public static final class File extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.File)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.js.File)
       FileOrBuilder {
     // Use File.newBuilder() to construct.
     private File(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -1696,10 +1696,10 @@ public final class DebugJsProtoBuf {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                annotation_ = new java.util.ArrayList();
+                annotation_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              annotation_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.PARSER, extensionRegistry));
+              annotation_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.PARSER, extensionRegistry));
               break;
             }
           }
@@ -1719,14 +1719,14 @@ public final class DebugJsProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_File_descriptor;
+      return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_File_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_File_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_File_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.class, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.Builder.class);
+              org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.class, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -1769,36 +1769,36 @@ public final class DebugJsProtoBuf {
     }
 
     public static final int ANNOTATION_FIELD_NUMBER = 2;
-    private java.util.List annotation_;
+    private java.util.List annotation_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
-    public java.util.List getAnnotationList() {
+    public java.util.List getAnnotationList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getAnnotationOrBuilderList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
     public int getAnnotationCount() {
       return annotation_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation(int index) {
       return annotation_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
         int index) {
       return annotation_.get(index);
     }
@@ -1861,53 +1861,53 @@ public final class DebugJsProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1916,7 +1916,7 @@ public final class DebugJsProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -1928,25 +1928,25 @@ public final class DebugJsProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.js.File}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.js.File}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.File)
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.FileOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.js.File)
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.FileOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_File_descriptor;
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_File_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_File_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_File_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.class, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.Builder.class);
+                org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.class, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1984,23 +1984,23 @@ public final class DebugJsProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_File_descriptor;
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_File_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File build() {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File result = buildPartial();
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File build() {
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File buildPartial() {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File result = new org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File(this);
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File buildPartial() {
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File result = new org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2022,16 +2022,16 @@ public final class DebugJsProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File other) {
-        if (other == org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File other) {
+        if (other == org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.getDefaultInstance()) return this;
         if (other.hasId()) {
           setId(other.getId());
         }
@@ -2079,11 +2079,11 @@ public final class DebugJsProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File parsedMessage = null;
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2142,22 +2142,22 @@ public final class DebugJsProtoBuf {
         return this;
       }
 
-      private java.util.List annotation_ =
+      private java.util.List annotation_ =
         java.util.Collections.emptyList();
       private void ensureAnnotationIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          annotation_ = new java.util.ArrayList(annotation_);
+          annotation_ = new java.util.ArrayList(annotation_);
           bitField0_ |= 0x00000002;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder> annotationBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder> annotationBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
-      public java.util.List getAnnotationList() {
+      public java.util.List getAnnotationList() {
         if (annotationBuilder_ == null) {
           return java.util.Collections.unmodifiableList(annotation_);
         } else {
@@ -2165,7 +2165,7 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public int getAnnotationCount() {
         if (annotationBuilder_ == null) {
@@ -2175,9 +2175,9 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation(int index) {
         if (annotationBuilder_ == null) {
           return annotation_.get(index);
         } else {
@@ -2185,10 +2185,10 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation value) {
         if (annotationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2202,10 +2202,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder builderForValue) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           annotation_.set(index, builderForValue.build());
@@ -2216,9 +2216,9 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
-      public Builder addAnnotation(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
+      public Builder addAnnotation(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation value) {
         if (annotationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2232,10 +2232,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation value) {
         if (annotationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2249,10 +2249,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder addAnnotation(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder builderForValue) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           annotation_.add(builderForValue.build());
@@ -2263,10 +2263,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder builderForValue) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           annotation_.add(index, builderForValue.build());
@@ -2277,10 +2277,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder addAllAnnotation(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -2292,7 +2292,7 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder clearAnnotation() {
         if (annotationBuilder_ == null) {
@@ -2305,7 +2305,7 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder removeAnnotation(int index) {
         if (annotationBuilder_ == null) {
@@ -2318,16 +2318,16 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder getAnnotationBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder getAnnotationBuilder(
           int index) {
         return getAnnotationFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
           int index) {
         if (annotationBuilder_ == null) {
           return annotation_.get(index);  } else {
@@ -2335,9 +2335,9 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getAnnotationOrBuilderList() {
         if (annotationBuilder_ != null) {
           return annotationBuilder_.getMessageOrBuilderList();
@@ -2346,33 +2346,33 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder addAnnotationBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder addAnnotationBuilder() {
         return getAnnotationFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder addAnnotationBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder addAnnotationBuilder(
           int index) {
         return getAnnotationFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getAnnotationBuilderList() {
         return getAnnotationFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder> 
           getAnnotationFieldBuilder() {
         if (annotationBuilder_ == null) {
           annotationBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder>(
                   annotation_,
                   ((bitField0_ & 0x00000002) == 0x00000002),
                   getParentForChildren(),
@@ -2382,7 +2382,7 @@ public final class DebugJsProtoBuf {
         return annotationBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.File)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.js.File)
     }
 
     static {
@@ -2390,43 +2390,43 @@ public final class DebugJsProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.File)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.js.File)
   }
 
   public interface FilesOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Files)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.js.Files)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
-    java.util.List 
+    java.util.List 
         getFileList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
-    org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File getFile(int index);
+    org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File getFile(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
     int getFileCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
-    java.util.List 
+    java.util.List 
         getFileOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
-    org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.FileOrBuilder getFileOrBuilder(
+    org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.FileOrBuilder getFileOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Files}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Files}
    */
   public static final class Files extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Files)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.js.Files)
       FilesOrBuilder {
     // Use Files.newBuilder() to construct.
     private Files(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -2475,10 +2475,10 @@ public final class DebugJsProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                file_ = new java.util.ArrayList();
+                file_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              file_.add(input.readMessage(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.PARSER, extensionRegistry));
+              file_.add(input.readMessage(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.PARSER, extensionRegistry));
               break;
             }
           }
@@ -2498,14 +2498,14 @@ public final class DebugJsProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Files_descriptor;
+      return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Files_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Files_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Files_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files.class, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files.Builder.class);
+              org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files.class, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -2524,36 +2524,36 @@ public final class DebugJsProtoBuf {
     }
 
     public static final int FILE_FIELD_NUMBER = 1;
-    private java.util.List file_;
+    private java.util.List file_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
-    public java.util.List getFileList() {
+    public java.util.List getFileList() {
       return file_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getFileOrBuilderList() {
       return file_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
     public int getFileCount() {
       return file_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
-    public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File getFile(int index) {
+    public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File getFile(int index) {
       return file_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
-    public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.FileOrBuilder getFileOrBuilder(
+    public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.FileOrBuilder getFileOrBuilder(
         int index) {
       return file_.get(index);
     }
@@ -2608,53 +2608,53 @@ public final class DebugJsProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2663,7 +2663,7 @@ public final class DebugJsProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -2675,25 +2675,25 @@ public final class DebugJsProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Files}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Files}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Files)
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.FilesOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.js.Files)
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.FilesOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Files_descriptor;
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Files_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Files_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Files_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files.class, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files.Builder.class);
+                org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files.class, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2729,23 +2729,23 @@ public final class DebugJsProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Files_descriptor;
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Files_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files build() {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files result = buildPartial();
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files build() {
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files buildPartial() {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files result = new org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files(this);
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files buildPartial() {
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files result = new org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files(this);
         int from_bitField0_ = bitField0_;
         if (fileBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2761,16 +2761,16 @@ public final class DebugJsProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files other) {
-        if (other == org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files other) {
+        if (other == org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files.getDefaultInstance()) return this;
         if (fileBuilder_ == null) {
           if (!other.file_.isEmpty()) {
             if (file_.isEmpty()) {
@@ -2815,11 +2815,11 @@ public final class DebugJsProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files parsedMessage = null;
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2830,22 +2830,22 @@ public final class DebugJsProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List file_ =
+      private java.util.List file_ =
         java.util.Collections.emptyList();
       private void ensureFileIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          file_ = new java.util.ArrayList(file_);
+          file_ = new java.util.ArrayList(file_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.Builder, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.FileOrBuilder> fileBuilder_;
+          org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.Builder, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.FileOrBuilder> fileBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
-      public java.util.List getFileList() {
+      public java.util.List getFileList() {
         if (fileBuilder_ == null) {
           return java.util.Collections.unmodifiableList(file_);
         } else {
@@ -2853,7 +2853,7 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public int getFileCount() {
         if (fileBuilder_ == null) {
@@ -2863,9 +2863,9 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File getFile(int index) {
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File getFile(int index) {
         if (fileBuilder_ == null) {
           return file_.get(index);
         } else {
@@ -2873,10 +2873,10 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder setFile(
-          int index, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File value) {
+          int index, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File value) {
         if (fileBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2890,10 +2890,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder setFile(
-          int index, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.Builder builderForValue) {
         if (fileBuilder_ == null) {
           ensureFileIsMutable();
           file_.set(index, builderForValue.build());
@@ -2904,9 +2904,9 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
-      public Builder addFile(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File value) {
+      public Builder addFile(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File value) {
         if (fileBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2920,10 +2920,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder addFile(
-          int index, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File value) {
+          int index, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File value) {
         if (fileBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2937,10 +2937,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder addFile(
-          org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.Builder builderForValue) {
         if (fileBuilder_ == null) {
           ensureFileIsMutable();
           file_.add(builderForValue.build());
@@ -2951,10 +2951,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder addFile(
-          int index, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.Builder builderForValue) {
         if (fileBuilder_ == null) {
           ensureFileIsMutable();
           file_.add(index, builderForValue.build());
@@ -2965,10 +2965,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder addAllFile(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (fileBuilder_ == null) {
           ensureFileIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -2980,7 +2980,7 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder clearFile() {
         if (fileBuilder_ == null) {
@@ -2993,7 +2993,7 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder removeFile(int index) {
         if (fileBuilder_ == null) {
@@ -3006,16 +3006,16 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.Builder getFileBuilder(
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.Builder getFileBuilder(
           int index) {
         return getFileFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.FileOrBuilder getFileOrBuilder(
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.FileOrBuilder getFileOrBuilder(
           int index) {
         if (fileBuilder_ == null) {
           return file_.get(index);  } else {
@@ -3023,9 +3023,9 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getFileOrBuilderList() {
         if (fileBuilder_ != null) {
           return fileBuilder_.getMessageOrBuilderList();
@@ -3034,33 +3034,33 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.Builder addFileBuilder() {
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.Builder addFileBuilder() {
         return getFileFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.Builder addFileBuilder(
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.Builder addFileBuilder(
           int index) {
         return getFileFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getFileBuilderList() {
         return getFileFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.Builder, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.FileOrBuilder> 
+          org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.Builder, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.FileOrBuilder> 
           getFileFieldBuilder() {
         if (fileBuilder_ == null) {
           fileBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.File.Builder, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.FileOrBuilder>(
+              org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.File.Builder, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.FileOrBuilder>(
                   file_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
@@ -3070,7 +3070,7 @@ public final class DebugJsProtoBuf {
         return fileBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.Files)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.js.Files)
     }
 
     static {
@@ -3078,11 +3078,11 @@ public final class DebugJsProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Files)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.js.Files)
   }
 
   public interface ClassesOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Classes)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.js.Classes)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
@@ -3111,11 +3111,11 @@ public final class DebugJsProtoBuf {
     int getClassName(int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Classes}
    */
   public static final class Classes extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Classes)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.js.Classes)
       ClassesOrBuilder {
     // Use Classes.newBuilder() to construct.
     private Classes(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -3200,14 +3200,14 @@ public final class DebugJsProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor;
+      return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Classes_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Classes_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Classes_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes.class, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes.Builder.class);
+              org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes.class, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -3318,53 +3318,53 @@ public final class DebugJsProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3373,7 +3373,7 @@ public final class DebugJsProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -3385,25 +3385,25 @@ public final class DebugJsProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Classes}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Classes)
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.ClassesOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.js.Classes)
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.ClassesOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor;
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Classes_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Classes_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Classes_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes.class, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes.Builder.class);
+                org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes.class, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -3434,23 +3434,23 @@ public final class DebugJsProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor;
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Classes_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes build() {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes result = buildPartial();
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes build() {
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes buildPartial() {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes result = new org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes(this);
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes buildPartial() {
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes result = new org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           className_ = java.util.Collections.unmodifiableList(className_);
@@ -3462,16 +3462,16 @@ public final class DebugJsProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes other) {
-        if (other == org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes other) {
+        if (other == org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes.getDefaultInstance()) return this;
         if (!other.className_.isEmpty()) {
           if (className_.isEmpty()) {
             className_ = other.className_;
@@ -3494,11 +3494,11 @@ public final class DebugJsProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes parsedMessage = null;
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Classes) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Classes) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -3603,7 +3603,7 @@ public final class DebugJsProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.Classes)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.js.Classes)
     }
 
     static {
@@ -3611,44 +3611,44 @@ public final class DebugJsProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Classes)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.js.Classes)
   }
 
   public interface LibraryOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Library)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.js.Library)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+     * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
      */
     boolean hasKind();
     /**
-     * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+     * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
      */
-    org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind getKind();
+    org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.Kind getKind();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
-    java.util.List 
+    java.util.List 
         getPackageFragmentList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment getPackageFragment(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment getPackageFragment(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
     int getPackageFragmentCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
-    java.util.List 
+    java.util.List 
         getPackageFragmentOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragmentOrBuilder getPackageFragmentOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragmentOrBuilder getPackageFragmentOrBuilder(
         int index);
 
     /**
@@ -3671,11 +3671,11 @@ public final class DebugJsProtoBuf {
         getImportedModuleBytes(int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Library}
    */
   public static final class Library extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Library)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.js.Library)
       LibraryOrBuilder {
     // Use Library.newBuilder() to construct.
     private Library(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -3724,7 +3724,7 @@ public final class DebugJsProtoBuf {
             }
             case 8: {
               int rawValue = input.readEnum();
-              org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind value = org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind.valueOf(rawValue);
+              org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.Kind value = org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.Kind.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
@@ -3735,10 +3735,10 @@ public final class DebugJsProtoBuf {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                packageFragment_ = new java.util.ArrayList();
+                packageFragment_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              packageFragment_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.PARSER, extensionRegistry));
+              packageFragment_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.PARSER, extensionRegistry));
               break;
             }
             case 26: {
@@ -3770,14 +3770,14 @@ public final class DebugJsProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor;
+      return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Library_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Library_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Library_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.class, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Builder.class);
+              org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.class, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -3796,7 +3796,7 @@ public final class DebugJsProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.js.Library.Kind}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.js.Library.Kind}
      */
     public enum Kind
         implements org.jetbrains.kotlin.protobuf.ProtocolMessageEnum {
@@ -3870,7 +3870,7 @@ public final class DebugJsProtoBuf {
       }
       public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.getDescriptor().getEnumTypes().get(0);
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.getDescriptor().getEnumTypes().get(0);
       }
 
       private static final Kind[] VALUES = values();
@@ -3892,56 +3892,56 @@ public final class DebugJsProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.js.Library.Kind)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.js.Library.Kind)
     }
 
     private int bitField0_;
     public static final int KIND_FIELD_NUMBER = 1;
-    private org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind kind_;
+    private org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.Kind kind_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+     * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
      */
     public boolean hasKind() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+     * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
      */
-    public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind getKind() {
+    public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.Kind getKind() {
       return kind_;
     }
 
     public static final int PACKAGE_FRAGMENT_FIELD_NUMBER = 2;
-    private java.util.List packageFragment_;
+    private java.util.List packageFragment_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
-    public java.util.List getPackageFragmentList() {
+    public java.util.List getPackageFragmentList() {
       return packageFragment_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getPackageFragmentOrBuilderList() {
       return packageFragment_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
     public int getPackageFragmentCount() {
       return packageFragment_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment getPackageFragment(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment getPackageFragment(int index) {
       return packageFragment_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragmentOrBuilder getPackageFragmentOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragmentOrBuilder getPackageFragmentOrBuilder(
         int index) {
       return packageFragment_.get(index);
     }
@@ -3976,7 +3976,7 @@ public final class DebugJsProtoBuf {
     }
 
     private void initFields() {
-      kind_ = org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind.PLAIN;
+      kind_ = org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.Kind.PLAIN;
       packageFragment_ = java.util.Collections.emptyList();
       importedModule_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
     }
@@ -4046,53 +4046,53 @@ public final class DebugJsProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -4101,7 +4101,7 @@ public final class DebugJsProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -4113,25 +4113,25 @@ public final class DebugJsProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Library}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Library)
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.LibraryOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.js.Library)
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.LibraryOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor;
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Library_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Library_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Library_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.class, org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Builder.class);
+                org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.class, org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -4152,7 +4152,7 @@ public final class DebugJsProtoBuf {
 
       public Builder clear() {
         super.clear();
-        kind_ = org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind.PLAIN;
+        kind_ = org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.Kind.PLAIN;
         bitField0_ = (bitField0_ & ~0x00000001);
         if (packageFragmentBuilder_ == null) {
           packageFragment_ = java.util.Collections.emptyList();
@@ -4171,23 +4171,23 @@ public final class DebugJsProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor;
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.internal_static_org_jetbrains_kotlin_metadata_js_Library_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library build() {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library result = buildPartial();
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library build() {
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library buildPartial() {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library result = new org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library(this);
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library buildPartial() {
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library result = new org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -4214,16 +4214,16 @@ public final class DebugJsProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library other) {
-        if (other == org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library other) {
+        if (other == org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.getDefaultInstance()) return this;
         if (other.hasKind()) {
           setKind(other.getKind());
         }
@@ -4281,11 +4281,11 @@ public final class DebugJsProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library parsedMessage = null;
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -4296,23 +4296,23 @@ public final class DebugJsProtoBuf {
       }
       private int bitField0_;
 
-      private org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind kind_ = org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind.PLAIN;
+      private org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.Kind kind_ = org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.Kind.PLAIN;
       /**
-       * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+       * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
        */
       public boolean hasKind() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+       * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
        */
-      public org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind getKind() {
+      public org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.Kind getKind() {
         return kind_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+       * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
        */
-      public Builder setKind(org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind value) {
+      public Builder setKind(org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.Kind value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -4322,31 +4322,31 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+       * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
        */
       public Builder clearKind() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        kind_ = org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Library.Kind.PLAIN;
+        kind_ = org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Library.Kind.PLAIN;
         onChanged();
         return this;
       }
 
-      private java.util.List packageFragment_ =
+      private java.util.List packageFragment_ =
         java.util.Collections.emptyList();
       private void ensurePackageFragmentIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          packageFragment_ = new java.util.ArrayList(packageFragment_);
+          packageFragment_ = new java.util.ArrayList(packageFragment_);
           bitField0_ |= 0x00000002;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragmentOrBuilder> packageFragmentBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragmentOrBuilder> packageFragmentBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
-      public java.util.List getPackageFragmentList() {
+      public java.util.List getPackageFragmentList() {
         if (packageFragmentBuilder_ == null) {
           return java.util.Collections.unmodifiableList(packageFragment_);
         } else {
@@ -4354,7 +4354,7 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public int getPackageFragmentCount() {
         if (packageFragmentBuilder_ == null) {
@@ -4364,9 +4364,9 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment getPackageFragment(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment getPackageFragment(int index) {
         if (packageFragmentBuilder_ == null) {
           return packageFragment_.get(index);
         } else {
@@ -4374,10 +4374,10 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder setPackageFragment(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment value) {
         if (packageFragmentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4391,10 +4391,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder setPackageFragment(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.Builder builderForValue) {
         if (packageFragmentBuilder_ == null) {
           ensurePackageFragmentIsMutable();
           packageFragment_.set(index, builderForValue.build());
@@ -4405,9 +4405,9 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
-      public Builder addPackageFragment(org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment value) {
+      public Builder addPackageFragment(org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment value) {
         if (packageFragmentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4421,10 +4421,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder addPackageFragment(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment value) {
         if (packageFragmentBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4438,10 +4438,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder addPackageFragment(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.Builder builderForValue) {
         if (packageFragmentBuilder_ == null) {
           ensurePackageFragmentIsMutable();
           packageFragment_.add(builderForValue.build());
@@ -4452,10 +4452,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder addPackageFragment(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.Builder builderForValue) {
         if (packageFragmentBuilder_ == null) {
           ensurePackageFragmentIsMutable();
           packageFragment_.add(index, builderForValue.build());
@@ -4466,10 +4466,10 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder addAllPackageFragment(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (packageFragmentBuilder_ == null) {
           ensurePackageFragmentIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -4481,7 +4481,7 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder clearPackageFragment() {
         if (packageFragmentBuilder_ == null) {
@@ -4494,7 +4494,7 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder removePackageFragment(int index) {
         if (packageFragmentBuilder_ == null) {
@@ -4507,16 +4507,16 @@ public final class DebugJsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.Builder getPackageFragmentBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.Builder getPackageFragmentBuilder(
           int index) {
         return getPackageFragmentFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragmentOrBuilder getPackageFragmentOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragmentOrBuilder getPackageFragmentOrBuilder(
           int index) {
         if (packageFragmentBuilder_ == null) {
           return packageFragment_.get(index);  } else {
@@ -4524,9 +4524,9 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getPackageFragmentOrBuilderList() {
         if (packageFragmentBuilder_ != null) {
           return packageFragmentBuilder_.getMessageOrBuilderList();
@@ -4535,33 +4535,33 @@ public final class DebugJsProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.Builder addPackageFragmentBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.Builder addPackageFragmentBuilder() {
         return getPackageFragmentFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.Builder addPackageFragmentBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.Builder addPackageFragmentBuilder(
           int index) {
         return getPackageFragmentFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
-      public java.util.List 
+      public java.util.List 
            getPackageFragmentBuilderList() {
         return getPackageFragmentFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragmentOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragmentOrBuilder> 
           getPackageFragmentFieldBuilder() {
         if (packageFragmentBuilder_ == null) {
           packageFragmentBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragmentOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragmentOrBuilder>(
                   packageFragment_,
                   ((bitField0_ & 0x00000002) == 0x00000002),
                   getParentForChildren(),
@@ -4664,7 +4664,7 @@ public final class DebugJsProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.Library)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.js.Library)
     }
 
     static {
@@ -4672,188 +4672,188 @@ public final class DebugJsProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Library)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.js.Library)
   }
 
   public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 131;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Package { ... }
+   * extend .org.jetbrains.kotlin.metadata.Package { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Package,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Package,
       java.lang.Integer> packageFqName = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
   public static final int CLASS_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Class { ... }
+   * extend .org.jetbrains.kotlin.metadata.Class { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Class,
-      java.util.List> classAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Class,
+      java.util.List> classAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
   public static final int CLASS_CONTAINING_FILE_ID_FIELD_NUMBER = 135;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Class { ... }
+   * extend .org.jetbrains.kotlin.metadata.Class { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Class,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Class,
       java.lang.Integer> classContainingFileId = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
   public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Constructor { ... }
+   * extend .org.jetbrains.kotlin.metadata.Constructor { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor,
-      java.util.List> constructorAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor,
+      java.util.List> constructorAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
   public static final int FUNCTION_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Function { ... }
+   * extend .org.jetbrains.kotlin.metadata.Function { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Function,
-      java.util.List> functionAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Function,
+      java.util.List> functionAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
   public static final int FUNCTION_CONTAINING_FILE_ID_FIELD_NUMBER = 135;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Function { ... }
+   * extend .org.jetbrains.kotlin.metadata.Function { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Function,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Function,
       java.lang.Integer> functionContainingFileId = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
   public static final int PROPERTY_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Property { ... }
+   * extend .org.jetbrains.kotlin.metadata.Property { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Property,
-      java.util.List> propertyAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
+      java.util.List> propertyAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
   public static final int COMPILE_TIME_VALUE_FIELD_NUMBER = 131;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Property { ... }
+   * extend .org.jetbrains.kotlin.metadata.Property { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Property,
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value> compileTimeValue = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value> compileTimeValue = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
   public static final int PROPERTY_CONTAINING_FILE_ID_FIELD_NUMBER = 135;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Property { ... }
+   * extend .org.jetbrains.kotlin.metadata.Property { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Property,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
       java.lang.Integer> propertyContainingFileId = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
   public static final int ENUM_ENTRY_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.EnumEntry { ... }
+   * extend .org.jetbrains.kotlin.metadata.EnumEntry { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry,
-      java.util.List> enumEntryAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.EnumEntry,
+      java.util.List> enumEntryAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
   public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }
+   * extend .org.jetbrains.kotlin.metadata.ValueParameter { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter,
-      java.util.List> parameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.ValueParameter,
+      java.util.List> parameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
   public static final int TYPE_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Type { ... }
+   * extend .org.jetbrains.kotlin.metadata.Type { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Type,
-      java.util.List> typeAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Type,
+      java.util.List> typeAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
   public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.TypeParameter { ... }
+   * extend .org.jetbrains.kotlin.metadata.TypeParameter { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter,
-      java.util.List> typeParameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter,
+      java.util.List> typeParameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
   public static final int PACKAGE_FRAGMENT_FILES_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.PackageFragment { ... }
+   * extend .org.jetbrains.kotlin.metadata.PackageFragment { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.PackageFragment,
-      org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files> packageFragmentFiles = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.PackageFragment,
+      org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files> packageFragmentFiles = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files.class,
-        org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf.Files.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files.class,
+        org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf.Files.getDefaultInstance());
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_js_Header_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_js_Header_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_js_Header_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_js_Header_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_js_File_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_js_File_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_js_File_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_js_File_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_js_Files_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_js_Files_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_js_Files_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_js_Files_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_js_Classes_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_js_Classes_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_js_Classes_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_js_Library_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_js_Library_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_js_Library_fieldAccessorTable;
 
   public static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -4863,68 +4863,64 @@ public final class DebugJsProtoBuf {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n#js/js.serializer/src/js.debug.proto\022%o" +
-      "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"
+      "\n#js/js.serializer/src/js.debug.proto\022 o" +
+      "rg.jetbrains.kotlin.metadata.js\032&core/me" +
+      "tadata/src/metadata.debug.proto\"\233\002\n\006Head" +
+      "er\022\r\n\005flags\030\001 \001(\005\022!\n\026js_code_binary_vers" +
+      "ion\030\002 \001(\005:\0011\022\027\n\017package_fq_name\030\003 \001(\t\022;\n" +
+      "\007strings\030\004 \001(\0132*.org.jetbrains.kotlin.me" +
+      "tadata.StringTable\022J\n\017qualified_names\030\005 " +
+      "\001(\01321.org.jetbrains.kotlin.metadata.Qual" +
+      "ifiedNameTable\022=\n\nannotation\030\006 \003(\0132).org" +
+      ".jetbrains.kotlin.metadata.Annotation\"Q\n",
+      "\004File\022\n\n\002id\030\001 \001(\005\022=\n\nannotation\030\002 \003(\0132)." +
+      "org.jetbrains.kotlin.metadata.Annotation" +
+      "\"=\n\005Files\0224\n\004file\030\001 \003(\0132&.org.jetbrains." +
+      "kotlin.metadata.js.File\"!\n\007Classes\022\026\n\ncl" +
+      "ass_name\030\001 \003(\005B\002\020\001\"\345\001\n\007Library\022C\n\004kind\030\001" +
+      " \001(\0162..org.jetbrains.kotlin.metadata.js." +
+      "Library.Kind:\005PLAIN\022H\n\020package_fragment\030" +
+      "\002 \003(\0132..org.jetbrains.kotlin.metadata.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:@\n\017package_fq_name\022&.org.jetb" +
+      "rains.kotlin.metadata.Package\030\203\001 \001(\005:j\n\020" +
+      "class_annotation\022$.org.jetbrains.kotlin." +
+      "metadata.Class\030\202\001 \003(\0132).org.jetbrains.ko" +
+      "tlin.metadata.Annotation:G\n\030class_contai" +
+      "ning_file_id\022$.org.jetbrains.kotlin.meta" +
+      "data.Class\030\207\001 \001(\005:v\n\026constructor_annotat" +
+      "ion\022*.org.jetbrains.kotlin.metadata.Cons" +
+      "tructor\030\202\001 \003(\0132).org.jetbrains.kotlin.me" +
+      "tadata.Annotation:p\n\023function_annotation",
+      "\022\'.org.jetbrains.kotlin.metadata.Functio" +
+      "n\030\202\001 \003(\0132).org.jetbrains.kotlin.metadata" +
+      ".Annotation:M\n\033function_containing_file_" +
+      "id\022\'.org.jetbrains.kotlin.metadata.Funct" +
+      "ion\030\207\001 \001(\005:p\n\023property_annotation\022\'.org." +
+      "jetbrains.kotlin.metadata.Property\030\202\001 \003(" +
+      "\0132).org.jetbrains.kotlin.metadata.Annota" +
+      "tion:~\n\022compile_time_value\022\'.org.jetbrai" +
+      "ns.kotlin.metadata.Property\030\203\001 \001(\01328.org" +
+      ".jetbrains.kotlin.metadata.Annotation.Ar",
+      "gument.Value:M\n\033property_containing_file" +
+      "_id\022\'.org.jetbrains.kotlin.metadata.Prop" +
+      "erty\030\207\001 \001(\005:s\n\025enum_entry_annotation\022(.o" +
+      "rg.jetbrains.kotlin.metadata.EnumEntry\030\202" +
+      "\001 \003(\0132).org.jetbrains.kotlin.metadata.An" +
+      "notation:w\n\024parameter_annotation\022-.org.j" +
+      "etbrains.kotlin.metadata.ValueParameter\030" +
+      "\202\001 \003(\0132).org.jetbrains.kotlin.metadata.A" +
+      "nnotation:h\n\017type_annotation\022#.org.jetbr" +
+      "ains.kotlin.metadata.Type\030\202\001 \003(\0132).org.j",
+      "etbrains.kotlin.metadata.Annotation:{\n\031t" +
+      "ype_parameter_annotation\022,.org.jetbrains" +
+      ".kotlin.metadata.TypeParameter\030\202\001 \003(\0132)." +
+      "org.jetbrains.kotlin.metadata.Annotation" +
+      ":x\n\026package_fragment_files\022..org.jetbrai" +
+      "ns.kotlin.metadata.PackageFragment\030\202\001 \001(" +
+      "\0132\'.org.jetbrains.kotlin.metadata.js.Fil" +
+      "esB\021B\017DebugJsProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -4937,37 +4933,37 @@ public final class DebugJsProtoBuf {
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor(),
         }, assigner);
-    internal_static_org_jetbrains_kotlin_serialization_js_Header_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_js_Header_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_org_jetbrains_kotlin_serialization_js_Header_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_js_Header_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_js_Header_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_js_Header_descriptor,
         new java.lang.String[] { "Flags", "JsCodeBinaryVersion", "PackageFqName", "Strings", "QualifiedNames", "Annotation", });
-    internal_static_org_jetbrains_kotlin_serialization_js_File_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_js_File_descriptor =
       getDescriptor().getMessageTypes().get(1);
-    internal_static_org_jetbrains_kotlin_serialization_js_File_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_js_File_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_js_File_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_js_File_descriptor,
         new java.lang.String[] { "Id", "Annotation", });
-    internal_static_org_jetbrains_kotlin_serialization_js_Files_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_js_Files_descriptor =
       getDescriptor().getMessageTypes().get(2);
-    internal_static_org_jetbrains_kotlin_serialization_js_Files_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_js_Files_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_js_Files_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_js_Files_descriptor,
         new java.lang.String[] { "File", });
-    internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_js_Classes_descriptor =
       getDescriptor().getMessageTypes().get(3);
-    internal_static_org_jetbrains_kotlin_serialization_js_Classes_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_js_Classes_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_js_Classes_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_js_Classes_descriptor,
         new java.lang.String[] { "ClassName", });
-    internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_js_Library_descriptor =
       getDescriptor().getMessageTypes().get(4);
-    internal_static_org_jetbrains_kotlin_serialization_js_Library_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_js_Library_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_js_Library_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_js_Library_descriptor,
         new java.lang.String[] { "Kind", "PackageFragment", "ImportedModule", });
     packageFqName.internalInit(descriptor.getExtensions().get(0));
     classAnnotation.internalInit(descriptor.getExtensions().get(1));
@@ -4983,7 +4979,7 @@ public final class DebugJsProtoBuf {
     typeAnnotation.internalInit(descriptor.getExtensions().get(11));
     typeParameterAnnotation.internalInit(descriptor.getExtensions().get(12));
     packageFragmentFiles.internalInit(descriptor.getExtensions().get(13));
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmModuleProtoBuf.java b/build-common/test/org/jetbrains/kotlin/metadata/jvm/DebugJvmModuleProtoBuf.java
similarity index 78%
rename from build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmModuleProtoBuf.java
rename to build-common/test/org/jetbrains/kotlin/metadata/jvm/DebugJvmModuleProtoBuf.java
index 8100460b32e..c0e8eb6b4b9 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmModuleProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/metadata/jvm/DebugJvmModuleProtoBuf.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: core/metadata.jvm/src/jvm_module.debug.proto
 
-package org.jetbrains.kotlin.serialization.jvm;
+package org.jetbrains.kotlin.metadata.jvm;
 
 public final class DebugJvmModuleProtoBuf {
   private DebugJvmModuleProtoBuf() {}
@@ -9,28 +9,28 @@ public final class DebugJvmModuleProtoBuf {
       org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
   }
   public interface ModuleOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.Module)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.jvm.Module)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
      * 

      */
-    java.util.List 
+    java.util.List 
         getPackagePartsList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
      * 

      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getPackageParts(int index);
+    org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts getPackageParts(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
@@ -38,43 +38,43 @@ public final class DebugJvmModuleProtoBuf {
      */
     int getPackagePartsCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
      * 

      */
-    java.util.List 
+    java.util.List 
         getPackagePartsOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
      * 

      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
+    org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
         int index);
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
      * 

      */
-    java.util.List 
+    java.util.List 
         getMetadataPartsList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
      * 

      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getMetadataParts(int index);
+    org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts getMetadataParts(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
@@ -82,22 +82,22 @@ public final class DebugJvmModuleProtoBuf {
      */
     int getMetadataPartsCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
      * 

      */
-    java.util.List 
+    java.util.List 
         getMetadataPartsOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
      * 

      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
+    org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
         int index);
 
     /**
@@ -140,50 +140,50 @@ public final class DebugJvmModuleProtoBuf {
         getJvmPackageNameBytes(int index);
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
      */
     boolean hasStringTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable getStringTable();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable getStringTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringTableOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder getStringTableOrBuilder();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
      */
     boolean hasQualifiedNameTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable getQualifiedNameTable();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable getQualifiedNameTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNameTableOrBuilder();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNameTableOrBuilder();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    java.util.List 
+    java.util.List 
         getAnnotationList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation(int index);
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
@@ -191,30 +191,30 @@ public final class DebugJvmModuleProtoBuf {
      */
     int getAnnotationCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    java.util.List 
+    java.util.List 
         getAnnotationOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
         int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.Module}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.Module}
    */
   public static final class Module extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.Module)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.jvm.Module)
       ModuleOrBuilder {
     // Use Module.newBuilder() to construct.
     private Module(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -263,18 +263,18 @@ public final class DebugJvmModuleProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                packageParts_ = new java.util.ArrayList();
+                packageParts_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              packageParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
+              packageParts_.add(input.readMessage(org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
               break;
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                metadataParts_ = new java.util.ArrayList();
+                metadataParts_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              metadataParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
+              metadataParts_.add(input.readMessage(org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
               break;
             }
             case 26: {
@@ -287,11 +287,11 @@ public final class DebugJvmModuleProtoBuf {
               break;
             }
             case 34: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = stringTable_.toBuilder();
               }
-              stringTable_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.PARSER, extensionRegistry);
+              stringTable_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(stringTable_);
                 stringTable_ = subBuilder.buildPartial();
@@ -300,11 +300,11 @@ public final class DebugJvmModuleProtoBuf {
               break;
             }
             case 42: {
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = qualifiedNameTable_.toBuilder();
               }
-              qualifiedNameTable_ = input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.PARSER, extensionRegistry);
+              qualifiedNameTable_ = input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(qualifiedNameTable_);
                 qualifiedNameTable_ = subBuilder.buildPartial();
@@ -314,10 +314,10 @@ public final class DebugJvmModuleProtoBuf {
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                annotation_ = new java.util.ArrayList();
+                annotation_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              annotation_.add(input.readMessage(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.PARSER, extensionRegistry));
+              annotation_.add(input.readMessage(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.PARSER, extensionRegistry));
               break;
             }
           }
@@ -346,14 +346,14 @@ public final class DebugJvmModuleProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
+      return org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_Module_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_Module_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.Builder.class);
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module.class, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -373,30 +373,30 @@ public final class DebugJvmModuleProtoBuf {
 
     private int bitField0_;
     public static final int PACKAGE_PARTS_FIELD_NUMBER = 1;
-    private java.util.List packageParts_;
+    private java.util.List packageParts_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
      * 

      */
-    public java.util.List getPackagePartsList() {
+    public java.util.List getPackagePartsList() {
       return packageParts_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
      * 

      */
-    public java.util.List 
+    public java.util.List 
         getPackagePartsOrBuilderList() {
       return packageParts_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
@@ -406,52 +406,52 @@ public final class DebugJvmModuleProtoBuf {
       return packageParts_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
      * 

      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getPackageParts(int index) {
+    public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts getPackageParts(int index) {
       return packageParts_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
      * 

      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
+    public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
         int index) {
       return packageParts_.get(index);
     }
 
     public static final int METADATA_PARTS_FIELD_NUMBER = 2;
-    private java.util.List metadataParts_;
+    private java.util.List metadataParts_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
      * 

      */
-    public java.util.List getMetadataPartsList() {
+    public java.util.List getMetadataPartsList() {
       return metadataParts_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
      * 

      */
-    public java.util.List 
+    public java.util.List 
         getMetadataPartsOrBuilderList() {
       return metadataParts_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
@@ -461,23 +461,23 @@ public final class DebugJvmModuleProtoBuf {
       return metadataParts_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
      * 

      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getMetadataParts(int index) {
+    public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts getMetadataParts(int index) {
       return metadataParts_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
      * 

      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
+    public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
         int index) {
       return metadataParts_.get(index);
     }
@@ -532,72 +532,72 @@ public final class DebugJvmModuleProtoBuf {
     }
 
     public static final int STRING_TABLE_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable stringTable_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable stringTable_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
      */
     public boolean hasStringTable() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable getStringTable() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable getStringTable() {
       return stringTable_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringTableOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder getStringTableOrBuilder() {
       return stringTable_;
     }
 
     public static final int QUALIFIED_NAME_TABLE_FIELD_NUMBER = 5;
-    private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNameTable_;
+    private org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable qualifiedNameTable_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
      */
     public boolean hasQualifiedNameTable() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable getQualifiedNameTable() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable getQualifiedNameTable() {
       return qualifiedNameTable_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNameTableOrBuilder() {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNameTableOrBuilder() {
       return qualifiedNameTable_;
     }
 
     public static final int ANNOTATION_FIELD_NUMBER = 6;
-    private java.util.List annotation_;
+    private java.util.List annotation_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public java.util.List getAnnotationList() {
+    public java.util.List getAnnotationList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public java.util.List 
+    public java.util.List 
         getAnnotationOrBuilderList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
@@ -607,23 +607,23 @@ public final class DebugJvmModuleProtoBuf {
       return annotation_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation(int index) {
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation(int index) {
       return annotation_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+    public org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
         int index) {
       return annotation_.get(index);
     }
@@ -632,8 +632,8 @@ public final class DebugJvmModuleProtoBuf {
       packageParts_ = java.util.Collections.emptyList();
       metadataParts_ = java.util.Collections.emptyList();
       jvmPackageName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-      stringTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
-      qualifiedNameTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
+      stringTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance();
+      qualifiedNameTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
       annotation_ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
@@ -741,53 +741,53 @@ public final class DebugJvmModuleProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -796,7 +796,7 @@ public final class DebugJvmModuleProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -808,25 +808,25 @@ public final class DebugJvmModuleProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.Module}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.Module}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.Module)
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.ModuleOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.jvm.Module)
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.ModuleOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_Module_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_Module_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.Builder.class);
+                org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module.class, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -866,13 +866,13 @@ public final class DebugJvmModuleProtoBuf {
         jvmPackageName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
         if (stringTableBuilder_ == null) {
-          stringTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
+          stringTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance();
         } else {
           stringTableBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000008);
         if (qualifiedNameTableBuilder_ == null) {
-          qualifiedNameTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
+          qualifiedNameTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
         } else {
           qualifiedNameTableBuilder_.clear();
         }
@@ -892,23 +892,23 @@ public final class DebugJvmModuleProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_Module_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module build() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module result = buildPartial();
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module build() {
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module(this);
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module buildPartial() {
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module result = new org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (packagePartsBuilder_ == null) {
@@ -965,16 +965,16 @@ public final class DebugJvmModuleProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module other) {
+        if (other == org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module.getDefaultInstance()) return this;
         if (packagePartsBuilder_ == null) {
           if (!other.packageParts_.isEmpty()) {
             if (packageParts_.isEmpty()) {
@@ -1105,11 +1105,11 @@ public final class DebugJvmModuleProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module parsedMessage = null;
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.Module) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.Module) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -1120,26 +1120,26 @@ public final class DebugJvmModuleProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List packageParts_ =
+      private java.util.List packageParts_ =
         java.util.Collections.emptyList();
       private void ensurePackagePartsIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          packageParts_ = new java.util.ArrayList(packageParts_);
+          packageParts_ = new java.util.ArrayList(packageParts_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> packagePartsBuilder_;
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> packagePartsBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
-      public java.util.List getPackagePartsList() {
+      public java.util.List getPackagePartsList() {
         if (packagePartsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(packageParts_);
         } else {
@@ -1147,7 +1147,7 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
@@ -1161,13 +1161,13 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getPackageParts(int index) {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts getPackageParts(int index) {
         if (packagePartsBuilder_ == null) {
           return packageParts_.get(index);
         } else {
@@ -1175,14 +1175,14 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
       public Builder setPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
+          int index, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
         if (packagePartsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1196,14 +1196,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
       public Builder setPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         if (packagePartsBuilder_ == null) {
           ensurePackagePartsIsMutable();
           packageParts_.set(index, builderForValue.build());
@@ -1214,13 +1214,13 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
-      public Builder addPackageParts(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
+      public Builder addPackageParts(org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
         if (packagePartsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1234,14 +1234,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
       public Builder addPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
+          int index, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
         if (packagePartsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1255,14 +1255,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
       public Builder addPackageParts(
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         if (packagePartsBuilder_ == null) {
           ensurePackagePartsIsMutable();
           packageParts_.add(builderForValue.build());
@@ -1273,14 +1273,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
       public Builder addPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         if (packagePartsBuilder_ == null) {
           ensurePackagePartsIsMutable();
           packageParts_.add(index, builderForValue.build());
@@ -1291,14 +1291,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
       public Builder addAllPackageParts(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (packagePartsBuilder_ == null) {
           ensurePackagePartsIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -1310,7 +1310,7 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
@@ -1327,7 +1327,7 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
@@ -1344,24 +1344,24 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder getPackagePartsBuilder(
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder getPackagePartsBuilder(
           int index) {
         return getPackagePartsFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
           int index) {
         if (packagePartsBuilder_ == null) {
           return packageParts_.get(index);  } else {
@@ -1369,13 +1369,13 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
-      public java.util.List 
+      public java.util.List 
            getPackagePartsOrBuilderList() {
         if (packagePartsBuilder_ != null) {
           return packagePartsBuilder_.getMessageOrBuilderList();
@@ -1384,45 +1384,45 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder addPackagePartsBuilder() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder addPackagePartsBuilder() {
         return getPackagePartsFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder addPackagePartsBuilder(
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder addPackagePartsBuilder(
           int index) {
         return getPackagePartsFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
-      public java.util.List 
+      public java.util.List 
            getPackagePartsBuilderList() {
         return getPackagePartsFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> 
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> 
           getPackagePartsFieldBuilder() {
         if (packagePartsBuilder_ == null) {
           packagePartsBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder>(
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder>(
                   packageParts_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
@@ -1432,26 +1432,26 @@ public final class DebugJvmModuleProtoBuf {
         return packagePartsBuilder_;
       }
 
-      private java.util.List metadataParts_ =
+      private java.util.List metadataParts_ =
         java.util.Collections.emptyList();
       private void ensureMetadataPartsIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          metadataParts_ = new java.util.ArrayList(metadataParts_);
+          metadataParts_ = new java.util.ArrayList(metadataParts_);
           bitField0_ |= 0x00000002;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> metadataPartsBuilder_;
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> metadataPartsBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
-      public java.util.List getMetadataPartsList() {
+      public java.util.List getMetadataPartsList() {
         if (metadataPartsBuilder_ == null) {
           return java.util.Collections.unmodifiableList(metadataParts_);
         } else {
@@ -1459,7 +1459,7 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
@@ -1473,13 +1473,13 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getMetadataParts(int index) {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts getMetadataParts(int index) {
         if (metadataPartsBuilder_ == null) {
           return metadataParts_.get(index);
         } else {
@@ -1487,14 +1487,14 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
       public Builder setMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
+          int index, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
         if (metadataPartsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1508,14 +1508,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
       public Builder setMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         if (metadataPartsBuilder_ == null) {
           ensureMetadataPartsIsMutable();
           metadataParts_.set(index, builderForValue.build());
@@ -1526,13 +1526,13 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
-      public Builder addMetadataParts(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
+      public Builder addMetadataParts(org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
         if (metadataPartsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1546,14 +1546,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
       public Builder addMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
+          int index, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts value) {
         if (metadataPartsBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1567,14 +1567,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
       public Builder addMetadataParts(
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         if (metadataPartsBuilder_ == null) {
           ensureMetadataPartsIsMutable();
           metadataParts_.add(builderForValue.build());
@@ -1585,14 +1585,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
       public Builder addMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         if (metadataPartsBuilder_ == null) {
           ensureMetadataPartsIsMutable();
           metadataParts_.add(index, builderForValue.build());
@@ -1603,14 +1603,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
       public Builder addAllMetadataParts(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (metadataPartsBuilder_ == null) {
           ensureMetadataPartsIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -1622,7 +1622,7 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
@@ -1639,7 +1639,7 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
@@ -1656,24 +1656,24 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder getMetadataPartsBuilder(
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder getMetadataPartsBuilder(
           int index) {
         return getMetadataPartsFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
           int index) {
         if (metadataPartsBuilder_ == null) {
           return metadataParts_.get(index);  } else {
@@ -1681,13 +1681,13 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
-      public java.util.List 
+      public java.util.List 
            getMetadataPartsOrBuilderList() {
         if (metadataPartsBuilder_ != null) {
           return metadataPartsBuilder_.getMessageOrBuilderList();
@@ -1696,45 +1696,45 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder addMetadataPartsBuilder() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder addMetadataPartsBuilder() {
         return getMetadataPartsFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder addMetadataPartsBuilder(
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder addMetadataPartsBuilder(
           int index) {
         return getMetadataPartsFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
-      public java.util.List 
+      public java.util.List 
            getMetadataPartsBuilderList() {
         return getMetadataPartsFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> 
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder> 
           getMetadataPartsFieldBuilder() {
         if (metadataPartsBuilder_ == null) {
           metadataPartsBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder>(
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder>(
                   metadataParts_,
                   ((bitField0_ & 0x00000002) == 0x00000002),
                   getParentForChildren(),
@@ -1882,19 +1882,19 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable stringTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable stringTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder> stringTableBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder> stringTableBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
       public boolean hasStringTable() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable getStringTable() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable getStringTable() {
         if (stringTableBuilder_ == null) {
           return stringTable_;
         } else {
@@ -1902,9 +1902,9 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
-      public Builder setStringTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable value) {
+      public Builder setStringTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable value) {
         if (stringTableBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1918,10 +1918,10 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
       public Builder setStringTable(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder builderForValue) {
         if (stringTableBuilder_ == null) {
           stringTable_ = builderForValue.build();
           onChanged();
@@ -1932,14 +1932,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
-      public Builder mergeStringTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable value) {
+      public Builder mergeStringTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable value) {
         if (stringTableBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              stringTable_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance()) {
+              stringTable_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance()) {
             stringTable_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.newBuilder(stringTable_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.newBuilder(stringTable_).mergeFrom(value).buildPartial();
           } else {
             stringTable_ = value;
           }
@@ -1951,11 +1951,11 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
       public Builder clearStringTable() {
         if (stringTableBuilder_ == null) {
-          stringTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.getDefaultInstance();
+          stringTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.getDefaultInstance();
           onChanged();
         } else {
           stringTableBuilder_.clear();
@@ -1964,17 +1964,17 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder getStringTableBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder getStringTableBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getStringTableFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder getStringTableOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder getStringTableOrBuilder() {
         if (stringTableBuilder_ != null) {
           return stringTableBuilder_.getMessageOrBuilder();
         } else {
@@ -1982,14 +1982,14 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder> 
           getStringTableFieldBuilder() {
         if (stringTableBuilder_ == null) {
           stringTableBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.StringTableOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.StringTableOrBuilder>(
                   getStringTable(),
                   getParentForChildren(),
                   isClean());
@@ -1998,19 +1998,19 @@ public final class DebugJvmModuleProtoBuf {
         return stringTableBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable qualifiedNameTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable qualifiedNameTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder> qualifiedNameTableBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder> qualifiedNameTableBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
       public boolean hasQualifiedNameTable() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable getQualifiedNameTable() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable getQualifiedNameTable() {
         if (qualifiedNameTableBuilder_ == null) {
           return qualifiedNameTable_;
         } else {
@@ -2018,9 +2018,9 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
-      public Builder setQualifiedNameTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable value) {
+      public Builder setQualifiedNameTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable value) {
         if (qualifiedNameTableBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2034,10 +2034,10 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
       public Builder setQualifiedNameTable(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder builderForValue) {
         if (qualifiedNameTableBuilder_ == null) {
           qualifiedNameTable_ = builderForValue.build();
           onChanged();
@@ -2048,14 +2048,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
-      public Builder mergeQualifiedNameTable(org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable value) {
+      public Builder mergeQualifiedNameTable(org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable value) {
         if (qualifiedNameTableBuilder_ == null) {
           if (((bitField0_ & 0x00000010) == 0x00000010) &&
-              qualifiedNameTable_ != org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance()) {
+              qualifiedNameTable_ != org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance()) {
             qualifiedNameTable_ =
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.newBuilder(qualifiedNameTable_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.newBuilder(qualifiedNameTable_).mergeFrom(value).buildPartial();
           } else {
             qualifiedNameTable_ = value;
           }
@@ -2067,11 +2067,11 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
       public Builder clearQualifiedNameTable() {
         if (qualifiedNameTableBuilder_ == null) {
-          qualifiedNameTable_ = org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
+          qualifiedNameTable_ = org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.getDefaultInstance();
           onChanged();
         } else {
           qualifiedNameTableBuilder_.clear();
@@ -2080,17 +2080,17 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder getQualifiedNameTableBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder getQualifiedNameTableBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
         return getQualifiedNameTableFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNameTableOrBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder getQualifiedNameTableOrBuilder() {
         if (qualifiedNameTableBuilder_ != null) {
           return qualifiedNameTableBuilder_.getMessageOrBuilder();
         } else {
@@ -2098,14 +2098,14 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder> 
           getQualifiedNameTableFieldBuilder() {
         if (qualifiedNameTableBuilder_ == null) {
           qualifiedNameTableBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTable.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.QualifiedNameTableOrBuilder>(
                   getQualifiedNameTable(),
                   getParentForChildren(),
                   isClean());
@@ -2114,26 +2114,26 @@ public final class DebugJvmModuleProtoBuf {
         return qualifiedNameTableBuilder_;
       }
 
-      private java.util.List annotation_ =
+      private java.util.List annotation_ =
         java.util.Collections.emptyList();
       private void ensureAnnotationIsMutable() {
         if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          annotation_ = new java.util.ArrayList(annotation_);
+          annotation_ = new java.util.ArrayList(annotation_);
           bitField0_ |= 0x00000020;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder> annotationBuilder_;
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder> annotationBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public java.util.List getAnnotationList() {
+      public java.util.List getAnnotationList() {
         if (annotationBuilder_ == null) {
           return java.util.Collections.unmodifiableList(annotation_);
         } else {
@@ -2141,7 +2141,7 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
@@ -2155,13 +2155,13 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation getAnnotation(int index) {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation getAnnotation(int index) {
         if (annotationBuilder_ == null) {
           return annotation_.get(index);
         } else {
@@ -2169,14 +2169,14 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation value) {
         if (annotationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2190,14 +2190,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder builderForValue) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           annotation_.set(index, builderForValue.build());
@@ -2208,13 +2208,13 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public Builder addAnnotation(org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
+      public Builder addAnnotation(org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation value) {
         if (annotationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2228,14 +2228,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation value) {
         if (annotationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2249,14 +2249,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAnnotation(
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder builderForValue) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           annotation_.add(builderForValue.build());
@@ -2267,14 +2267,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder builderForValue) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           annotation_.add(index, builderForValue.build());
@@ -2285,14 +2285,14 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAllAnnotation(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (annotationBuilder_ == null) {
           ensureAnnotationIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -2304,7 +2304,7 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
@@ -2321,7 +2321,7 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
@@ -2338,24 +2338,24 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder getAnnotationBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder getAnnotationBuilder(
           int index) {
         return getAnnotationFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
           int index) {
         if (annotationBuilder_ == null) {
           return annotation_.get(index);  } else {
@@ -2363,13 +2363,13 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public java.util.List 
+      public java.util.List 
            getAnnotationOrBuilderList() {
         if (annotationBuilder_ != null) {
           return annotationBuilder_.getMessageOrBuilderList();
@@ -2378,45 +2378,45 @@ public final class DebugJvmModuleProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder addAnnotationBuilder() {
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder addAnnotationBuilder() {
         return getAnnotationFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder addAnnotationBuilder(
+      public org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder addAnnotationBuilder(
           int index) {
         return getAnnotationFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public java.util.List 
+      public java.util.List 
            getAnnotationBuilderList() {
         return getAnnotationFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder> 
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder> 
           getAnnotationFieldBuilder() {
         if (annotationBuilder_ == null) {
           annotationBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation, org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.serialization.DebugProtoBuf.AnnotationOrBuilder>(
+              org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation, org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.Builder, org.jetbrains.kotlin.metadata.DebugProtoBuf.AnnotationOrBuilder>(
                   annotation_,
                   ((bitField0_ & 0x00000020) == 0x00000020),
                   getParentForChildren(),
@@ -2426,7 +2426,7 @@ public final class DebugJvmModuleProtoBuf {
         return annotationBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.Module)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.jvm.Module)
     }
 
     static {
@@ -2434,11 +2434,11 @@ public final class DebugJvmModuleProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.Module)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.jvm.Module)
   }
 
   public interface PackagePartsOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.jvm.PackageParts)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
@@ -2641,11 +2641,11 @@ public final class DebugJvmModuleProtoBuf {
     int getClassWithJvmPackageNamePackageId(int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.PackageParts}
    */
   public static final class PackageParts extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.jvm.PackageParts)
       PackagePartsOrBuilder {
     // Use PackageParts.newBuilder() to construct.
     private PackageParts(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -2796,14 +2796,14 @@ public final class DebugJvmModuleProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
+      return org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_PackageParts_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_PackageParts_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder.class);
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.class, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -3230,53 +3230,53 @@ public final class DebugJvmModuleProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3285,7 +3285,7 @@ public final class DebugJvmModuleProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -3297,25 +3297,25 @@ public final class DebugJvmModuleProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.PackageParts}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.jvm.PackageParts)
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackagePartsOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_PackageParts_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_PackageParts_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder.class);
+                org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.class, org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -3356,23 +3356,23 @@ public final class DebugJvmModuleProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_PackageParts_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts build() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts result = buildPartial();
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts build() {
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts(this);
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts buildPartial() {
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts result = new org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -3410,16 +3410,16 @@ public final class DebugJvmModuleProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts other) {
+        if (other == org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts.getDefaultInstance()) return this;
         if (other.hasPackageFqName()) {
           bitField0_ |= 0x00000001;
           packageFqName_ = other.packageFqName_;
@@ -3491,11 +3491,11 @@ public final class DebugJvmModuleProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts parsedMessage = null;
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmModuleProtoBuf.PackageParts) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.jvm.DebugJvmModuleProtoBuf.PackageParts) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -4226,7 +4226,7 @@ public final class DebugJvmModuleProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.jvm.PackageParts)
     }
 
     static {
@@ -4234,19 +4234,19 @@ public final class DebugJvmModuleProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.jvm.PackageParts)
   }
 
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_jvm_Module_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_jvm_Module_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_jvm_PackageParts_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_jvm_PackageParts_fieldAccessorTable;
 
   public static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -4257,26 +4257,25 @@ public final class DebugJvmModuleProtoBuf {
   static {
     java.lang.String[] descriptorData = {
       "\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"
+      ".proto\022!org.jetbrains.kotlin.metadata.jv" +
+      "m\032&core/metadata/src/metadata.debug.prot" +
+      "o\"\205\003\n\006Module\022F\n\rpackage_parts\030\001 \003(\0132/.or" +
+      "g.jetbrains.kotlin.metadata.jvm.PackageP" +
+      "arts\022G\n\016metadata_parts\030\002 \003(\0132/.org.jetbr" +
+      "ains.kotlin.metadata.jvm.PackageParts\022\030\n" +
+      "\020jvm_package_name\030\003 \003(\t\022@\n\014string_table\030" +
+      "\004 \001(\0132*.org.jetbrains.kotlin.metadata.St" +
+      "ringTable\022O\n\024qualified_name_table\030\005 \001(\0132",
+      "1.org.jetbrains.kotlin.metadata.Qualifie" +
+      "dNameTable\022=\n\nannotation\030\006 \003(\0132).org.jet" +
+      "brains.kotlin.metadata.Annotation\"\366\001\n\014Pa" +
+      "ckageParts\022\027\n\017package_fq_name\030\001 \002(\t\022\030\n\020s" +
+      "hort_class_name\030\002 \003(\t\022*\n\036multifile_facad" +
+      "e_short_name_id\030\003 \003(\005B\002\020\001\022#\n\033multifile_f" +
+      "acade_short_name\030\004 \003(\t\022.\n&class_with_jvm" +
+      "_package_name_short_name\030\005 \003(\t\0222\n&class_" +
+      "with_jvm_package_name_package_id\030\006 \003(\005B\002" +
+      "\020\001B\030B\026DebugJvmModuleProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -4289,21 +4288,21 @@ public final class DebugJvmModuleProtoBuf {
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor(),
         }, assigner);
-    internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_jvm_Module_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_jvm_Module_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_jvm_Module_descriptor,
         new java.lang.String[] { "PackageParts", "MetadataParts", "JvmPackageName", "StringTable", "QualifiedNameTable", "Annotation", });
-    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_jvm_PackageParts_descriptor =
       getDescriptor().getMessageTypes().get(1);
-    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_jvm_PackageParts_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_jvm_PackageParts_descriptor,
         new java.lang.String[] { "PackageFqName", "ShortClassName", "MultifileFacadeShortNameId", "MultifileFacadeShortName", "ClassWithJvmPackageNameShortName", "ClassWithJvmPackageNamePackageId", });
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java b/build-common/test/org/jetbrains/kotlin/metadata/jvm/DebugJvmProtoBuf.java
similarity index 68%
rename from build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
rename to build-common/test/org/jetbrains/kotlin/metadata/jvm/DebugJvmProtoBuf.java
index ffc38b3a9fb..8fbe195331e 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugJvmProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/metadata/jvm/DebugJvmProtoBuf.java
@@ -1,51 +1,51 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: core/metadata.jvm/src/jvm_metadata.debug.proto
 
-package org.jetbrains.kotlin.serialization.jvm;
+package org.jetbrains.kotlin.metadata.jvm;
 
 public final class DebugJvmProtoBuf {
   private DebugJvmProtoBuf() {}
   public static void registerAllExtensions(
       org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.constructorSignature);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.methodSignature);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.lambdaClassOriginName);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.propertySignature);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.typeAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.isRaw);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.typeParameterAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.classModuleName);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.classLocalVariable);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.anonymousObjectOriginName);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.packageModuleName);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.packageLocalVariable);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.constructorSignature);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.methodSignature);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.lambdaClassOriginName);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.propertySignature);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.typeAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.isRaw);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.typeParameterAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.classModuleName);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.classLocalVariable);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.anonymousObjectOriginName);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.packageModuleName);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.packageLocalVariable);
   }
   public interface StringTableTypesOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.jvm.StringTableTypes)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
-    java.util.List 
+    java.util.List 
         getRecordList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record getRecord(int index);
+    org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record getRecord(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
     int getRecordCount();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
-    java.util.List 
+    java.util.List 
         getRecordOrBuilderList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder getRecordOrBuilder(
+    org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder getRecordOrBuilder(
         int index);
 
     /**
@@ -74,11 +74,11 @@ public final class DebugJvmProtoBuf {
     int getLocalName(int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.StringTableTypes}
    */
   public static final class StringTableTypes extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.jvm.StringTableTypes)
       StringTableTypesOrBuilder {
     // Use StringTableTypes.newBuilder() to construct.
     private StringTableTypes(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -127,10 +127,10 @@ public final class DebugJvmProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                record_ = new java.util.ArrayList();
+                record_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              record_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.PARSER, extensionRegistry));
+              record_.add(input.readMessage(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.PARSER, extensionRegistry));
               break;
             }
             case 40: {
@@ -174,14 +174,14 @@ public final class DebugJvmProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor;
+      return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Builder.class);
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.class, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -200,7 +200,7 @@ public final class DebugJvmProtoBuf {
     }
 
     public interface RecordOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record)
         org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
       /**
@@ -264,7 +264,7 @@ public final class DebugJvmProtoBuf {
           getStringBytes();
 
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+       * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
        *
        * 
        * Perform a described operation on the string
@@ -272,13 +272,13 @@ public final class DebugJvmProtoBuf {
        */
       boolean hasOperation();
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+       * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
        *
        * 
        * Perform a described operation on the string
        * 

        */
-      org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation getOperation();
+      org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation getOperation();
 
       /**
        * repeated int32 substring_index = 4 [packed = true];
@@ -340,11 +340,11 @@ public final class DebugJvmProtoBuf {
       int getReplaceChar(int index);
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record}
      */
     public static final class Record extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record)
         RecordOrBuilder {
       // Use Record.newBuilder() to construct.
       private Record(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -403,7 +403,7 @@ public final class DebugJvmProtoBuf {
               }
               case 24: {
                 int rawValue = input.readEnum();
-                org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation value = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation.valueOf(rawValue);
+                org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation value = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation.valueOf(rawValue);
                 if (value == null) {
                   unknownFields.mergeVarintField(3, rawValue);
                 } else {
@@ -480,14 +480,14 @@ public final class DebugJvmProtoBuf {
       }
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor;
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_Record_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_Record_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder.class);
+                org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.class, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder.class);
       }
 
       public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -506,7 +506,7 @@ public final class DebugJvmProtoBuf {
       }
 
       /**
-       * Protobuf enum {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation}
+       * Protobuf enum {@code org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation}
        */
       public enum Operation
           implements org.jetbrains.kotlin.protobuf.ProtocolMessageEnum {
@@ -591,7 +591,7 @@ public final class DebugJvmProtoBuf {
         }
         public static final org.jetbrains.kotlin.protobuf.Descriptors.EnumDescriptor
             getDescriptor() {
-          return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.getDescriptor().getEnumTypes().get(0);
+          return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.getDescriptor().getEnumTypes().get(0);
         }
 
         private static final Operation[] VALUES = values();
@@ -613,7 +613,7 @@ public final class DebugJvmProtoBuf {
           this.value = value;
         }
 
-        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation)
+        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation)
       }
 
       private int bitField0_;
@@ -718,9 +718,9 @@ public final class DebugJvmProtoBuf {
       }
 
       public static final int OPERATION_FIELD_NUMBER = 3;
-      private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation operation_;
+      private org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation operation_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+       * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
        *
        * 
        * Perform a described operation on the string
@@ -730,13 +730,13 @@ public final class DebugJvmProtoBuf {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+       * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
        *
        * 
        * Perform a described operation on the string
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation getOperation() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation getOperation() {
         return operation_;
       }
 
@@ -823,7 +823,7 @@ public final class DebugJvmProtoBuf {
         range_ = 1;
         predefinedIndex_ = 0;
         string_ = "";
-        operation_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation.NONE;
+        operation_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation.NONE;
         substringIndex_ = java.util.Collections.emptyList();
         replaceChar_ = java.util.Collections.emptyList();
       }
@@ -931,53 +931,53 @@ public final class DebugJvmProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(
+      public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(
           org.jetbrains.kotlin.protobuf.ByteString data)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(
+      public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(
           org.jetbrains.kotlin.protobuf.ByteString data,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(byte[] data)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(
+      public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(
           byte[] data,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(
+      public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(
           java.io.InputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseFrom(input, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseDelimitedFrom(
+      public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseDelimitedFrom(
           java.io.InputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(
+      public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(
+      public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record parseFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -986,7 +986,7 @@ public final class DebugJvmProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
@@ -998,25 +998,25 @@ public final class DebugJvmProtoBuf {
         return builder;
       }
       /**
-       * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record}
+       * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record}
        */
       public static final class Builder extends
           org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder {
+          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record)
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder {
         public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
             getDescriptor() {
-          return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor;
+          return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_Record_descriptor;
         }
 
         protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
             internalGetFieldAccessorTable() {
-          return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_fieldAccessorTable
+          return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_Record_fieldAccessorTable
               .ensureFieldAccessorsInitialized(
-                  org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder.class);
+                  org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.class, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder.class);
         }
 
-        // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.newBuilder()
+        // Construct using org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -1042,7 +1042,7 @@ public final class DebugJvmProtoBuf {
           bitField0_ = (bitField0_ & ~0x00000002);
           string_ = "";
           bitField0_ = (bitField0_ & ~0x00000004);
-          operation_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation.NONE;
+          operation_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation.NONE;
           bitField0_ = (bitField0_ & ~0x00000008);
           substringIndex_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000010);
@@ -1057,23 +1057,23 @@ public final class DebugJvmProtoBuf {
 
         public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
-          return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor;
+          return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_Record_descriptor;
         }
 
-        public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record getDefaultInstanceForType() {
-          return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.getDefaultInstance();
+        public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.getDefaultInstance();
         }
 
-        public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record build() {
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record result = buildPartial();
+        public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record build() {
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record buildPartial() {
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record(this);
+        public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record buildPartial() {
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record result = new org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1108,16 +1108,16 @@ public final class DebugJvmProtoBuf {
         }
 
         public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-          if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record) {
-            return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record)other);
+          if (other instanceof org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record) {
+            return mergeFrom((org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record)other);
           } else {
             super.mergeFrom(other);
             return this;
           }
         }
 
-        public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record other) {
-          if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record other) {
+          if (other == org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.getDefaultInstance()) return this;
           if (other.hasRange()) {
             setRange(other.getRange());
           }
@@ -1164,11 +1164,11 @@ public final class DebugJvmProtoBuf {
             org.jetbrains.kotlin.protobuf.CodedInputStream input,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record parsedMessage = null;
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -1375,9 +1375,9 @@ public final class DebugJvmProtoBuf {
           return this;
         }
 
-        private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation operation_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation.NONE;
+        private org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation operation_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation.NONE;
         /**
-         * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+         * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
          *
          * 
          * Perform a described operation on the string
@@ -1387,23 +1387,23 @@ public final class DebugJvmProtoBuf {
           return ((bitField0_ & 0x00000008) == 0x00000008);
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+         * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
          *
          * 
          * Perform a described operation on the string
          * 

          */
-        public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation getOperation() {
+        public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation getOperation() {
           return operation_;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+         * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
          *
          * 
          * Perform a described operation on the string
          * 

          */
-        public Builder setOperation(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation value) {
+        public Builder setOperation(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -1413,7 +1413,7 @@ public final class DebugJvmProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+         * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
          *
          * 
          * Perform a described operation on the string
@@ -1421,7 +1421,7 @@ public final class DebugJvmProtoBuf {
          */
         public Builder clearOperation() {
           bitField0_ = (bitField0_ & ~0x00000008);
-          operation_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation.NONE;
+          operation_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Operation.NONE;
           onChanged();
           return this;
         }
@@ -1635,7 +1635,7 @@ public final class DebugJvmProtoBuf {
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record)
       }
 
       static {
@@ -1643,40 +1643,40 @@ public final class DebugJvmProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record)
     }
 
     public static final int RECORD_FIELD_NUMBER = 1;
-    private java.util.List record_;
+    private java.util.List record_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
-    public java.util.List getRecordList() {
+    public java.util.List getRecordList() {
       return record_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getRecordOrBuilderList() {
       return record_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
     public int getRecordCount() {
       return record_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record getRecord(int index) {
+    public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record getRecord(int index) {
       return record_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder getRecordOrBuilder(
+    public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder getRecordOrBuilder(
         int index) {
       return record_.get(index);
     }
@@ -1782,53 +1782,53 @@ public final class DebugJvmProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1837,7 +1837,7 @@ public final class DebugJvmProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -1849,25 +1849,25 @@ public final class DebugJvmProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.StringTableTypes}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypesOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.jvm.StringTableTypes)
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypesOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor;
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Builder.class);
+                org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.class, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1905,23 +1905,23 @@ public final class DebugJvmProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor;
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes build() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes result = buildPartial();
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes build() {
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes(this);
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes buildPartial() {
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes result = new org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes(this);
         int from_bitField0_ = bitField0_;
         if (recordBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1942,16 +1942,16 @@ public final class DebugJvmProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes other) {
+        if (other == org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.getDefaultInstance()) return this;
         if (recordBuilder_ == null) {
           if (!other.record_.isEmpty()) {
             if (record_.isEmpty()) {
@@ -2000,11 +2000,11 @@ public final class DebugJvmProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes parsedMessage = null;
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2015,22 +2015,22 @@ public final class DebugJvmProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List record_ =
+      private java.util.List record_ =
         java.util.Collections.emptyList();
       private void ensureRecordIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          record_ = new java.util.ArrayList(record_);
+          record_ = new java.util.ArrayList(record_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder> recordBuilder_;
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder> recordBuilder_;
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
-      public java.util.List getRecordList() {
+      public java.util.List getRecordList() {
         if (recordBuilder_ == null) {
           return java.util.Collections.unmodifiableList(record_);
         } else {
@@ -2038,7 +2038,7 @@ public final class DebugJvmProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public int getRecordCount() {
         if (recordBuilder_ == null) {
@@ -2048,9 +2048,9 @@ public final class DebugJvmProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record getRecord(int index) {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record getRecord(int index) {
         if (recordBuilder_ == null) {
           return record_.get(index);
         } else {
@@ -2058,10 +2058,10 @@ public final class DebugJvmProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder setRecord(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record value) {
+          int index, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record value) {
         if (recordBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2075,10 +2075,10 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder setRecord(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder builderForValue) {
         if (recordBuilder_ == null) {
           ensureRecordIsMutable();
           record_.set(index, builderForValue.build());
@@ -2089,9 +2089,9 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
-      public Builder addRecord(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record value) {
+      public Builder addRecord(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record value) {
         if (recordBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2105,10 +2105,10 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder addRecord(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record value) {
+          int index, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record value) {
         if (recordBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2122,10 +2122,10 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder addRecord(
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder builderForValue) {
         if (recordBuilder_ == null) {
           ensureRecordIsMutable();
           record_.add(builderForValue.build());
@@ -2136,10 +2136,10 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder addRecord(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder builderForValue) {
         if (recordBuilder_ == null) {
           ensureRecordIsMutable();
           record_.add(index, builderForValue.build());
@@ -2150,10 +2150,10 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder addAllRecord(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (recordBuilder_ == null) {
           ensureRecordIsMutable();
           org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
@@ -2165,7 +2165,7 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder clearRecord() {
         if (recordBuilder_ == null) {
@@ -2178,7 +2178,7 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder removeRecord(int index) {
         if (recordBuilder_ == null) {
@@ -2191,16 +2191,16 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder getRecordBuilder(
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder getRecordBuilder(
           int index) {
         return getRecordFieldBuilder().getBuilder(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder getRecordOrBuilder(
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder getRecordOrBuilder(
           int index) {
         if (recordBuilder_ == null) {
           return record_.get(index);  } else {
@@ -2208,9 +2208,9 @@ public final class DebugJvmProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getRecordOrBuilderList() {
         if (recordBuilder_ != null) {
           return recordBuilder_.getMessageOrBuilderList();
@@ -2219,33 +2219,33 @@ public final class DebugJvmProtoBuf {
         }
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder addRecordBuilder() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder addRecordBuilder() {
         return getRecordFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.getDefaultInstance());
+            org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder addRecordBuilder(
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder addRecordBuilder(
           int index) {
         return getRecordFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.getDefaultInstance());
+            index, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.getDefaultInstance());
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
-      public java.util.List 
+      public java.util.List 
            getRecordBuilderList() {
         return getRecordFieldBuilder().getBuilderList();
       }
       private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder> 
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder> 
           getRecordFieldBuilder() {
         if (recordBuilder_ == null) {
           recordBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder>(
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.Record.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.StringTableTypes.RecordOrBuilder>(
                   record_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
@@ -2349,7 +2349,7 @@ public final class DebugJvmProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.jvm.StringTableTypes)
     }
 
     static {
@@ -2357,11 +2357,11 @@ public final class DebugJvmProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.jvm.StringTableTypes)
   }
 
   public interface JvmMethodSignatureOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
@@ -2391,11 +2391,11 @@ public final class DebugJvmProtoBuf {
     int getDesc();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature}
    */
   public static final class JvmMethodSignature extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature)
       JvmMethodSignatureOrBuilder {
     // Use JvmMethodSignature.newBuilder() to construct.
     private JvmMethodSignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -2466,14 +2466,14 @@ public final class DebugJvmProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor;
+      return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmMethodSignature_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmMethodSignature_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder.class);
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.class, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -2582,53 +2582,53 @@ public final class DebugJvmProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2637,7 +2637,7 @@ public final class DebugJvmProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -2649,25 +2649,25 @@ public final class DebugJvmProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature)
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor;
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmMethodSignature_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmMethodSignature_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder.class);
+                org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.class, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2700,23 +2700,23 @@ public final class DebugJvmProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor;
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmMethodSignature_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature build() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature result = buildPartial();
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature build() {
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature(this);
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature buildPartial() {
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature result = new org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2733,16 +2733,16 @@ public final class DebugJvmProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature other) {
+        if (other == org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance()) return this;
         if (other.hasName()) {
           setName(other.getName());
         }
@@ -2761,11 +2761,11 @@ public final class DebugJvmProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature parsedMessage = null;
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2856,7 +2856,7 @@ public final class DebugJvmProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature)
     }
 
     static {
@@ -2864,11 +2864,11 @@ public final class DebugJvmProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature)
   }
 
   public interface JvmFieldSignatureOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
@@ -2898,11 +2898,11 @@ public final class DebugJvmProtoBuf {
     int getDesc();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature}
    */
   public static final class JvmFieldSignature extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature)
       JvmFieldSignatureOrBuilder {
     // Use JvmFieldSignature.newBuilder() to construct.
     private JvmFieldSignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -2973,14 +2973,14 @@ public final class DebugJvmProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor;
+      return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmFieldSignature_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmFieldSignature_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder.class);
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.class, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -3089,53 +3089,53 @@ public final class DebugJvmProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3144,7 +3144,7 @@ public final class DebugJvmProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -3156,25 +3156,25 @@ public final class DebugJvmProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature)
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor;
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmFieldSignature_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmFieldSignature_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder.class);
+                org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.class, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -3207,23 +3207,23 @@ public final class DebugJvmProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor;
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmFieldSignature_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature build() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature result = buildPartial();
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature build() {
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature(this);
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature buildPartial() {
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature result = new org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -3240,16 +3240,16 @@ public final class DebugJvmProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature other) {
+        if (other == org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance()) return this;
         if (other.hasName()) {
           setName(other.getName());
         }
@@ -3268,11 +3268,11 @@ public final class DebugJvmProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature parsedMessage = null;
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -3363,7 +3363,7 @@ public final class DebugJvmProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature)
     }
 
     static {
@@ -3371,28 +3371,28 @@ public final class DebugJvmProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature)
   }
 
   public interface JvmPropertySignatureOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.jvm.JvmPropertySignature)
       org.jetbrains.kotlin.protobuf.MessageOrBuilder {
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
      */
     boolean hasField();
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature getField();
+    org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature getField();
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder getFieldOrBuilder();
+    org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder getFieldOrBuilder();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
      *
      * 
      * Annotations on properties are written on a synthetic method with this signature
@@ -3400,54 +3400,54 @@ public final class DebugJvmProtoBuf {
      */
     boolean hasSyntheticMethod();
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
      *
      * 
      * Annotations on properties are written on a synthetic method with this signature
      * 

      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getSyntheticMethod();
+    org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature getSyntheticMethod();
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
      *
      * 
      * Annotations on properties are written on a synthetic method with this signature
      * 

      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSyntheticMethodOrBuilder();
+    org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSyntheticMethodOrBuilder();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
      */
     boolean hasGetter();
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getGetter();
+    org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature getGetter();
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getGetterOrBuilder();
+    org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getGetterOrBuilder();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
      */
     boolean hasSetter();
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getSetter();
+    org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature getSetter();
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
      */
-    org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSetterOrBuilder();
+    org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSetterOrBuilder();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.JvmPropertySignature}
    */
   public static final class JvmPropertySignature extends
       org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.jvm.JvmPropertySignature)
       JvmPropertySignatureOrBuilder {
     // Use JvmPropertySignature.newBuilder() to construct.
     private JvmPropertySignature(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
@@ -3495,11 +3495,11 @@ public final class DebugJvmProtoBuf {
               break;
             }
             case 10: {
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = field_.toBuilder();
               }
-              field_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.PARSER, extensionRegistry);
+              field_ = input.readMessage(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(field_);
                 field_ = subBuilder.buildPartial();
@@ -3508,11 +3508,11 @@ public final class DebugJvmProtoBuf {
               break;
             }
             case 18: {
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = syntheticMethod_.toBuilder();
               }
-              syntheticMethod_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
+              syntheticMethod_ = input.readMessage(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(syntheticMethod_);
                 syntheticMethod_ = subBuilder.buildPartial();
@@ -3521,11 +3521,11 @@ public final class DebugJvmProtoBuf {
               break;
             }
             case 26: {
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = getter_.toBuilder();
               }
-              getter_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
+              getter_ = input.readMessage(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(getter_);
                 getter_ = subBuilder.buildPartial();
@@ -3534,11 +3534,11 @@ public final class DebugJvmProtoBuf {
               break;
             }
             case 34: {
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = setter_.toBuilder();
               }
-              setter_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
+              setter_ = input.readMessage(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(setter_);
                 setter_ = subBuilder.buildPartial();
@@ -3560,14 +3560,14 @@ public final class DebugJvmProtoBuf {
     }
     public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor;
+      return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmPropertySignature_descriptor;
     }
 
     protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_fieldAccessorTable
+      return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmPropertySignature_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.Builder.class);
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature.class, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature.Builder.class);
     }
 
     public static org.jetbrains.kotlin.protobuf.Parser PARSER =
@@ -3587,30 +3587,30 @@ public final class DebugJvmProtoBuf {
 
     private int bitField0_;
     public static final int FIELD_FIELD_NUMBER = 1;
-    private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature field_;
+    private org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature field_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
      */
     public boolean hasField() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature getField() {
+    public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature getField() {
       return field_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder getFieldOrBuilder() {
+    public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder getFieldOrBuilder() {
       return field_;
     }
 
     public static final int SYNTHETIC_METHOD_FIELD_NUMBER = 2;
-    private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature syntheticMethod_;
+    private org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature syntheticMethod_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
      *
      * 
      * Annotations on properties are written on a synthetic method with this signature
@@ -3620,73 +3620,73 @@ public final class DebugJvmProtoBuf {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
      *
      * 
      * Annotations on properties are written on a synthetic method with this signature
      * 

      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getSyntheticMethod() {
+    public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature getSyntheticMethod() {
       return syntheticMethod_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
      *
      * 
      * Annotations on properties are written on a synthetic method with this signature
      * 

      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSyntheticMethodOrBuilder() {
+    public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSyntheticMethodOrBuilder() {
       return syntheticMethod_;
     }
 
     public static final int GETTER_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getter_;
+    private org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature getter_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
      */
     public boolean hasGetter() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getGetter() {
+    public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature getGetter() {
       return getter_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getGetterOrBuilder() {
+    public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getGetterOrBuilder() {
       return getter_;
     }
 
     public static final int SETTER_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature setter_;
+    private org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature setter_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
      */
     public boolean hasSetter() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getSetter() {
+    public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature getSetter() {
       return setter_;
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
      */
-    public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSetterOrBuilder() {
+    public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSetterOrBuilder() {
       return setter_;
     }
 
     private void initFields() {
-      field_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
-      syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
-      getter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
-      setter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      field_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
+      syntheticMethod_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      getter_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      setter_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -3750,53 +3750,53 @@ public final class DebugJvmProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3805,7 +3805,7 @@ public final class DebugJvmProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -3817,25 +3817,25 @@ public final class DebugJvmProtoBuf {
       return builder;
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.JvmPropertySignature}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignatureOrBuilder {
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.jvm.JvmPropertySignature)
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignatureOrBuilder {
       public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor;
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmPropertySignature_descriptor;
       }
 
       protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_fieldAccessorTable
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmPropertySignature_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.class, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.Builder.class);
+                org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature.class, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature.Builder.class);
       }
 
-      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.newBuilder()
+      // Construct using org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -3860,25 +3860,25 @@ public final class DebugJvmProtoBuf {
       public Builder clear() {
         super.clear();
         if (fieldBuilder_ == null) {
-          field_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
+          field_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
         } else {
           fieldBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000001);
         if (syntheticMethodBuilder_ == null) {
-          syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+          syntheticMethod_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
         } else {
           syntheticMethodBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000002);
         if (getterBuilder_ == null) {
-          getter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+          getter_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
         } else {
           getterBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000004);
         if (setterBuilder_ == null) {
-          setter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+          setter_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
         } else {
           setterBuilder_.clear();
         }
@@ -3892,23 +3892,23 @@ public final class DebugJvmProtoBuf {
 
       public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor;
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.internal_static_org_jetbrains_kotlin_metadata_jvm_JvmPropertySignature_descriptor;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature build() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature result = buildPartial();
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature build() {
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature result = new org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature(this);
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature buildPartial() {
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature result = new org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -3949,16 +3949,16 @@ public final class DebugJvmProtoBuf {
       }
 
       public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature)other);
+        if (other instanceof org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature) {
+          return mergeFrom((org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature other) {
+        if (other == org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature.getDefaultInstance()) return this;
         if (other.hasField()) {
           mergeField(other.getField());
         }
@@ -3983,11 +3983,11 @@ public final class DebugJvmProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature parsedMessage = null;
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -3998,19 +3998,19 @@ public final class DebugJvmProtoBuf {
       }
       private int bitField0_;
 
-      private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature field_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature field_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder> fieldBuilder_;
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder> fieldBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
       public boolean hasField() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature getField() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature getField() {
         if (fieldBuilder_ == null) {
           return field_;
         } else {
@@ -4018,9 +4018,9 @@ public final class DebugJvmProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
-      public Builder setField(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature value) {
+      public Builder setField(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature value) {
         if (fieldBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4034,10 +4034,10 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
       public Builder setField(
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder builderForValue) {
         if (fieldBuilder_ == null) {
           field_ = builderForValue.build();
           onChanged();
@@ -4048,14 +4048,14 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
-      public Builder mergeField(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature value) {
+      public Builder mergeField(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature value) {
         if (fieldBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001) &&
-              field_ != org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance()) {
+              field_ != org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance()) {
             field_ =
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.newBuilder(field_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.newBuilder(field_).mergeFrom(value).buildPartial();
           } else {
             field_ = value;
           }
@@ -4067,11 +4067,11 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
       public Builder clearField() {
         if (fieldBuilder_ == null) {
-          field_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
+          field_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.getDefaultInstance();
           onChanged();
         } else {
           fieldBuilder_.clear();
@@ -4080,17 +4080,17 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder getFieldBuilder() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder getFieldBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
         return getFieldFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder getFieldOrBuilder() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder getFieldOrBuilder() {
         if (fieldBuilder_ != null) {
           return fieldBuilder_.getMessageOrBuilder();
         } else {
@@ -4098,14 +4098,14 @@ public final class DebugJvmProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder> 
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder> 
           getFieldFieldBuilder() {
         if (fieldBuilder_ == null) {
           fieldBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder>(
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignature.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmFieldSignatureOrBuilder>(
                   getField(),
                   getParentForChildren(),
                   isClean());
@@ -4114,11 +4114,11 @@ public final class DebugJvmProtoBuf {
         return fieldBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature syntheticMethod_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> syntheticMethodBuilder_;
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> syntheticMethodBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
@@ -4128,13 +4128,13 @@ public final class DebugJvmProtoBuf {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getSyntheticMethod() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature getSyntheticMethod() {
         if (syntheticMethodBuilder_ == null) {
           return syntheticMethod_;
         } else {
@@ -4142,13 +4142,13 @@ public final class DebugJvmProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
        * 

        */
-      public Builder setSyntheticMethod(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
+      public Builder setSyntheticMethod(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
         if (syntheticMethodBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4162,14 +4162,14 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
        * 

        */
       public Builder setSyntheticMethod(
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
         if (syntheticMethodBuilder_ == null) {
           syntheticMethod_ = builderForValue.build();
           onChanged();
@@ -4180,18 +4180,18 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
        * 

        */
-      public Builder mergeSyntheticMethod(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
+      public Builder mergeSyntheticMethod(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
         if (syntheticMethodBuilder_ == null) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              syntheticMethod_ != org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
+              syntheticMethod_ != org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
             syntheticMethod_ =
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.newBuilder(syntheticMethod_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.newBuilder(syntheticMethod_).mergeFrom(value).buildPartial();
           } else {
             syntheticMethod_ = value;
           }
@@ -4203,7 +4203,7 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
@@ -4211,7 +4211,7 @@ public final class DebugJvmProtoBuf {
        */
       public Builder clearSyntheticMethod() {
         if (syntheticMethodBuilder_ == null) {
-          syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+          syntheticMethod_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
           onChanged();
         } else {
           syntheticMethodBuilder_.clear();
@@ -4220,25 +4220,25 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder getSyntheticMethodBuilder() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder getSyntheticMethodBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
         return getSyntheticMethodFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSyntheticMethodOrBuilder() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSyntheticMethodOrBuilder() {
         if (syntheticMethodBuilder_ != null) {
           return syntheticMethodBuilder_.getMessageOrBuilder();
         } else {
@@ -4246,18 +4246,18 @@ public final class DebugJvmProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
        * 

        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> 
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> 
           getSyntheticMethodFieldBuilder() {
         if (syntheticMethodBuilder_ == null) {
           syntheticMethodBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
                   getSyntheticMethod(),
                   getParentForChildren(),
                   isClean());
@@ -4266,19 +4266,19 @@ public final class DebugJvmProtoBuf {
         return syntheticMethodBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature getter_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> getterBuilder_;
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> getterBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
       public boolean hasGetter() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getGetter() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature getGetter() {
         if (getterBuilder_ == null) {
           return getter_;
         } else {
@@ -4286,9 +4286,9 @@ public final class DebugJvmProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
-      public Builder setGetter(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
+      public Builder setGetter(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
         if (getterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4302,10 +4302,10 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
       public Builder setGetter(
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
         if (getterBuilder_ == null) {
           getter_ = builderForValue.build();
           onChanged();
@@ -4316,14 +4316,14 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
-      public Builder mergeGetter(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
+      public Builder mergeGetter(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
         if (getterBuilder_ == null) {
           if (((bitField0_ & 0x00000004) == 0x00000004) &&
-              getter_ != org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
+              getter_ != org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
             getter_ =
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.newBuilder(getter_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.newBuilder(getter_).mergeFrom(value).buildPartial();
           } else {
             getter_ = value;
           }
@@ -4335,11 +4335,11 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
       public Builder clearGetter() {
         if (getterBuilder_ == null) {
-          getter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+          getter_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
           onChanged();
         } else {
           getterBuilder_.clear();
@@ -4348,17 +4348,17 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder getGetterBuilder() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder getGetterBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
         return getGetterFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getGetterOrBuilder() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getGetterOrBuilder() {
         if (getterBuilder_ != null) {
           return getterBuilder_.getMessageOrBuilder();
         } else {
@@ -4366,14 +4366,14 @@ public final class DebugJvmProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> 
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> 
           getGetterFieldBuilder() {
         if (getterBuilder_ == null) {
           getterBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
                   getGetter(),
                   getParentForChildren(),
                   isClean());
@@ -4382,19 +4382,19 @@ public final class DebugJvmProtoBuf {
         return getterBuilder_;
       }
 
-      private org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature setter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature setter_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> setterBuilder_;
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> setterBuilder_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
       public boolean hasSetter() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature getSetter() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature getSetter() {
         if (setterBuilder_ == null) {
           return setter_;
         } else {
@@ -4402,9 +4402,9 @@ public final class DebugJvmProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
-      public Builder setSetter(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
+      public Builder setSetter(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
         if (setterBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -4418,10 +4418,10 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
       public Builder setSetter(
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
         if (setterBuilder_ == null) {
           setter_ = builderForValue.build();
           onChanged();
@@ -4432,14 +4432,14 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
-      public Builder mergeSetter(org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
+      public Builder mergeSetter(org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature value) {
         if (setterBuilder_ == null) {
           if (((bitField0_ & 0x00000008) == 0x00000008) &&
-              setter_ != org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
+              setter_ != org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
             setter_ =
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.newBuilder(setter_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.newBuilder(setter_).mergeFrom(value).buildPartial();
           } else {
             setter_ = value;
           }
@@ -4451,11 +4451,11 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
       public Builder clearSetter() {
         if (setterBuilder_ == null) {
-          setter_ = org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+          setter_ = org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance();
           onChanged();
         } else {
           setterBuilder_.clear();
@@ -4464,17 +4464,17 @@ public final class DebugJvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder getSetterBuilder() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder getSetterBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
         return getSetterFieldBuilder().getBuilder();
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
-      public org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSetterOrBuilder() {
+      public org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder getSetterOrBuilder() {
         if (setterBuilder_ != null) {
           return setterBuilder_.getMessageOrBuilder();
         } else {
@@ -4482,14 +4482,14 @@ public final class DebugJvmProtoBuf {
         }
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
       private org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> 
+          org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder> 
           getSetterFieldBuilder() {
         if (setterBuilder_ == null) {
           setterBuilder_ = new org.jetbrains.kotlin.protobuf.SingleFieldBuilder<
-              org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
+              org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.Builder, org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignatureOrBuilder>(
                   getSetter(),
                   getParentForChildren(),
                   isClean());
@@ -4498,7 +4498,7 @@ public final class DebugJvmProtoBuf {
         return setterBuilder_;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.jvm.JvmPropertySignature)
     }
 
     static {
@@ -4506,34 +4506,34 @@ public final class DebugJvmProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.jvm.JvmPropertySignature)
   }
 
   public static final int CONSTRUCTOR_SIGNATURE_FIELD_NUMBER = 100;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Constructor { ... }
+   * extend .org.jetbrains.kotlin.metadata.Constructor { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor,
-      org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature> constructorSignature = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Constructor,
+      org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature> constructorSignature = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.class,
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.class,
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance());
   public static final int METHOD_SIGNATURE_FIELD_NUMBER = 100;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Function { ... }
+   * extend .org.jetbrains.kotlin.metadata.Function { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Function,
-      org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature> methodSignature = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Function,
+      org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature> methodSignature = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.class,
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.class,
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmMethodSignature.getDefaultInstance());
   public static final int LAMBDA_CLASS_ORIGIN_NAME_FIELD_NUMBER = 101;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Function { ... }
+   * extend .org.jetbrains.kotlin.metadata.Function { ... }
    *
    * 
    * For lambdas from bodies of inline functions copied to the use site, the JVM internal name of the original
@@ -4542,58 +4542,58 @@ public final class DebugJvmProtoBuf {
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Function,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Function,
       java.lang.Integer> lambdaClassOriginName = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
   public static final int PROPERTY_SIGNATURE_FIELD_NUMBER = 100;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Property { ... }
+   * extend .org.jetbrains.kotlin.metadata.Property { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Property,
-      org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature> propertySignature = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Property,
+      org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature> propertySignature = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.class,
-        org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf.JvmPropertySignature.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature.class,
+        org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf.JvmPropertySignature.getDefaultInstance());
   public static final int TYPE_ANNOTATION_FIELD_NUMBER = 100;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Type { ... }
+   * extend .org.jetbrains.kotlin.metadata.Type { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Type,
-      java.util.List> typeAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Type,
+      java.util.List> typeAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
   public static final int IS_RAW_FIELD_NUMBER = 101;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Type { ... }
+   * extend .org.jetbrains.kotlin.metadata.Type { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Type,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Type,
       java.lang.Boolean> isRaw = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Boolean.class,
         null);
   public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 100;
   /**
-   * extend .org.jetbrains.kotlin.serialization.TypeParameter { ... }
+   * extend .org.jetbrains.kotlin.metadata.TypeParameter { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter,
-      java.util.List> typeParameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.TypeParameter,
+      java.util.List> typeParameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Annotation.getDefaultInstance());
   public static final int CLASS_MODULE_NAME_FIELD_NUMBER = 101;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Class { ... }
+   * extend .org.jetbrains.kotlin.metadata.Class { ... }
    *
    * 
    * If absent, assumed to be JvmAbi.DEFAULT_MODULE_NAME
@@ -4601,25 +4601,25 @@ public final class DebugJvmProtoBuf {
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Class,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Class,
       java.lang.Integer> classModuleName = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
   public static final int CLASS_LOCAL_VARIABLE_FIELD_NUMBER = 102;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Class { ... }
+   * extend .org.jetbrains.kotlin.metadata.Class { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Class,
-      java.util.List> classLocalVariable = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Class,
+      java.util.List> classLocalVariable = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.getDefaultInstance());
   public static final int ANONYMOUS_OBJECT_ORIGIN_NAME_FIELD_NUMBER = 103;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Class { ... }
+   * extend .org.jetbrains.kotlin.metadata.Class { ... }
    *
    * 
    * For anonymous objects from bodies of inline functions copied to the use site, the JVM internal name of the original
@@ -4628,58 +4628,58 @@ public final class DebugJvmProtoBuf {
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Class,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Class,
       java.lang.Integer> anonymousObjectOriginName = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
   public static final int PACKAGE_MODULE_NAME_FIELD_NUMBER = 101;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Package { ... }
+   * extend .org.jetbrains.kotlin.metadata.Package { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Package,
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Package,
       java.lang.Integer> packageModuleName = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
         java.lang.Integer.class,
         null);
   public static final int PACKAGE_LOCAL_VARIABLE_FIELD_NUMBER = 102;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Package { ... }
+   * extend .org.jetbrains.kotlin.metadata.Package { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Package,
-      java.util.List> packageLocalVariable = org.jetbrains.kotlin.protobuf.GeneratedMessage
+      org.jetbrains.kotlin.metadata.DebugProtoBuf.Package,
+      java.util.List> packageLocalVariable = org.jetbrains.kotlin.protobuf.GeneratedMessage
           .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Property.getDefaultInstance());
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.class,
+        org.jetbrains.kotlin.metadata.DebugProtoBuf.Property.getDefaultInstance());
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_Record_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_Record_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_jvm_JvmMethodSignature_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_jvm_JvmMethodSignature_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_jvm_JvmFieldSignature_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_jvm_JvmFieldSignature_fieldAccessorTable;
   private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor;
+    internal_static_org_jetbrains_kotlin_metadata_jvm_JvmPropertySignature_descriptor;
   private static
     org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_fieldAccessorTable;
+      internal_static_org_jetbrains_kotlin_metadata_jvm_JvmPropertySignature_fieldAccessorTable;
 
   public static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -4690,65 +4690,61 @@ public final class DebugJvmProtoBuf {
   static {
     java.lang.String[] descriptorData = {
       "\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"
+      "ug.proto\022!org.jetbrains.kotlin.metadata." +
+      "jvm\032)core/metadata/src/ext_options.debug" +
+      ".proto\032&core/metadata/src/metadata.debug" +
+      ".proto\"\232\003\n\020StringTableTypes\022J\n\006record\030\001 " +
+      "\003(\0132:.org.jetbrains.kotlin.metadata.jvm." +
+      "StringTableTypes.Record\022\026\n\nlocal_name\030\005 " +
+      "\003(\005B\002\020\001\032\241\002\n\006Record\022\020\n\005range\030\001 \001(\005:\0011\022\030\n\020" +
+      "predefined_index\030\002 \001(\005\022\016\n\006string\030\006 \001(\t\022]" +
+      "\n\toperation\030\003 \001(\0162D.org.jetbrains.kotlin",
+      ".metadata.jvm.StringTableTypes.Record.Op" +
+      "eration:\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\tOperatio" +
+      "n\022\010\n\004NONE\020\000\022\030\n\024INTERNAL_TO_CLASS_ID\020\001\022\024\n" +
+      "\020DESC_TO_CLASS_ID\020\002\"<\n\022JvmMethodSignatur" +
+      "e\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\"\272\002\n\024JvmPropertySi" +
+      "gnature\022C\n\005field\030\001 \001(\01324.org.jetbrains.k" +
+      "otlin.metadata.jvm.JvmFieldSignature\022O\n\020",
+      "synthetic_method\030\002 \001(\01325.org.jetbrains.k" +
+      "otlin.metadata.jvm.JvmMethodSignature\022E\n" +
+      "\006getter\030\003 \001(\01325.org.jetbrains.kotlin.met" +
+      "adata.jvm.JvmMethodSignature\022E\n\006setter\030\004" +
+      " \001(\01325.org.jetbrains.kotlin.metadata.jvm" +
+      ".JvmMethodSignature:\200\001\n\025constructor_sign" +
+      "ature\022*.org.jetbrains.kotlin.metadata.Co" +
+      "nstructor\030d \001(\01325.org.jetbrains.kotlin.m" +
+      "etadata.jvm.JvmMethodSignature:x\n\020method" +
+      "_signature\022\'.org.jetbrains.kotlin.metada",
+      "ta.Function\030d \001(\01325.org.jetbrains.kotlin" +
+      ".metadata.jvm.JvmMethodSignature:O\n\030lamb" +
+      "da_class_origin_name\022\'.org.jetbrains.kot" +
+      "lin.metadata.Function\030e \001(\005B\004\230\265\030\001:|\n\022pro" +
+      "perty_signature\022\'.org.jetbrains.kotlin.m" +
+      "etadata.Property\030d \001(\01327.org.jetbrains.k" +
+      "otlin.metadata.jvm.JvmPropertySignature:" +
+      "g\n\017type_annotation\022#.org.jetbrains.kotli" +
+      "n.metadata.Type\030d \003(\0132).org.jetbrains.ko" +
+      "tlin.metadata.Annotation:3\n\006is_raw\022#.org",
+      ".jetbrains.kotlin.metadata.Type\030e \001(\010:z\n" +
+      "\031type_parameter_annotation\022,.org.jetbrai" +
+      "ns.kotlin.metadata.TypeParameter\030d \003(\0132)" +
+      ".org.jetbrains.kotlin.metadata.Annotatio" +
+      "n:E\n\021class_module_name\022$.org.jetbrains.k" +
+      "otlin.metadata.Class\030e \001(\005B\004\230\265\030\001:k\n\024clas" +
+      "s_local_variable\022$.org.jetbrains.kotlin." +
+      "metadata.Class\030f \003(\0132\'.org.jetbrains.kot" +
+      "lin.metadata.Property:P\n\034anonymous_objec" +
+      "t_origin_name\022$.org.jetbrains.kotlin.met",
+      "adata.Class\030g \001(\005B\004\230\265\030\001:I\n\023package_modul" +
+      "e_name\022&.org.jetbrains.kotlin.metadata.P" +
+      "ackage\030e \001(\005B\004\230\265\030\001:o\n\026package_local_vari" +
+      "able\022&.org.jetbrains.kotlin.metadata.Pac" +
+      "kage\030f \003(\0132\'.org.jetbrains.kotlin.metada" +
+      "ta.PropertyB\022B\020DebugJvmProtoBuf"
     };
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -4761,38 +4757,38 @@ public final class DebugJvmProtoBuf {
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
-          org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.getDescriptor(),
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
+          org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.getDescriptor(),
+          org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor(),
         }, assigner);
-    internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_descriptor =
       getDescriptor().getMessageTypes().get(0);
-    internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_descriptor,
         new java.lang.String[] { "Record", "LocalName", });
-    internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor =
-      internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_descriptor.getNestedTypes().get(0);
-    internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_Record_descriptor =
+      internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_descriptor.getNestedTypes().get(0);
+    internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_Record_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_jvm_StringTableTypes_Record_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_jvm_StringTableTypes_Record_descriptor,
         new java.lang.String[] { "Range", "PredefinedIndex", "String", "Operation", "SubstringIndex", "ReplaceChar", });
-    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_jvm_JvmMethodSignature_descriptor =
       getDescriptor().getMessageTypes().get(1);
-    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_jvm_JvmMethodSignature_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_jvm_JvmMethodSignature_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_jvm_JvmMethodSignature_descriptor,
         new java.lang.String[] { "Name", "Desc", });
-    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_jvm_JvmFieldSignature_descriptor =
       getDescriptor().getMessageTypes().get(2);
-    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_jvm_JvmFieldSignature_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_jvm_JvmFieldSignature_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_jvm_JvmFieldSignature_descriptor,
         new java.lang.String[] { "Name", "Desc", });
-    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor =
+    internal_static_org_jetbrains_kotlin_metadata_jvm_JvmPropertySignature_descriptor =
       getDescriptor().getMessageTypes().get(3);
-    internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_fieldAccessorTable = new
+    internal_static_org_jetbrains_kotlin_metadata_jvm_JvmPropertySignature_fieldAccessorTable = new
       org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_jvm_JvmPropertySignature_descriptor,
+        internal_static_org_jetbrains_kotlin_metadata_jvm_JvmPropertySignature_descriptor,
         new java.lang.String[] { "Field", "SyntheticMethod", "Getter", "Setter", });
     constructorSignature.internalInit(descriptor.getExtensions().get(0));
     methodSignature.internalInit(descriptor.getExtensions().get(1));
@@ -4808,18 +4804,18 @@ public final class DebugJvmProtoBuf {
     packageLocalVariable.internalInit(descriptor.getExtensions().get(11));
     org.jetbrains.kotlin.protobuf.ExtensionRegistry registry =
         org.jetbrains.kotlin.protobuf.ExtensionRegistry.newInstance();
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
-    registry.add(org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.stringIdInTable);
+    registry.add(org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.stringIdInTable);
     org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
         .internalUpdateFileDescriptor(descriptor, registry);
-    org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf.getDescriptor();
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor();
+    org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf.getDescriptor();
+    org.jetbrains.kotlin.metadata.DebugProtoBuf.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
deleted file mode 100644
index a9524480b20..00000000000
--- a/build-common/test/org/jetbrains/kotlin/serialization/builtins/DebugBuiltInsProtoBuf.java
+++ /dev/null
@@ -1,203 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/metadata/src/builtins.debug.proto
-
-package org.jetbrains.kotlin.serialization.builtins;
-
-public final class DebugBuiltInsProtoBuf {
-  private DebugBuiltInsProtoBuf() {}
-  public static void registerAllExtensions(
-      org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
-    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.packageFqName);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.classAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.constructorAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.functionAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.propertyAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.compileTimeValue);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.enumEntryAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.parameterAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.typeAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf.typeParameterAnnotation);
-  }
-  public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 151;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.Package { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Package,
-      java.lang.Integer> packageFqName = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        java.lang.Integer.class,
-        null);
-  public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.Class { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Class,
-      java.util.List> classAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.Constructor { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Constructor,
-      java.util.List> constructorAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int FUNCTION_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.Function { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Function,
-      java.util.List> functionAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int PROPERTY_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.Property { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Property,
-      java.util.List> propertyAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int COMPILE_TIME_VALUE_FIELD_NUMBER = 151;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.Property { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Property,
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value> compileTimeValue = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.Argument.Value.getDefaultInstance());
-  public static final int ENUM_ENTRY_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.EnumEntry { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.EnumEntry,
-      java.util.List> enumEntryAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.ValueParameter,
-      java.util.List> parameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int TYPE_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.Type { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.Type,
-      java.util.List> typeAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-  public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.TypeParameter { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.DebugProtoBuf.TypeParameter,
-      java.util.List> typeParameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessage
-          .newFileScopedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.class,
-        org.jetbrains.kotlin.serialization.DebugProtoBuf.Annotation.getDefaultInstance());
-
-  public static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\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: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() {
-          public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
-              org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
-          org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor(),
-        }, assigner);
-    packageFqName.internalInit(descriptor.getExtensions().get(0));
-    classAnnotation.internalInit(descriptor.getExtensions().get(1));
-    constructorAnnotation.internalInit(descriptor.getExtensions().get(2));
-    functionAnnotation.internalInit(descriptor.getExtensions().get(3));
-    propertyAnnotation.internalInit(descriptor.getExtensions().get(4));
-    compileTimeValue.internalInit(descriptor.getExtensions().get(5));
-    enumEntryAnnotation.internalInit(descriptor.getExtensions().get(6));
-    parameterAnnotation.internalInit(descriptor.getExtensions().get(7));
-    typeAnnotation.internalInit(descriptor.getExtensions().get(8));
-    typeParameterAnnotation.internalInit(descriptor.getExtensions().get(9));
-    org.jetbrains.kotlin.serialization.DebugProtoBuf.getDescriptor();
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
\ No newline at end of file
diff --git a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugModuleProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugModuleProtoBuf.java
deleted file mode 100644
index 9368650ce2f..00000000000
--- a/build-common/test/org/jetbrains/kotlin/serialization/jvm/DebugModuleProtoBuf.java
+++ /dev/null
@@ -1,3424 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/descriptors.jvm/src/jvm_module.debug.proto
-
-package org.jetbrains.kotlin.serialization.jvm;
-
-public final class DebugModuleProtoBuf {
-  private DebugModuleProtoBuf() {}
-  public static void registerAllExtensions(
-      org.jetbrains.kotlin.protobuf.ExtensionRegistry registry) {
-  }
-  public interface ModuleOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.Module)
-      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
-
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-     *
-     * 
-     * Names of .class files for each package
-     * 

-     */
-    java.util.List 
-        getPackagePartsList();
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-     *
-     * 
-     * Names of .class files for each package
-     * 

-     */
-    org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts getPackageParts(int index);
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-     *
-     * 
-     * Names of .class files for each package
-     * 

-     */
-    int getPackagePartsCount();
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-     *
-     * 
-     * Names of .class files for each package
-     * 

-     */
-    java.util.List 
-        getPackagePartsOrBuilderList();
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-     *
-     * 
-     * Names of .class files for each package
-     * 

-     */
-    org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
-        int index);
-
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-     *
-     * 
-     * Names of .kotlin_metadata files for each package
-     * 

-     */
-    java.util.List 
-        getMetadataPartsList();
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-     *
-     * 
-     * Names of .kotlin_metadata files for each package
-     * 

-     */
-    org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts getMetadataParts(int index);
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-     *
-     * 
-     * Names of .kotlin_metadata files for each package
-     * 

-     */
-    int getMetadataPartsCount();
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-     *
-     * 
-     * Names of .kotlin_metadata files for each package
-     * 

-     */
-    java.util.List 
-        getMetadataPartsOrBuilderList();
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-     *
-     * 
-     * Names of .kotlin_metadata files for each package
-     * 

-     */
-    org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
-        int index);
-
-    /**
-     * repeated string jvm_package_name = 3;
-     *
-     * 
-     * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-     * The names here are dot-separated, e.g. "org.foo.bar"
-     * 

-     */
-    org.jetbrains.kotlin.protobuf.ProtocolStringList
-        getJvmPackageNameList();
-    /**
-     * repeated string jvm_package_name = 3;
-     *
-     * 
-     * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-     * The names here are dot-separated, e.g. "org.foo.bar"
-     * 

-     */
-    int getJvmPackageNameCount();
-    /**
-     * repeated string jvm_package_name = 3;
-     *
-     * 
-     * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-     * The names here are dot-separated, e.g. "org.foo.bar"
-     * 

-     */
-    java.lang.String getJvmPackageName(int index);
-    /**
-     * repeated string jvm_package_name = 3;
-     *
-     * 
-     * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-     * The names here are dot-separated, e.g. "org.foo.bar"
-     * 

-     */
-    org.jetbrains.kotlin.protobuf.ByteString
-        getJvmPackageNameBytes(int index);
-  }
-  /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.Module}
-   */
-  public static final class Module extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.Module)
-      ModuleOrBuilder {
-    // Use Module.newBuilder() to construct.
-    private Module(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
-      super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private Module(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final Module defaultInstance;
-    public static Module getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public Module getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-
-    private final org.jetbrains.kotlin.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final org.jetbrains.kotlin.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private Module(
-        org.jetbrains.kotlin.protobuf.CodedInputStream input,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      org.jetbrains.kotlin.protobuf.UnknownFieldSet.Builder unknownFields =
-          org.jetbrains.kotlin.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                packageParts_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              packageParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                metadataParts_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              metadataParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
-              break;
-            }
-            case 26: {
-              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-                jvmPackageName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              jvmPackageName_.add(bs);
-              break;
-            }
-          }
-        }
-      } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-          packageParts_ = java.util.Collections.unmodifiableList(packageParts_);
-        }
-        if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-          metadataParts_ = java.util.Collections.unmodifiableList(metadataParts_);
-        }
-        if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-          jvmPackageName_ = jvmPackageName_.getUnmodifiableView();
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
-    }
-
-    protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module.class, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module.Builder.class);
-    }
-
-    public static org.jetbrains.kotlin.protobuf.Parser PARSER =
-        new org.jetbrains.kotlin.protobuf.AbstractParser() {
-      public Module parsePartialFrom(
-          org.jetbrains.kotlin.protobuf.CodedInputStream input,
-          org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-        return new Module(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public org.jetbrains.kotlin.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    public static final int PACKAGE_PARTS_FIELD_NUMBER = 1;
-    private java.util.List packageParts_;
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-     *
-     * 
-     * Names of .class files for each package
-     * 

-     */
-    public java.util.List getPackagePartsList() {
-      return packageParts_;
-    }
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-     *
-     * 
-     * Names of .class files for each package
-     * 

-     */
-    public java.util.List 
-        getPackagePartsOrBuilderList() {
-      return packageParts_;
-    }
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-     *
-     * 
-     * Names of .class files for each package
-     * 

-     */
-    public int getPackagePartsCount() {
-      return packageParts_.size();
-    }
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-     *
-     * 
-     * Names of .class files for each package
-     * 

-     */
-    public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts getPackageParts(int index) {
-      return packageParts_.get(index);
-    }
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-     *
-     * 
-     * Names of .class files for each package
-     * 

-     */
-    public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
-        int index) {
-      return packageParts_.get(index);
-    }
-
-    public static final int METADATA_PARTS_FIELD_NUMBER = 2;
-    private java.util.List metadataParts_;
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-     *
-     * 
-     * Names of .kotlin_metadata files for each package
-     * 

-     */
-    public java.util.List getMetadataPartsList() {
-      return metadataParts_;
-    }
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-     *
-     * 
-     * Names of .kotlin_metadata files for each package
-     * 

-     */
-    public java.util.List 
-        getMetadataPartsOrBuilderList() {
-      return metadataParts_;
-    }
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-     *
-     * 
-     * Names of .kotlin_metadata files for each package
-     * 

-     */
-    public int getMetadataPartsCount() {
-      return metadataParts_.size();
-    }
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-     *
-     * 
-     * Names of .kotlin_metadata files for each package
-     * 

-     */
-    public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts getMetadataParts(int index) {
-      return metadataParts_.get(index);
-    }
-    /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-     *
-     * 
-     * Names of .kotlin_metadata files for each package
-     * 

-     */
-    public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
-        int index) {
-      return metadataParts_.get(index);
-    }
-
-    public static final int JVM_PACKAGE_NAME_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.protobuf.LazyStringList jvmPackageName_;
-    /**
-     * repeated string jvm_package_name = 3;
-     *
-     * 
-     * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-     * The names here are dot-separated, e.g. "org.foo.bar"
-     * 

-     */
-    public org.jetbrains.kotlin.protobuf.ProtocolStringList
-        getJvmPackageNameList() {
-      return jvmPackageName_;
-    }
-    /**
-     * repeated string jvm_package_name = 3;
-     *
-     * 
-     * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-     * The names here are dot-separated, e.g. "org.foo.bar"
-     * 

-     */
-    public int getJvmPackageNameCount() {
-      return jvmPackageName_.size();
-    }
-    /**
-     * repeated string jvm_package_name = 3;
-     *
-     * 
-     * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-     * The names here are dot-separated, e.g. "org.foo.bar"
-     * 

-     */
-    public java.lang.String getJvmPackageName(int index) {
-      return jvmPackageName_.get(index);
-    }
-    /**
-     * repeated string jvm_package_name = 3;
-     *
-     * 
-     * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-     * The names here are dot-separated, e.g. "org.foo.bar"
-     * 

-     */
-    public org.jetbrains.kotlin.protobuf.ByteString
-        getJvmPackageNameBytes(int index) {
-      return jvmPackageName_.getByteString(index);
-    }
-
-    private void initFields() {
-      packageParts_ = java.util.Collections.emptyList();
-      metadataParts_ = java.util.Collections.emptyList();
-      jvmPackageName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      for (int i = 0; i < getPackagePartsCount(); i++) {
-        if (!getPackageParts(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      for (int i = 0; i < getMetadataPartsCount(); i++) {
-        if (!getMetadataParts(i).isInitialized()) {
-          memoizedIsInitialized = 0;
-          return false;
-        }
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      for (int i = 0; i < packageParts_.size(); i++) {
-        output.writeMessage(1, packageParts_.get(i));
-      }
-      for (int i = 0; i < metadataParts_.size(); i++) {
-        output.writeMessage(2, metadataParts_.get(i));
-      }
-      for (int i = 0; i < jvmPackageName_.size(); i++) {
-        output.writeBytes(3, jvmPackageName_.getByteString(i));
-      }
-      getUnknownFields().writeTo(output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      for (int i = 0; i < packageParts_.size(); i++) {
-        size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-          .computeMessageSize(1, packageParts_.get(i));
-      }
-      for (int i = 0; i < metadataParts_.size(); i++) {
-        size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-          .computeMessageSize(2, metadataParts_.get(i));
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < jvmPackageName_.size(); i++) {
-          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
-            .computeBytesSizeNoTag(jvmPackageName_.getByteString(i));
-        }
-        size += dataSize;
-        size += 1 * getJvmPackageNameList().size();
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module parseFrom(
-        org.jetbrains.kotlin.protobuf.ByteString data)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module parseFrom(
-        org.jetbrains.kotlin.protobuf.ByteString data,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module parseFrom(byte[] data)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module parseFrom(
-        byte[] data,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module parseFrom(
-        java.io.InputStream input,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module parseDelimitedFrom(
-        java.io.InputStream input,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module parseFrom(
-        org.jetbrains.kotlin.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module parseFrom(
-        org.jetbrains.kotlin.protobuf.CodedInputStream input,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        org.jetbrains.kotlin.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.Module}
-     */
-    public static final class Builder extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.Module)
-        org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.ModuleOrBuilder {
-      public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
-      }
-
-      protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module.class, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module.Builder.class);
-      }
-
-      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          org.jetbrains.kotlin.protobuf.GeneratedMessage.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-          getPackagePartsFieldBuilder();
-          getMetadataPartsFieldBuilder();
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-
-      public Builder clear() {
-        super.clear();
-        if (packagePartsBuilder_ == null) {
-          packageParts_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          packagePartsBuilder_.clear();
-        }
-        if (metadataPartsBuilder_ == null) {
-          metadataParts_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        } else {
-          metadataPartsBuilder_.clear();
-        }
-        jvmPackageName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        return this;
-      }
-
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
-      public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
-      }
-
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module.getDefaultInstance();
-      }
-
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module build() {
-        org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module result = new org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module(this);
-        int from_bitField0_ = bitField0_;
-        if (packagePartsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) == 0x00000001)) {
-            packageParts_ = java.util.Collections.unmodifiableList(packageParts_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.packageParts_ = packageParts_;
-        } else {
-          result.packageParts_ = packagePartsBuilder_.build();
-        }
-        if (metadataPartsBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) == 0x00000002)) {
-            metadataParts_ = java.util.Collections.unmodifiableList(metadataParts_);
-            bitField0_ = (bitField0_ & ~0x00000002);
-          }
-          result.metadataParts_ = metadataParts_;
-        } else {
-          result.metadataParts_ = metadataPartsBuilder_.build();
-        }
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          jvmPackageName_ = jvmPackageName_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.jvmPackageName_ = jvmPackageName_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module.getDefaultInstance()) return this;
-        if (packagePartsBuilder_ == null) {
-          if (!other.packageParts_.isEmpty()) {
-            if (packageParts_.isEmpty()) {
-              packageParts_ = other.packageParts_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensurePackagePartsIsMutable();
-              packageParts_.addAll(other.packageParts_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.packageParts_.isEmpty()) {
-            if (packagePartsBuilder_.isEmpty()) {
-              packagePartsBuilder_.dispose();
-              packagePartsBuilder_ = null;
-              packageParts_ = other.packageParts_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              packagePartsBuilder_ = 
-                org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getPackagePartsFieldBuilder() : null;
-            } else {
-              packagePartsBuilder_.addAllMessages(other.packageParts_);
-            }
-          }
-        }
-        if (metadataPartsBuilder_ == null) {
-          if (!other.metadataParts_.isEmpty()) {
-            if (metadataParts_.isEmpty()) {
-              metadataParts_ = other.metadataParts_;
-              bitField0_ = (bitField0_ & ~0x00000002);
-            } else {
-              ensureMetadataPartsIsMutable();
-              metadataParts_.addAll(other.metadataParts_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.metadataParts_.isEmpty()) {
-            if (metadataPartsBuilder_.isEmpty()) {
-              metadataPartsBuilder_.dispose();
-              metadataPartsBuilder_ = null;
-              metadataParts_ = other.metadataParts_;
-              bitField0_ = (bitField0_ & ~0x00000002);
-              metadataPartsBuilder_ = 
-                org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getMetadataPartsFieldBuilder() : null;
-            } else {
-              metadataPartsBuilder_.addAllMessages(other.metadataParts_);
-            }
-          }
-        }
-        if (!other.jvmPackageName_.isEmpty()) {
-          if (jvmPackageName_.isEmpty()) {
-            jvmPackageName_ = other.jvmPackageName_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-          } else {
-            ensureJvmPackageNameIsMutable();
-            jvmPackageName_.addAll(other.jvmPackageName_);
-          }
-          onChanged();
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        for (int i = 0; i < getPackagePartsCount(); i++) {
-          if (!getPackageParts(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        for (int i = 0; i < getMetadataPartsCount(); i++) {
-          if (!getMetadataParts(i).isInitialized()) {
-            
-            return false;
-          }
-        }
-        return true;
-      }
-
-      public Builder mergeFrom(
-          org.jetbrains.kotlin.protobuf.CodedInputStream input,
-          org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.Module) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.util.List packageParts_ =
-        java.util.Collections.emptyList();
-      private void ensurePackagePartsIsMutable() {
-        if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          packageParts_ = new java.util.ArrayList(packageParts_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder> packagePartsBuilder_;
-
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public java.util.List getPackagePartsList() {
-        if (packagePartsBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(packageParts_);
-        } else {
-          return packagePartsBuilder_.getMessageList();
-        }
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public int getPackagePartsCount() {
-        if (packagePartsBuilder_ == null) {
-          return packageParts_.size();
-        } else {
-          return packagePartsBuilder_.getCount();
-        }
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts getPackageParts(int index) {
-        if (packagePartsBuilder_ == null) {
-          return packageParts_.get(index);
-        } else {
-          return packagePartsBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public Builder setPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts value) {
-        if (packagePartsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensurePackagePartsIsMutable();
-          packageParts_.set(index, value);
-          onChanged();
-        } else {
-          packagePartsBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public Builder setPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder builderForValue) {
-        if (packagePartsBuilder_ == null) {
-          ensurePackagePartsIsMutable();
-          packageParts_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          packagePartsBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public Builder addPackageParts(org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts value) {
-        if (packagePartsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensurePackagePartsIsMutable();
-          packageParts_.add(value);
-          onChanged();
-        } else {
-          packagePartsBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public Builder addPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts value) {
-        if (packagePartsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensurePackagePartsIsMutable();
-          packageParts_.add(index, value);
-          onChanged();
-        } else {
-          packagePartsBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public Builder addPackageParts(
-          org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder builderForValue) {
-        if (packagePartsBuilder_ == null) {
-          ensurePackagePartsIsMutable();
-          packageParts_.add(builderForValue.build());
-          onChanged();
-        } else {
-          packagePartsBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public Builder addPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder builderForValue) {
-        if (packagePartsBuilder_ == null) {
-          ensurePackagePartsIsMutable();
-          packageParts_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          packagePartsBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public Builder addAllPackageParts(
-          java.lang.Iterable values) {
-        if (packagePartsBuilder_ == null) {
-          ensurePackagePartsIsMutable();
-          org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
-              values, packageParts_);
-          onChanged();
-        } else {
-          packagePartsBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public Builder clearPackageParts() {
-        if (packagePartsBuilder_ == null) {
-          packageParts_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          packagePartsBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public Builder removePackageParts(int index) {
-        if (packagePartsBuilder_ == null) {
-          ensurePackagePartsIsMutable();
-          packageParts_.remove(index);
-          onChanged();
-        } else {
-          packagePartsBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder getPackagePartsBuilder(
-          int index) {
-        return getPackagePartsFieldBuilder().getBuilder(index);
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
-          int index) {
-        if (packagePartsBuilder_ == null) {
-          return packageParts_.get(index);  } else {
-          return packagePartsBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public java.util.List 
-           getPackagePartsOrBuilderList() {
-        if (packagePartsBuilder_ != null) {
-          return packagePartsBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(packageParts_);
-        }
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder addPackagePartsBuilder() {
-        return getPackagePartsFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.getDefaultInstance());
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder addPackagePartsBuilder(
-          int index) {
-        return getPackagePartsFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.getDefaultInstance());
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
-       *
-       * 
-       * Names of .class files for each package
-       * 

-       */
-      public java.util.List 
-           getPackagePartsBuilderList() {
-        return getPackagePartsFieldBuilder().getBuilderList();
-      }
-      private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder> 
-          getPackagePartsFieldBuilder() {
-        if (packagePartsBuilder_ == null) {
-          packagePartsBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder>(
-                  packageParts_,
-                  ((bitField0_ & 0x00000001) == 0x00000001),
-                  getParentForChildren(),
-                  isClean());
-          packageParts_ = null;
-        }
-        return packagePartsBuilder_;
-      }
-
-      private java.util.List metadataParts_ =
-        java.util.Collections.emptyList();
-      private void ensureMetadataPartsIsMutable() {
-        if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          metadataParts_ = new java.util.ArrayList(metadataParts_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-
-      private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder> metadataPartsBuilder_;
-
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public java.util.List getMetadataPartsList() {
-        if (metadataPartsBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(metadataParts_);
-        } else {
-          return metadataPartsBuilder_.getMessageList();
-        }
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public int getMetadataPartsCount() {
-        if (metadataPartsBuilder_ == null) {
-          return metadataParts_.size();
-        } else {
-          return metadataPartsBuilder_.getCount();
-        }
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts getMetadataParts(int index) {
-        if (metadataPartsBuilder_ == null) {
-          return metadataParts_.get(index);
-        } else {
-          return metadataPartsBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public Builder setMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts value) {
-        if (metadataPartsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureMetadataPartsIsMutable();
-          metadataParts_.set(index, value);
-          onChanged();
-        } else {
-          metadataPartsBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public Builder setMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder builderForValue) {
-        if (metadataPartsBuilder_ == null) {
-          ensureMetadataPartsIsMutable();
-          metadataParts_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          metadataPartsBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public Builder addMetadataParts(org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts value) {
-        if (metadataPartsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureMetadataPartsIsMutable();
-          metadataParts_.add(value);
-          onChanged();
-        } else {
-          metadataPartsBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public Builder addMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts value) {
-        if (metadataPartsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureMetadataPartsIsMutable();
-          metadataParts_.add(index, value);
-          onChanged();
-        } else {
-          metadataPartsBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public Builder addMetadataParts(
-          org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder builderForValue) {
-        if (metadataPartsBuilder_ == null) {
-          ensureMetadataPartsIsMutable();
-          metadataParts_.add(builderForValue.build());
-          onChanged();
-        } else {
-          metadataPartsBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public Builder addMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder builderForValue) {
-        if (metadataPartsBuilder_ == null) {
-          ensureMetadataPartsIsMutable();
-          metadataParts_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          metadataPartsBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public Builder addAllMetadataParts(
-          java.lang.Iterable values) {
-        if (metadataPartsBuilder_ == null) {
-          ensureMetadataPartsIsMutable();
-          org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
-              values, metadataParts_);
-          onChanged();
-        } else {
-          metadataPartsBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public Builder clearMetadataParts() {
-        if (metadataPartsBuilder_ == null) {
-          metadataParts_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-          onChanged();
-        } else {
-          metadataPartsBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public Builder removeMetadataParts(int index) {
-        if (metadataPartsBuilder_ == null) {
-          ensureMetadataPartsIsMutable();
-          metadataParts_.remove(index);
-          onChanged();
-        } else {
-          metadataPartsBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder getMetadataPartsBuilder(
-          int index) {
-        return getMetadataPartsFieldBuilder().getBuilder(index);
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
-          int index) {
-        if (metadataPartsBuilder_ == null) {
-          return metadataParts_.get(index);  } else {
-          return metadataPartsBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public java.util.List 
-           getMetadataPartsOrBuilderList() {
-        if (metadataPartsBuilder_ != null) {
-          return metadataPartsBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(metadataParts_);
-        }
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder addMetadataPartsBuilder() {
-        return getMetadataPartsFieldBuilder().addBuilder(
-            org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.getDefaultInstance());
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder addMetadataPartsBuilder(
-          int index) {
-        return getMetadataPartsFieldBuilder().addBuilder(
-            index, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.getDefaultInstance());
-      }
-      /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
-       *
-       * 
-       * Names of .kotlin_metadata files for each package
-       * 

-       */
-      public java.util.List 
-           getMetadataPartsBuilderList() {
-        return getMetadataPartsFieldBuilder().getBuilderList();
-      }
-      private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-          org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder> 
-          getMetadataPartsFieldBuilder() {
-        if (metadataPartsBuilder_ == null) {
-          metadataPartsBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder<
-              org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder>(
-                  metadataParts_,
-                  ((bitField0_ & 0x00000002) == 0x00000002),
-                  getParentForChildren(),
-                  isClean());
-          metadataParts_ = null;
-        }
-        return metadataPartsBuilder_;
-      }
-
-      private org.jetbrains.kotlin.protobuf.LazyStringList jvmPackageName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-      private void ensureJvmPackageNameIsMutable() {
-        if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-          jvmPackageName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(jvmPackageName_);
-          bitField0_ |= 0x00000004;
-         }
-      }
-      /**
-       * repeated string jvm_package_name = 3;
-       *
-       * 
-       * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-       * The names here are dot-separated, e.g. "org.foo.bar"
-       * 

-       */
-      public org.jetbrains.kotlin.protobuf.ProtocolStringList
-          getJvmPackageNameList() {
-        return jvmPackageName_.getUnmodifiableView();
-      }
-      /**
-       * repeated string jvm_package_name = 3;
-       *
-       * 
-       * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-       * The names here are dot-separated, e.g. "org.foo.bar"
-       * 

-       */
-      public int getJvmPackageNameCount() {
-        return jvmPackageName_.size();
-      }
-      /**
-       * repeated string jvm_package_name = 3;
-       *
-       * 
-       * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-       * The names here are dot-separated, e.g. "org.foo.bar"
-       * 

-       */
-      public java.lang.String getJvmPackageName(int index) {
-        return jvmPackageName_.get(index);
-      }
-      /**
-       * repeated string jvm_package_name = 3;
-       *
-       * 
-       * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-       * The names here are dot-separated, e.g. "org.foo.bar"
-       * 

-       */
-      public org.jetbrains.kotlin.protobuf.ByteString
-          getJvmPackageNameBytes(int index) {
-        return jvmPackageName_.getByteString(index);
-      }
-      /**
-       * repeated string jvm_package_name = 3;
-       *
-       * 
-       * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-       * The names here are dot-separated, e.g. "org.foo.bar"
-       * 

-       */
-      public Builder setJvmPackageName(
-          int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureJvmPackageNameIsMutable();
-        jvmPackageName_.set(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string jvm_package_name = 3;
-       *
-       * 
-       * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-       * The names here are dot-separated, e.g. "org.foo.bar"
-       * 

-       */
-      public Builder addJvmPackageName(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureJvmPackageNameIsMutable();
-        jvmPackageName_.add(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string jvm_package_name = 3;
-       *
-       * 
-       * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-       * The names here are dot-separated, e.g. "org.foo.bar"
-       * 

-       */
-      public Builder addAllJvmPackageName(
-          java.lang.Iterable values) {
-        ensureJvmPackageNameIsMutable();
-        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
-            values, jvmPackageName_);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string jvm_package_name = 3;
-       *
-       * 
-       * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-       * The names here are dot-separated, e.g. "org.foo.bar"
-       * 

-       */
-      public Builder clearJvmPackageName() {
-        jvmPackageName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string jvm_package_name = 3;
-       *
-       * 
-       * Values of @JvmPackageName annotation used in this module; can be referenced in PackageParts#class_with_jvm_package_name_package_id.
-       * The names here are dot-separated, e.g. "org.foo.bar"
-       * 

-       */
-      public Builder addJvmPackageNameBytes(
-          org.jetbrains.kotlin.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureJvmPackageNameIsMutable();
-        jvmPackageName_.add(value);
-        onChanged();
-        return this;
-      }
-
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.Module)
-    }
-
-    static {
-      defaultInstance = new Module(true);
-      defaultInstance.initFields();
-    }
-
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.Module)
-  }
-
-  public interface PackagePartsOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageParts)
-      org.jetbrains.kotlin.protobuf.MessageOrBuilder {
-
-    /**
-     * required string package_fq_name = 1;
-     */
-    boolean hasPackageFqName();
-    /**
-     * required string package_fq_name = 1;
-     */
-    java.lang.String getPackageFqName();
-    /**
-     * required string package_fq_name = 1;
-     */
-    org.jetbrains.kotlin.protobuf.ByteString
-        getPackageFqNameBytes();
-
-    /**
-     * repeated string short_class_name = 2;
-     *
-     * 
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-     * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-     * 

-     */
-    org.jetbrains.kotlin.protobuf.ProtocolStringList
-        getShortClassNameList();
-    /**
-     * repeated string short_class_name = 2;
-     *
-     * 
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-     * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-     * 

-     */
-    int getShortClassNameCount();
-    /**
-     * repeated string short_class_name = 2;
-     *
-     * 
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-     * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-     * 

-     */
-    java.lang.String getShortClassName(int index);
-    /**
-     * repeated string short_class_name = 2;
-     *
-     * 
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-     * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-     * 

-     */
-    org.jetbrains.kotlin.protobuf.ByteString
-        getShortClassNameBytes(int index);
-
-    /**
-     * repeated int32 multifile_facade_short_name_id = 3 [packed = true];
-     *
-     * 
-     * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
-     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-     * 

-     */
-    java.util.List getMultifileFacadeShortNameIdList();
-    /**
-     * repeated int32 multifile_facade_short_name_id = 3 [packed = true];
-     *
-     * 
-     * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
-     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-     * 

-     */
-    int getMultifileFacadeShortNameIdCount();
-    /**
-     * repeated int32 multifile_facade_short_name_id = 3 [packed = true];
-     *
-     * 
-     * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
-     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-     * 

-     */
-    int getMultifileFacadeShortNameId(int index);
-
-    /**
-     * repeated string multifile_facade_short_name = 4;
-     *
-     * 
-     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-     * 

-     */
-    org.jetbrains.kotlin.protobuf.ProtocolStringList
-        getMultifileFacadeShortNameList();
-    /**
-     * repeated string multifile_facade_short_name = 4;
-     *
-     * 
-     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-     * 

-     */
-    int getMultifileFacadeShortNameCount();
-    /**
-     * repeated string multifile_facade_short_name = 4;
-     *
-     * 
-     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-     * 

-     */
-    java.lang.String getMultifileFacadeShortName(int index);
-    /**
-     * repeated string multifile_facade_short_name = 4;
-     *
-     * 
-     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-     * 

-     */
-    org.jetbrains.kotlin.protobuf.ByteString
-        getMultifileFacadeShortNameBytes(int index);
-
-    /**
-     * repeated string class_with_jvm_package_name_short_name = 5;
-     *
-     * 
-     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-     * 

-     */
-    org.jetbrains.kotlin.protobuf.ProtocolStringList
-        getClassWithJvmPackageNameShortNameList();
-    /**
-     * repeated string class_with_jvm_package_name_short_name = 5;
-     *
-     * 
-     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-     * 

-     */
-    int getClassWithJvmPackageNameShortNameCount();
-    /**
-     * repeated string class_with_jvm_package_name_short_name = 5;
-     *
-     * 
-     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-     * 

-     */
-    java.lang.String getClassWithJvmPackageNameShortName(int index);
-    /**
-     * repeated string class_with_jvm_package_name_short_name = 5;
-     *
-     * 
-     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-     * 

-     */
-    org.jetbrains.kotlin.protobuf.ByteString
-        getClassWithJvmPackageNameShortNameBytes(int index);
-
-    /**
-     * repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
-     *
-     * 
-     * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
-     * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
-     * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
-     * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
-     * when a bunch of files from the same Kotlin package have the same JVM package name.
-     * 

-     */
-    java.util.List getClassWithJvmPackageNamePackageIdList();
-    /**
-     * repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
-     *
-     * 
-     * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
-     * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
-     * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
-     * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
-     * when a bunch of files from the same Kotlin package have the same JVM package name.
-     * 

-     */
-    int getClassWithJvmPackageNamePackageIdCount();
-    /**
-     * repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
-     *
-     * 
-     * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
-     * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
-     * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
-     * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
-     * when a bunch of files from the same Kotlin package have the same JVM package name.
-     * 

-     */
-    int getClassWithJvmPackageNamePackageId(int index);
-  }
-  /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
-   */
-  public static final class PackageParts extends
-      org.jetbrains.kotlin.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
-      PackagePartsOrBuilder {
-    // Use PackageParts.newBuilder() to construct.
-    private PackageParts(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) {
-      super(builder);
-      this.unknownFields = builder.getUnknownFields();
-    }
-    private PackageParts(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
-    private static final PackageParts defaultInstance;
-    public static PackageParts getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public PackageParts getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-
-    private final org.jetbrains.kotlin.protobuf.UnknownFieldSet unknownFields;
-    @java.lang.Override
-    public final org.jetbrains.kotlin.protobuf.UnknownFieldSet
-        getUnknownFields() {
-      return this.unknownFields;
-    }
-    private PackageParts(
-        org.jetbrains.kotlin.protobuf.CodedInputStream input,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      initFields();
-      int mutable_bitField0_ = 0;
-      org.jetbrains.kotlin.protobuf.UnknownFieldSet.Builder unknownFields =
-          org.jetbrains.kotlin.protobuf.UnknownFieldSet.newBuilder();
-      try {
-        boolean done = false;
-        while (!done) {
-          int tag = input.readTag();
-          switch (tag) {
-            case 0:
-              done = true;
-              break;
-            default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
-            case 10: {
-              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
-              bitField0_ |= 0x00000001;
-              packageFqName_ = bs;
-              break;
-            }
-            case 18: {
-              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                shortClassName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              shortClassName_.add(bs);
-              break;
-            }
-            case 24: {
-              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-                multifileFacadeShortNameId_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              multifileFacadeShortNameId_.add(input.readInt32());
-              break;
-            }
-            case 26: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) == 0x00000004) && input.getBytesUntilLimit() > 0) {
-                multifileFacadeShortNameId_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                multifileFacadeShortNameId_.add(input.readInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 34: {
-              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                multifileFacadeShortName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              multifileFacadeShortName_.add(bs);
-              break;
-            }
-            case 42: {
-              org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes();
-              if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-                classWithJvmPackageNameShortName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              classWithJvmPackageNameShortName_.add(bs);
-              break;
-            }
-            case 48: {
-              if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                classWithJvmPackageNamePackageId_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000020;
-              }
-              classWithJvmPackageNamePackageId_.add(input.readInt32());
-              break;
-            }
-            case 50: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000020) == 0x00000020) && input.getBytesUntilLimit() > 0) {
-                classWithJvmPackageNamePackageId_ = new java.util.ArrayList();
-                mutable_bitField0_ |= 0x00000020;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                classWithJvmPackageNamePackageId_.add(input.readInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-          }
-        }
-      } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(this);
-      } catch (java.io.IOException e) {
-        throw new org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException(
-            e.getMessage()).setUnfinishedMessage(this);
-      } finally {
-        if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-          shortClassName_ = shortClassName_.getUnmodifiableView();
-        }
-        if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-          multifileFacadeShortNameId_ = java.util.Collections.unmodifiableList(multifileFacadeShortNameId_);
-        }
-        if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-          multifileFacadeShortName_ = multifileFacadeShortName_.getUnmodifiableView();
-        }
-        if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-          classWithJvmPackageNameShortName_ = classWithJvmPackageNameShortName_.getUnmodifiableView();
-        }
-        if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-          classWithJvmPackageNamePackageId_ = java.util.Collections.unmodifiableList(classWithJvmPackageNamePackageId_);
-        }
-        this.unknownFields = unknownFields.build();
-        makeExtensionsImmutable();
-      }
-    }
-    public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
-    }
-
-    protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.class, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder.class);
-    }
-
-    public static org.jetbrains.kotlin.protobuf.Parser PARSER =
-        new org.jetbrains.kotlin.protobuf.AbstractParser() {
-      public PackageParts parsePartialFrom(
-          org.jetbrains.kotlin.protobuf.CodedInputStream input,
-          org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-        return new PackageParts(input, extensionRegistry);
-      }
-    };
-
-    @java.lang.Override
-    public org.jetbrains.kotlin.protobuf.Parser getParserForType() {
-      return PARSER;
-    }
-
-    private int bitField0_;
-    public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 1;
-    private java.lang.Object packageFqName_;
-    /**
-     * required string package_fq_name = 1;
-     */
-    public boolean hasPackageFqName() {
-      return ((bitField0_ & 0x00000001) == 0x00000001);
-    }
-    /**
-     * required string package_fq_name = 1;
-     */
-    public java.lang.String getPackageFqName() {
-      java.lang.Object ref = packageFqName_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        org.jetbrains.kotlin.protobuf.ByteString bs = 
-            (org.jetbrains.kotlin.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
-          packageFqName_ = s;
-        }
-        return s;
-      }
-    }
-    /**
-     * required string package_fq_name = 1;
-     */
-    public org.jetbrains.kotlin.protobuf.ByteString
-        getPackageFqNameBytes() {
-      java.lang.Object ref = packageFqName_;
-      if (ref instanceof java.lang.String) {
-        org.jetbrains.kotlin.protobuf.ByteString b = 
-            org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        packageFqName_ = b;
-        return b;
-      } else {
-        return (org.jetbrains.kotlin.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int SHORT_CLASS_NAME_FIELD_NUMBER = 2;
-    private org.jetbrains.kotlin.protobuf.LazyStringList shortClassName_;
-    /**
-     * repeated string short_class_name = 2;
-     *
-     * 
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-     * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-     * 

-     */
-    public org.jetbrains.kotlin.protobuf.ProtocolStringList
-        getShortClassNameList() {
-      return shortClassName_;
-    }
-    /**
-     * repeated string short_class_name = 2;
-     *
-     * 
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-     * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-     * 

-     */
-    public int getShortClassNameCount() {
-      return shortClassName_.size();
-    }
-    /**
-     * repeated string short_class_name = 2;
-     *
-     * 
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-     * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-     * 

-     */
-    public java.lang.String getShortClassName(int index) {
-      return shortClassName_.get(index);
-    }
-    /**
-     * repeated string short_class_name = 2;
-     *
-     * 
-     * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-     * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-     * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-     * 

-     */
-    public org.jetbrains.kotlin.protobuf.ByteString
-        getShortClassNameBytes(int index) {
-      return shortClassName_.getByteString(index);
-    }
-
-    public static final int MULTIFILE_FACADE_SHORT_NAME_ID_FIELD_NUMBER = 3;
-    private java.util.List multifileFacadeShortNameId_;
-    /**
-     * repeated int32 multifile_facade_short_name_id = 3 [packed = true];
-     *
-     * 
-     * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
-     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-     * 

-     */
-    public java.util.List
-        getMultifileFacadeShortNameIdList() {
-      return multifileFacadeShortNameId_;
-    }
-    /**
-     * repeated int32 multifile_facade_short_name_id = 3 [packed = true];
-     *
-     * 
-     * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
-     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-     * 

-     */
-    public int getMultifileFacadeShortNameIdCount() {
-      return multifileFacadeShortNameId_.size();
-    }
-    /**
-     * repeated int32 multifile_facade_short_name_id = 3 [packed = true];
-     *
-     * 
-     * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
-     * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-     * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-     * 

-     */
-    public int getMultifileFacadeShortNameId(int index) {
-      return multifileFacadeShortNameId_.get(index);
-    }
-    private int multifileFacadeShortNameIdMemoizedSerializedSize = -1;
-
-    public static final int MULTIFILE_FACADE_SHORT_NAME_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.protobuf.LazyStringList multifileFacadeShortName_;
-    /**
-     * repeated string multifile_facade_short_name = 4;
-     *
-     * 
-     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-     * 

-     */
-    public org.jetbrains.kotlin.protobuf.ProtocolStringList
-        getMultifileFacadeShortNameList() {
-      return multifileFacadeShortName_;
-    }
-    /**
-     * repeated string multifile_facade_short_name = 4;
-     *
-     * 
-     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-     * 

-     */
-    public int getMultifileFacadeShortNameCount() {
-      return multifileFacadeShortName_.size();
-    }
-    /**
-     * repeated string multifile_facade_short_name = 4;
-     *
-     * 
-     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-     * 

-     */
-    public java.lang.String getMultifileFacadeShortName(int index) {
-      return multifileFacadeShortName_.get(index);
-    }
-    /**
-     * repeated string multifile_facade_short_name = 4;
-     *
-     * 
-     * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-     * 

-     */
-    public org.jetbrains.kotlin.protobuf.ByteString
-        getMultifileFacadeShortNameBytes(int index) {
-      return multifileFacadeShortName_.getByteString(index);
-    }
-
-    public static final int CLASS_WITH_JVM_PACKAGE_NAME_SHORT_NAME_FIELD_NUMBER = 5;
-    private org.jetbrains.kotlin.protobuf.LazyStringList classWithJvmPackageNameShortName_;
-    /**
-     * repeated string class_with_jvm_package_name_short_name = 5;
-     *
-     * 
-     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-     * 

-     */
-    public org.jetbrains.kotlin.protobuf.ProtocolStringList
-        getClassWithJvmPackageNameShortNameList() {
-      return classWithJvmPackageNameShortName_;
-    }
-    /**
-     * repeated string class_with_jvm_package_name_short_name = 5;
-     *
-     * 
-     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-     * 

-     */
-    public int getClassWithJvmPackageNameShortNameCount() {
-      return classWithJvmPackageNameShortName_.size();
-    }
-    /**
-     * repeated string class_with_jvm_package_name_short_name = 5;
-     *
-     * 
-     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-     * 

-     */
-    public java.lang.String getClassWithJvmPackageNameShortName(int index) {
-      return classWithJvmPackageNameShortName_.get(index);
-    }
-    /**
-     * repeated string class_with_jvm_package_name_short_name = 5;
-     *
-     * 
-     * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-     * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-     * 

-     */
-    public org.jetbrains.kotlin.protobuf.ByteString
-        getClassWithJvmPackageNameShortNameBytes(int index) {
-      return classWithJvmPackageNameShortName_.getByteString(index);
-    }
-
-    public static final int CLASS_WITH_JVM_PACKAGE_NAME_PACKAGE_ID_FIELD_NUMBER = 6;
-    private java.util.List classWithJvmPackageNamePackageId_;
-    /**
-     * repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
-     *
-     * 
-     * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
-     * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
-     * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
-     * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
-     * when a bunch of files from the same Kotlin package have the same JVM package name.
-     * 

-     */
-    public java.util.List
-        getClassWithJvmPackageNamePackageIdList() {
-      return classWithJvmPackageNamePackageId_;
-    }
-    /**
-     * repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
-     *
-     * 
-     * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
-     * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
-     * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
-     * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
-     * when a bunch of files from the same Kotlin package have the same JVM package name.
-     * 

-     */
-    public int getClassWithJvmPackageNamePackageIdCount() {
-      return classWithJvmPackageNamePackageId_.size();
-    }
-    /**
-     * repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
-     *
-     * 
-     * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
-     * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
-     * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
-     * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
-     * when a bunch of files from the same Kotlin package have the same JVM package name.
-     * 

-     */
-    public int getClassWithJvmPackageNamePackageId(int index) {
-      return classWithJvmPackageNamePackageId_.get(index);
-    }
-    private int classWithJvmPackageNamePackageIdMemoizedSerializedSize = -1;
-
-    private void initFields() {
-      packageFqName_ = "";
-      shortClassName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-      multifileFacadeShortNameId_ = java.util.Collections.emptyList();
-      multifileFacadeShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-      classWithJvmPackageNameShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-      classWithJvmPackageNamePackageId_ = java.util.Collections.emptyList();
-    }
-    private byte memoizedIsInitialized = -1;
-    public final boolean isInitialized() {
-      byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
-
-      if (!hasPackageFqName()) {
-        memoizedIsInitialized = 0;
-        return false;
-      }
-      memoizedIsInitialized = 1;
-      return true;
-    }
-
-    public void writeTo(org.jetbrains.kotlin.protobuf.CodedOutputStream output)
-                        throws java.io.IOException {
-      getSerializedSize();
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        output.writeBytes(1, getPackageFqNameBytes());
-      }
-      for (int i = 0; i < shortClassName_.size(); i++) {
-        output.writeBytes(2, shortClassName_.getByteString(i));
-      }
-      if (getMultifileFacadeShortNameIdList().size() > 0) {
-        output.writeRawVarint32(26);
-        output.writeRawVarint32(multifileFacadeShortNameIdMemoizedSerializedSize);
-      }
-      for (int i = 0; i < multifileFacadeShortNameId_.size(); i++) {
-        output.writeInt32NoTag(multifileFacadeShortNameId_.get(i));
-      }
-      for (int i = 0; i < multifileFacadeShortName_.size(); i++) {
-        output.writeBytes(4, multifileFacadeShortName_.getByteString(i));
-      }
-      for (int i = 0; i < classWithJvmPackageNameShortName_.size(); i++) {
-        output.writeBytes(5, classWithJvmPackageNameShortName_.getByteString(i));
-      }
-      if (getClassWithJvmPackageNamePackageIdList().size() > 0) {
-        output.writeRawVarint32(50);
-        output.writeRawVarint32(classWithJvmPackageNamePackageIdMemoizedSerializedSize);
-      }
-      for (int i = 0; i < classWithJvmPackageNamePackageId_.size(); i++) {
-        output.writeInt32NoTag(classWithJvmPackageNamePackageId_.get(i));
-      }
-      getUnknownFields().writeTo(output);
-    }
-
-    private int memoizedSerializedSize = -1;
-    public int getSerializedSize() {
-      int size = memoizedSerializedSize;
-      if (size != -1) return size;
-
-      size = 0;
-      if (((bitField0_ & 0x00000001) == 0x00000001)) {
-        size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-          .computeBytesSize(1, getPackageFqNameBytes());
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < shortClassName_.size(); i++) {
-          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
-            .computeBytesSizeNoTag(shortClassName_.getByteString(i));
-        }
-        size += dataSize;
-        size += 1 * getShortClassNameList().size();
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < multifileFacadeShortNameId_.size(); i++) {
-          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
-            .computeInt32SizeNoTag(multifileFacadeShortNameId_.get(i));
-        }
-        size += dataSize;
-        if (!getMultifileFacadeShortNameIdList().isEmpty()) {
-          size += 1;
-          size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        multifileFacadeShortNameIdMemoizedSerializedSize = dataSize;
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < multifileFacadeShortName_.size(); i++) {
-          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
-            .computeBytesSizeNoTag(multifileFacadeShortName_.getByteString(i));
-        }
-        size += dataSize;
-        size += 1 * getMultifileFacadeShortNameList().size();
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < classWithJvmPackageNameShortName_.size(); i++) {
-          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
-            .computeBytesSizeNoTag(classWithJvmPackageNameShortName_.getByteString(i));
-        }
-        size += dataSize;
-        size += 1 * getClassWithJvmPackageNameShortNameList().size();
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < classWithJvmPackageNamePackageId_.size(); i++) {
-          dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
-            .computeInt32SizeNoTag(classWithJvmPackageNamePackageId_.get(i));
-        }
-        size += dataSize;
-        if (!getClassWithJvmPackageNamePackageIdList().isEmpty()) {
-          size += 1;
-          size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        classWithJvmPackageNamePackageIdMemoizedSerializedSize = dataSize;
-      }
-      size += getUnknownFields().getSerializedSize();
-      memoizedSerializedSize = size;
-      return size;
-    }
-
-    private static final long serialVersionUID = 0L;
-    @java.lang.Override
-    protected java.lang.Object writeReplace()
-        throws java.io.ObjectStreamException {
-      return super.writeReplace();
-    }
-
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts parseFrom(
-        org.jetbrains.kotlin.protobuf.ByteString data)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts parseFrom(
-        org.jetbrains.kotlin.protobuf.ByteString data,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts parseFrom(byte[] data)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts parseFrom(
-        byte[] data,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts parseFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts parseFrom(
-        java.io.InputStream input,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts parseDelimitedFrom(java.io.InputStream input)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts parseDelimitedFrom(
-        java.io.InputStream input,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts parseFrom(
-        org.jetbrains.kotlin.protobuf.CodedInputStream input)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-    public static org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts parseFrom(
-        org.jetbrains.kotlin.protobuf.CodedInputStream input,
-        org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-
-    public static Builder newBuilder() { return Builder.create(); }
-    public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-    public Builder toBuilder() { return newBuilder(this); }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(
-        org.jetbrains.kotlin.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
-     */
-    public static final class Builder extends
-        org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
-        org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackagePartsOrBuilder {
-      public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
-      }
-
-      protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.class, org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.Builder.class);
-      }
-
-      // Construct using org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(
-          org.jetbrains.kotlin.protobuf.GeneratedMessage.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-      private void maybeForceBuilderInitialization() {
-        if (org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
-        }
-      }
-      private static Builder create() {
-        return new Builder();
-      }
-
-      public Builder clear() {
-        super.clear();
-        packageFqName_ = "";
-        bitField0_ = (bitField0_ & ~0x00000001);
-        shortClassName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        multifileFacadeShortNameId_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        multifileFacadeShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        classWithJvmPackageNameShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000010);
-        classWithJvmPackageNamePackageId_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000020);
-        return this;
-      }
-
-      public Builder clone() {
-        return create().mergeFrom(buildPartial());
-      }
-
-      public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-          getDescriptorForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
-      }
-
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.getDefaultInstance();
-      }
-
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts build() {
-        org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts result = new org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
-          to_bitField0_ |= 0x00000001;
-        }
-        result.packageFqName_ = packageFqName_;
-        if (((bitField0_ & 0x00000002) == 0x00000002)) {
-          shortClassName_ = shortClassName_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.shortClassName_ = shortClassName_;
-        if (((bitField0_ & 0x00000004) == 0x00000004)) {
-          multifileFacadeShortNameId_ = java.util.Collections.unmodifiableList(multifileFacadeShortNameId_);
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.multifileFacadeShortNameId_ = multifileFacadeShortNameId_;
-        if (((bitField0_ & 0x00000008) == 0x00000008)) {
-          multifileFacadeShortName_ = multifileFacadeShortName_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000008);
-        }
-        result.multifileFacadeShortName_ = multifileFacadeShortName_;
-        if (((bitField0_ & 0x00000010) == 0x00000010)) {
-          classWithJvmPackageNameShortName_ = classWithJvmPackageNameShortName_.getUnmodifiableView();
-          bitField0_ = (bitField0_ & ~0x00000010);
-        }
-        result.classWithJvmPackageNameShortName_ = classWithJvmPackageNameShortName_;
-        if (((bitField0_ & 0x00000020) == 0x00000020)) {
-          classWithJvmPackageNamePackageId_ = java.util.Collections.unmodifiableList(classWithJvmPackageNamePackageId_);
-          bitField0_ = (bitField0_ & ~0x00000020);
-        }
-        result.classWithJvmPackageNamePackageId_ = classWithJvmPackageNamePackageId_;
-        result.bitField0_ = to_bitField0_;
-        onBuilt();
-        return result;
-      }
-
-      public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
-        if (other instanceof org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts) {
-          return mergeFrom((org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts)other);
-        } else {
-          super.mergeFrom(other);
-          return this;
-        }
-      }
-
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts.getDefaultInstance()) return this;
-        if (other.hasPackageFqName()) {
-          bitField0_ |= 0x00000001;
-          packageFqName_ = other.packageFqName_;
-          onChanged();
-        }
-        if (!other.shortClassName_.isEmpty()) {
-          if (shortClassName_.isEmpty()) {
-            shortClassName_ = other.shortClassName_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureShortClassNameIsMutable();
-            shortClassName_.addAll(other.shortClassName_);
-          }
-          onChanged();
-        }
-        if (!other.multifileFacadeShortNameId_.isEmpty()) {
-          if (multifileFacadeShortNameId_.isEmpty()) {
-            multifileFacadeShortNameId_ = other.multifileFacadeShortNameId_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-          } else {
-            ensureMultifileFacadeShortNameIdIsMutable();
-            multifileFacadeShortNameId_.addAll(other.multifileFacadeShortNameId_);
-          }
-          onChanged();
-        }
-        if (!other.multifileFacadeShortName_.isEmpty()) {
-          if (multifileFacadeShortName_.isEmpty()) {
-            multifileFacadeShortName_ = other.multifileFacadeShortName_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            ensureMultifileFacadeShortNameIsMutable();
-            multifileFacadeShortName_.addAll(other.multifileFacadeShortName_);
-          }
-          onChanged();
-        }
-        if (!other.classWithJvmPackageNameShortName_.isEmpty()) {
-          if (classWithJvmPackageNameShortName_.isEmpty()) {
-            classWithJvmPackageNameShortName_ = other.classWithJvmPackageNameShortName_;
-            bitField0_ = (bitField0_ & ~0x00000010);
-          } else {
-            ensureClassWithJvmPackageNameShortNameIsMutable();
-            classWithJvmPackageNameShortName_.addAll(other.classWithJvmPackageNameShortName_);
-          }
-          onChanged();
-        }
-        if (!other.classWithJvmPackageNamePackageId_.isEmpty()) {
-          if (classWithJvmPackageNamePackageId_.isEmpty()) {
-            classWithJvmPackageNamePackageId_ = other.classWithJvmPackageNamePackageId_;
-            bitField0_ = (bitField0_ & ~0x00000020);
-          } else {
-            ensureClassWithJvmPackageNamePackageIdIsMutable();
-            classWithJvmPackageNamePackageId_.addAll(other.classWithJvmPackageNamePackageId_);
-          }
-          onChanged();
-        }
-        this.mergeUnknownFields(other.getUnknownFields());
-        return this;
-      }
-
-      public final boolean isInitialized() {
-        if (!hasPackageFqName()) {
-          
-          return false;
-        }
-        return true;
-      }
-
-      public Builder mergeFrom(
-          org.jetbrains.kotlin.protobuf.CodedInputStream input,
-          org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts parsedMessage = null;
-        try {
-          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-        } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.DebugModuleProtoBuf.PackageParts) e.getUnfinishedMessage();
-          throw e;
-        } finally {
-          if (parsedMessage != null) {
-            mergeFrom(parsedMessage);
-          }
-        }
-        return this;
-      }
-      private int bitField0_;
-
-      private java.lang.Object packageFqName_ = "";
-      /**
-       * required string package_fq_name = 1;
-       */
-      public boolean hasPackageFqName() {
-        return ((bitField0_ & 0x00000001) == 0x00000001);
-      }
-      /**
-       * required string package_fq_name = 1;
-       */
-      public java.lang.String getPackageFqName() {
-        java.lang.Object ref = packageFqName_;
-        if (!(ref instanceof java.lang.String)) {
-          org.jetbrains.kotlin.protobuf.ByteString bs =
-              (org.jetbrains.kotlin.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (bs.isValidUtf8()) {
-            packageFqName_ = s;
-          }
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * required string package_fq_name = 1;
-       */
-      public org.jetbrains.kotlin.protobuf.ByteString
-          getPackageFqNameBytes() {
-        java.lang.Object ref = packageFqName_;
-        if (ref instanceof String) {
-          org.jetbrains.kotlin.protobuf.ByteString b = 
-              org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          packageFqName_ = b;
-          return b;
-        } else {
-          return (org.jetbrains.kotlin.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * required string package_fq_name = 1;
-       */
-      public Builder setPackageFqName(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        packageFqName_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * required string package_fq_name = 1;
-       */
-      public Builder clearPackageFqName() {
-        bitField0_ = (bitField0_ & ~0x00000001);
-        packageFqName_ = getDefaultInstance().getPackageFqName();
-        onChanged();
-        return this;
-      }
-      /**
-       * required string package_fq_name = 1;
-       */
-      public Builder setPackageFqNameBytes(
-          org.jetbrains.kotlin.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  bitField0_ |= 0x00000001;
-        packageFqName_ = value;
-        onChanged();
-        return this;
-      }
-
-      private org.jetbrains.kotlin.protobuf.LazyStringList shortClassName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-      private void ensureShortClassNameIsMutable() {
-        if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          shortClassName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(shortClassName_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * repeated string short_class_name = 2;
-       *
-       * 
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-       * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-       * 

-       */
-      public org.jetbrains.kotlin.protobuf.ProtocolStringList
-          getShortClassNameList() {
-        return shortClassName_.getUnmodifiableView();
-      }
-      /**
-       * repeated string short_class_name = 2;
-       *
-       * 
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-       * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-       * 

-       */
-      public int getShortClassNameCount() {
-        return shortClassName_.size();
-      }
-      /**
-       * repeated string short_class_name = 2;
-       *
-       * 
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-       * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-       * 

-       */
-      public java.lang.String getShortClassName(int index) {
-        return shortClassName_.get(index);
-      }
-      /**
-       * repeated string short_class_name = 2;
-       *
-       * 
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-       * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-       * 

-       */
-      public org.jetbrains.kotlin.protobuf.ByteString
-          getShortClassNameBytes(int index) {
-        return shortClassName_.getByteString(index);
-      }
-      /**
-       * repeated string short_class_name = 2;
-       *
-       * 
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-       * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-       * 

-       */
-      public Builder setShortClassName(
-          int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureShortClassNameIsMutable();
-        shortClassName_.set(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string short_class_name = 2;
-       *
-       * 
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-       * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-       * 

-       */
-      public Builder addShortClassName(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureShortClassNameIsMutable();
-        shortClassName_.add(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string short_class_name = 2;
-       *
-       * 
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-       * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-       * 

-       */
-      public Builder addAllShortClassName(
-          java.lang.Iterable values) {
-        ensureShortClassNameIsMutable();
-        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
-            values, shortClassName_);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string short_class_name = 2;
-       *
-       * 
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-       * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-       * 

-       */
-      public Builder clearShortClassName() {
-        shortClassName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string short_class_name = 2;
-       *
-       * 
-       * Short names of files, without extension, present in this package. Only single file facades and multi-file _parts_ are listed here
-       * (multi-file facades are not present in this list, they are defined below). Only files whose JVM package name is equal to the
-       * Kotlin package name (i.e. it has not been changed with @JvmPackageName) are listed here.
-       * 

-       */
-      public Builder addShortClassNameBytes(
-          org.jetbrains.kotlin.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureShortClassNameIsMutable();
-        shortClassName_.add(value);
-        onChanged();
-        return this;
-      }
-
-      private java.util.List multifileFacadeShortNameId_ = java.util.Collections.emptyList();
-      private void ensureMultifileFacadeShortNameIdIsMutable() {
-        if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-          multifileFacadeShortNameId_ = new java.util.ArrayList(multifileFacadeShortNameId_);
-          bitField0_ |= 0x00000004;
-         }
-      }
-      /**
-       * repeated int32 multifile_facade_short_name_id = 3 [packed = true];
-       *
-       * 
-       * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
-       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-       * 

-       */
-      public java.util.List
-          getMultifileFacadeShortNameIdList() {
-        return java.util.Collections.unmodifiableList(multifileFacadeShortNameId_);
-      }
-      /**
-       * repeated int32 multifile_facade_short_name_id = 3 [packed = true];
-       *
-       * 
-       * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
-       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-       * 

-       */
-      public int getMultifileFacadeShortNameIdCount() {
-        return multifileFacadeShortNameId_.size();
-      }
-      /**
-       * repeated int32 multifile_facade_short_name_id = 3 [packed = true];
-       *
-       * 
-       * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
-       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-       * 

-       */
-      public int getMultifileFacadeShortNameId(int index) {
-        return multifileFacadeShortNameId_.get(index);
-      }
-      /**
-       * repeated int32 multifile_facade_short_name_id = 3 [packed = true];
-       *
-       * 
-       * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
-       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-       * 

-       */
-      public Builder setMultifileFacadeShortNameId(
-          int index, int value) {
-        ensureMultifileFacadeShortNameIdIsMutable();
-        multifileFacadeShortNameId_.set(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated int32 multifile_facade_short_name_id = 3 [packed = true];
-       *
-       * 
-       * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
-       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-       * 

-       */
-      public Builder addMultifileFacadeShortNameId(int value) {
-        ensureMultifileFacadeShortNameIdIsMutable();
-        multifileFacadeShortNameId_.add(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated int32 multifile_facade_short_name_id = 3 [packed = true];
-       *
-       * 
-       * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
-       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-       * 

-       */
-      public Builder addAllMultifileFacadeShortNameId(
-          java.lang.Iterable values) {
-        ensureMultifileFacadeShortNameIdIsMutable();
-        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
-            values, multifileFacadeShortNameId_);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated int32 multifile_facade_short_name_id = 3 [packed = true];
-       *
-       * 
-       * For each name in short_class_name, index of the name of the corresponding multi-file facade class in multifile_facade_short_name + 1,
-       * or 0 if the class is not a multi-file part. If there's no value in this list at some index, the value is assumed to be 0.
-       * (e.g. if there are no multi-file classes in the module, this list is not going to exist at all)
-       * 

-       */
-      public Builder clearMultifileFacadeShortNameId() {
-        multifileFacadeShortNameId_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-        return this;
-      }
-
-      private org.jetbrains.kotlin.protobuf.LazyStringList multifileFacadeShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-      private void ensureMultifileFacadeShortNameIsMutable() {
-        if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-          multifileFacadeShortName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(multifileFacadeShortName_);
-          bitField0_ |= 0x00000008;
-         }
-      }
-      /**
-       * repeated string multifile_facade_short_name = 4;
-       *
-       * 
-       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-       * 

-       */
-      public org.jetbrains.kotlin.protobuf.ProtocolStringList
-          getMultifileFacadeShortNameList() {
-        return multifileFacadeShortName_.getUnmodifiableView();
-      }
-      /**
-       * repeated string multifile_facade_short_name = 4;
-       *
-       * 
-       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-       * 

-       */
-      public int getMultifileFacadeShortNameCount() {
-        return multifileFacadeShortName_.size();
-      }
-      /**
-       * repeated string multifile_facade_short_name = 4;
-       *
-       * 
-       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-       * 

-       */
-      public java.lang.String getMultifileFacadeShortName(int index) {
-        return multifileFacadeShortName_.get(index);
-      }
-      /**
-       * repeated string multifile_facade_short_name = 4;
-       *
-       * 
-       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-       * 

-       */
-      public org.jetbrains.kotlin.protobuf.ByteString
-          getMultifileFacadeShortNameBytes(int index) {
-        return multifileFacadeShortName_.getByteString(index);
-      }
-      /**
-       * repeated string multifile_facade_short_name = 4;
-       *
-       * 
-       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-       * 

-       */
-      public Builder setMultifileFacadeShortName(
-          int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureMultifileFacadeShortNameIsMutable();
-        multifileFacadeShortName_.set(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string multifile_facade_short_name = 4;
-       *
-       * 
-       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-       * 

-       */
-      public Builder addMultifileFacadeShortName(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureMultifileFacadeShortNameIsMutable();
-        multifileFacadeShortName_.add(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string multifile_facade_short_name = 4;
-       *
-       * 
-       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-       * 

-       */
-      public Builder addAllMultifileFacadeShortName(
-          java.lang.Iterable values) {
-        ensureMultifileFacadeShortNameIsMutable();
-        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
-            values, multifileFacadeShortName_);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string multifile_facade_short_name = 4;
-       *
-       * 
-       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-       * 

-       */
-      public Builder clearMultifileFacadeShortName() {
-        multifileFacadeShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000008);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string multifile_facade_short_name = 4;
-       *
-       * 
-       * Short names of multi-file facades, used in multifile_facade_short_name_id to store the part -> facade mapping.
-       * 

-       */
-      public Builder addMultifileFacadeShortNameBytes(
-          org.jetbrains.kotlin.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureMultifileFacadeShortNameIsMutable();
-        multifileFacadeShortName_.add(value);
-        onChanged();
-        return this;
-      }
-
-      private org.jetbrains.kotlin.protobuf.LazyStringList classWithJvmPackageNameShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-      private void ensureClassWithJvmPackageNameShortNameIsMutable() {
-        if (!((bitField0_ & 0x00000010) == 0x00000010)) {
-          classWithJvmPackageNameShortName_ = new org.jetbrains.kotlin.protobuf.LazyStringArrayList(classWithJvmPackageNameShortName_);
-          bitField0_ |= 0x00000010;
-         }
-      }
-      /**
-       * repeated string class_with_jvm_package_name_short_name = 5;
-       *
-       * 
-       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-       * 

-       */
-      public org.jetbrains.kotlin.protobuf.ProtocolStringList
-          getClassWithJvmPackageNameShortNameList() {
-        return classWithJvmPackageNameShortName_.getUnmodifiableView();
-      }
-      /**
-       * repeated string class_with_jvm_package_name_short_name = 5;
-       *
-       * 
-       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-       * 

-       */
-      public int getClassWithJvmPackageNameShortNameCount() {
-        return classWithJvmPackageNameShortName_.size();
-      }
-      /**
-       * repeated string class_with_jvm_package_name_short_name = 5;
-       *
-       * 
-       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-       * 

-       */
-      public java.lang.String getClassWithJvmPackageNameShortName(int index) {
-        return classWithJvmPackageNameShortName_.get(index);
-      }
-      /**
-       * repeated string class_with_jvm_package_name_short_name = 5;
-       *
-       * 
-       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-       * 

-       */
-      public org.jetbrains.kotlin.protobuf.ByteString
-          getClassWithJvmPackageNameShortNameBytes(int index) {
-        return classWithJvmPackageNameShortName_.getByteString(index);
-      }
-      /**
-       * repeated string class_with_jvm_package_name_short_name = 5;
-       *
-       * 
-       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-       * 

-       */
-      public Builder setClassWithJvmPackageNameShortName(
-          int index, java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureClassWithJvmPackageNameShortNameIsMutable();
-        classWithJvmPackageNameShortName_.set(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string class_with_jvm_package_name_short_name = 5;
-       *
-       * 
-       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-       * 

-       */
-      public Builder addClassWithJvmPackageNameShortName(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureClassWithJvmPackageNameShortNameIsMutable();
-        classWithJvmPackageNameShortName_.add(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string class_with_jvm_package_name_short_name = 5;
-       *
-       * 
-       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-       * 

-       */
-      public Builder addAllClassWithJvmPackageNameShortName(
-          java.lang.Iterable values) {
-        ensureClassWithJvmPackageNameShortNameIsMutable();
-        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
-            values, classWithJvmPackageNameShortName_);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string class_with_jvm_package_name_short_name = 5;
-       *
-       * 
-       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-       * 

-       */
-      public Builder clearClassWithJvmPackageNameShortName() {
-        classWithJvmPackageNameShortName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-        bitField0_ = (bitField0_ & ~0x00000010);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated string class_with_jvm_package_name_short_name = 5;
-       *
-       * 
-       * Short names of files (single file facades), whose JVM package differs from the Kotlin package because of @JvmPackageName.
-       * The JVM package name of each file is stored at the same index in class_with_jvm_package_name_package_id.
-       * 

-       */
-      public Builder addClassWithJvmPackageNameShortNameBytes(
-          org.jetbrains.kotlin.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  ensureClassWithJvmPackageNameShortNameIsMutable();
-        classWithJvmPackageNameShortName_.add(value);
-        onChanged();
-        return this;
-      }
-
-      private java.util.List classWithJvmPackageNamePackageId_ = java.util.Collections.emptyList();
-      private void ensureClassWithJvmPackageNamePackageIdIsMutable() {
-        if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          classWithJvmPackageNamePackageId_ = new java.util.ArrayList(classWithJvmPackageNamePackageId_);
-          bitField0_ |= 0x00000020;
-         }
-      }
-      /**
-       * repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
-       *
-       * 
-       * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
-       * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
-       * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
-       * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
-       * when a bunch of files from the same Kotlin package have the same JVM package name.
-       * 

-       */
-      public java.util.List
-          getClassWithJvmPackageNamePackageIdList() {
-        return java.util.Collections.unmodifiableList(classWithJvmPackageNamePackageId_);
-      }
-      /**
-       * repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
-       *
-       * 
-       * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
-       * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
-       * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
-       * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
-       * when a bunch of files from the same Kotlin package have the same JVM package name.
-       * 

-       */
-      public int getClassWithJvmPackageNamePackageIdCount() {
-        return classWithJvmPackageNamePackageId_.size();
-      }
-      /**
-       * repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
-       *
-       * 
-       * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
-       * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
-       * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
-       * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
-       * when a bunch of files from the same Kotlin package have the same JVM package name.
-       * 

-       */
-      public int getClassWithJvmPackageNamePackageId(int index) {
-        return classWithJvmPackageNamePackageId_.get(index);
-      }
-      /**
-       * repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
-       *
-       * 
-       * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
-       * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
-       * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
-       * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
-       * when a bunch of files from the same Kotlin package have the same JVM package name.
-       * 

-       */
-      public Builder setClassWithJvmPackageNamePackageId(
-          int index, int value) {
-        ensureClassWithJvmPackageNamePackageIdIsMutable();
-        classWithJvmPackageNamePackageId_.set(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
-       *
-       * 
-       * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
-       * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
-       * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
-       * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
-       * when a bunch of files from the same Kotlin package have the same JVM package name.
-       * 

-       */
-      public Builder addClassWithJvmPackageNamePackageId(int value) {
-        ensureClassWithJvmPackageNamePackageIdIsMutable();
-        classWithJvmPackageNamePackageId_.add(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
-       *
-       * 
-       * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
-       * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
-       * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
-       * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
-       * when a bunch of files from the same Kotlin package have the same JVM package name.
-       * 

-       */
-      public Builder addAllClassWithJvmPackageNamePackageId(
-          java.lang.Iterable values) {
-        ensureClassWithJvmPackageNamePackageIdIsMutable();
-        org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
-            values, classWithJvmPackageNamePackageId_);
-        onChanged();
-        return this;
-      }
-      /**
-       * repeated int32 class_with_jvm_package_name_package_id = 6 [packed = true];
-       *
-       * 
-       * For each name in class_with_jvm_package_name_short_name, the index (into PackageTable#jvm_package_name) of the JVM package name.
-       * This list should have at least one element, otherwise classes with JVM package names are going to be ignored completely.
-       * If there's no value in this list at some index other than 0, the value is assumed to be the same as the value of the last element
-       * of this list. The intended use case for this optimization is to have just a list of a single element in the most frequent case
-       * when a bunch of files from the same Kotlin package have the same JVM package name.
-       * 

-       */
-      public Builder clearClassWithJvmPackageNamePackageId() {
-        classWithJvmPackageNamePackageId_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000020);
-        onChanged();
-        return this;
-      }
-
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.PackageParts)
-    }
-
-    static {
-      defaultInstance = new PackageParts(true);
-      defaultInstance.initFields();
-    }
-
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageParts)
-  }
-
-  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor;
-  private static
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable;
-  private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
-    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor;
-  private static
-    org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable;
-
-  public static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
-      getDescriptor() {
-    return descriptor;
-  }
-  private static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
-      descriptor;
-  static {
-    java.lang.String[] descriptorData = {
-      "\n/core/descriptors.jvm/src/jvm_module.de" +
-      "bug.proto\022&org.jetbrains.kotlin.serializ" +
-      "ation.jvm\"\275\001\n\006Module\022K\n\rpackage_parts\030\001 " +
-      "\003(\01324.org.jetbrains.kotlin.serialization" +
-      ".jvm.PackageParts\022L\n\016metadata_parts\030\002 \003(" +
-      "\01324.org.jetbrains.kotlin.serialization.j" +
-      "vm.PackageParts\022\030\n\020jvm_package_name\030\003 \003(" +
-      "\t\"\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\036multifi" +
-      "le_facade_short_name_id\030\003 \003(\005B\002\020\001\022#\n\033mul",
-      "tifile_facade_short_name\030\004 \003(\t\022.\n&class_" +
-      "with_jvm_package_name_short_name\030\005 \003(\t\0222" +
-      "\n&class_with_jvm_package_name_package_id" +
-      "\030\006 \003(\005B\002\020\001B\025B\023DebugModuleProtoBuf"
-    };
-    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
-          public org.jetbrains.kotlin.protobuf.ExtensionRegistry assignDescriptors(
-              org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
-      .internalBuildGeneratedFileFrom(descriptorData,
-        new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor[] {
-        }, assigner);
-    internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_org_jetbrains_kotlin_serialization_jvm_Module_fieldAccessorTable = new
-      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_jvm_Module_descriptor,
-        new java.lang.String[] { "PackageParts", "MetadataParts", "JvmPackageName", });
-    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor =
-      getDescriptor().getMessageTypes().get(1);
-    internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_fieldAccessorTable = new
-      org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_org_jetbrains_kotlin_serialization_jvm_PackageParts_descriptor,
-        new java.lang.String[] { "PackageFqName", "ShortClassName", "MultifileFacadeShortNameId", "MultifileFacadeShortName", "ClassWithJvmPackageNameShortName", "ClassWithJvmPackageNamePackageId", });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
\ No newline at end of file
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
index f8ddc1a70b7..41d1de37e8d 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
@@ -35,15 +35,15 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation;
 import org.jetbrains.kotlin.load.kotlin.ModuleMapping;
 import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils;
 import org.jetbrains.kotlin.load.kotlin.PackageParts;
+import org.jetbrains.kotlin.metadata.ProtoBuf;
+import org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf;
 import org.jetbrains.kotlin.name.ClassId;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.resolve.CompilerDeserializationConfiguration;
 import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin;
-import org.jetbrains.kotlin.serialization.ProtoBuf;
 import org.jetbrains.kotlin.serialization.StringTableImpl;
-import org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf;
 import org.jetbrains.org.objectweb.asm.Type;
 
 import java.io.File;
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
index a7a539eb64c..ea35b36c3dd 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
@@ -28,13 +28,13 @@ import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl;
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation;
 import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader;
+import org.jetbrains.kotlin.metadata.ProtoBuf;
 import org.jetbrains.kotlin.psi.KtElement;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
 import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt;
 import org.jetbrains.kotlin.resolve.scopes.MemberScope;
 import org.jetbrains.kotlin.serialization.DescriptorSerializer;
-import org.jetbrains.kotlin.serialization.ProtoBuf;
 import org.jetbrains.kotlin.types.KotlinType;
 import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils;
 import org.jetbrains.kotlin.util.OperatorNameConventions;
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index 7f84ed414a7..fa0f0f89739 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -31,6 +31,7 @@ import org.jetbrains.kotlin.load.java.JavaVisibilities;
 import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames;
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader;
+import org.jetbrains.kotlin.metadata.ProtoBuf;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.name.SpecialNames;
 import org.jetbrains.kotlin.psi.*;
@@ -45,7 +46,6 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt;
 import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature;
 import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt;
 import org.jetbrains.kotlin.serialization.DescriptorSerializer;
-import org.jetbrains.kotlin.serialization.ProtoBuf;
 import org.jetbrains.kotlin.storage.LockBasedStorageManager;
 import org.jetbrains.kotlin.storage.NotNullLazyValue;
 import org.jetbrains.kotlin.types.ErrorUtils;
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
index 20eca990630..64a6629d141 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
@@ -31,12 +31,12 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotated;
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationsImpl;
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader;
+import org.jetbrains.kotlin.metadata.ProtoBuf;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName;
 import org.jetbrains.kotlin.serialization.DescriptorSerializer;
-import org.jetbrains.kotlin.serialization.ProtoBuf;
 import org.jetbrains.org.objectweb.asm.Type;
 
 import java.util.ArrayList;
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/classFileUtils.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/classFileUtils.kt
index 7816ce6c7ee..8fd4225c8e5 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/classFileUtils.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/classFileUtils.kt
@@ -22,8 +22,8 @@ import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.load.kotlin.JvmMetadataVersion
 import org.jetbrains.kotlin.load.kotlin.ModuleMapping
 import org.jetbrains.kotlin.load.kotlin.PackageParts
+import org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
-import org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf
 import java.io.ByteArrayOutputStream
 
 fun ClassFileFactory.getClassFiles(): Iterable {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.kt
index 103b305616c..e29bd6b0b5a 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.kt
@@ -28,10 +28,10 @@ import org.jetbrains.kotlin.load.kotlin.FileBasedKotlinClass
 import org.jetbrains.kotlin.load.kotlin.JvmNameResolver
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
 import org.jetbrains.kotlin.load.kotlin.header.ReadKotlinClassHeaderAnnotationVisitor
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.protobuf.MessageLite
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.Companion.NO_ORIGIN
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import org.jetbrains.org.objectweb.asm.*
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java
index f844c9498d9..86158985493 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmSerializerExtension.java
@@ -31,14 +31,18 @@ import org.jetbrains.kotlin.load.java.JvmAbi;
 import org.jetbrains.kotlin.load.java.lazy.types.RawTypeImpl;
 import org.jetbrains.kotlin.load.kotlin.JavaFlexibleTypeDeserializer;
 import org.jetbrains.kotlin.load.kotlin.TypeSignatureMappingKt;
+import org.jetbrains.kotlin.metadata.ProtoBuf;
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf;
 import org.jetbrains.kotlin.name.ClassId;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.protobuf.GeneratedMessageLite;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
-import org.jetbrains.kotlin.serialization.*;
+import org.jetbrains.kotlin.serialization.AnnotationSerializer;
+import org.jetbrains.kotlin.serialization.DescriptorSerializer;
+import org.jetbrains.kotlin.serialization.SerializerExtension;
+import org.jetbrains.kotlin.serialization.StringTable;
 import org.jetbrains.kotlin.serialization.jvm.ClassMapperLite;
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf;
 import org.jetbrains.kotlin.types.FlexibleType;
 import org.jetbrains.kotlin.types.KotlinType;
 import org.jetbrains.org.objectweb.asm.Type;
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmStringTable.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmStringTable.kt
index cb3e0b1c3a3..661ebb645fb 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmStringTable.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/serialization/JvmStringTable.kt
@@ -21,11 +21,11 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassifierDescriptorWithTypeParameters
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.load.kotlin.JvmNameResolver
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.serialization.StringTable
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record
 import org.jetbrains.kotlin.types.ErrorUtils
 import java.io.OutputStream
 
diff --git a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt
index c18ad7465c2..2d034a3f388 100644
--- a/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt
+++ b/compiler/builtins-serializer/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerExtension.kt
@@ -17,10 +17,10 @@
 package org.jetbrains.kotlin.serialization.builtins
 
 import org.jetbrains.kotlin.builtins.BuiltInSerializerProtocol
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.serialization.KotlinSerializerExtensionBase
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.UnresolvedType
 
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataSerializer.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataSerializer.kt
index 9279d21525a..e36572693d8 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataSerializer.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/MetadataSerializer.kt
@@ -32,6 +32,8 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
 import org.jetbrains.kotlin.load.kotlin.PackageParts
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -40,9 +42,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.serialization.DescriptorSerializer
 import org.jetbrains.kotlin.serialization.KotlinSerializerExtensionBase
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragment.Companion.DOT_METADATA_FILE_EXTENSION
-import org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf
 import java.io.ByteArrayOutputStream
 import java.io.DataOutputStream
 import java.io.File
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/inline/inlineUtil.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/inline/inlineUtil.kt
index 760369cb4cf..70e1b8e81de 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/inline/inlineUtil.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/inline/inlineUtil.kt
@@ -17,13 +17,13 @@
 package org.jetbrains.kotlin.inline
 
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature
 import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.kotlin.serialization.deserialization.TypeTable
 import org.jetbrains.kotlin.serialization.deserialization.getExtensionOrNull
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 
 fun inlineFunctionsJvmNames(header: KotlinClassHeader): Set {
diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleName.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleName.kt
index aab624d7499..634ce51c041 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleName.kt
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/moduleName.kt
@@ -8,11 +8,11 @@ package org.jetbrains.kotlin.load.kotlin
 import org.jetbrains.kotlin.descriptors.ClassOrPackageFragmentDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.load.java.JvmAbi
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberDescriptor
 import org.jetbrains.kotlin.serialization.deserialization.getExtensionOrNull
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
 
 fun getJvmModuleNameForDeserializedDescriptor(descriptor: DeclarationDescriptor): String? {
     val parent = DescriptorUtils.getParentOfType(descriptor, ClassOrPackageFragmentDescriptor::class.java, false)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/contracts/ContractDeserializerImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/contracts/ContractDeserializerImpl.kt
index ac67d724dec..55231b3f232 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/contracts/ContractDeserializerImpl.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/contracts/ContractDeserializerImpl.kt
@@ -20,8 +20,8 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.contracts.description.*
 import org.jetbrains.kotlin.contracts.description.expressions.*
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.ContractDeserializer
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
 import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt
index 3fc6d70c3ed..91bd1925c85 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/deprecationUtil.kt
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.descriptors.impl.DescriptorDerivedFromTypeAlias
 import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.diagnostics.Errors
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.DeprecationLevelValue.*
 import org.jetbrains.kotlin.resolve.annotations.argumentValue
@@ -38,7 +39,6 @@ import org.jetbrains.kotlin.resolve.constants.AnnotationValue
 import org.jetbrains.kotlin.resolve.constants.EnumValue
 import org.jetbrains.kotlin.resolve.constants.StringValue
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberDescriptor
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.VersionRequirement
diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt b/compiler/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt
index 8bb20289cdb..fcf940b6c02 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt
@@ -19,10 +19,11 @@ package org.jetbrains.kotlin.serialization
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value
+import org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Type
 import org.jetbrains.kotlin.resolve.constants.*
 import org.jetbrains.kotlin.resolve.descriptorUtil.annotationClass
-import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value
-import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type
 import org.jetbrains.kotlin.types.ErrorUtils
 
 class AnnotationSerializer(private val stringTable: StringTable) {
diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/ContractSerializer.kt b/compiler/serialization/src/org/jetbrains/kotlin/serialization/ContractSerializer.kt
index fd97543b722..1fee1a1bba9 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/ContractSerializer.kt
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/ContractSerializer.kt
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.contracts.description.expressions.*
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
+import org.jetbrains.kotlin.metadata.ProtoBuf
 
 class ContractSerializer {
     fun serializeContractOfFunctionIfAny(
diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
index 838732ed865..dc705826b37 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.builtins.transformSuspendFunctionToRuntimeFunctionTy
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotated
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.protobuf.MessageLite
diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/MutableTable.kt b/compiler/serialization/src/org/jetbrains/kotlin/serialization/MutableTable.kt
index dd8d14c1637..ca96572a4f0 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/MutableTable.kt
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/MutableTable.kt
@@ -17,6 +17,7 @@
 @file:Suppress("FINITE_BOUNDS_VIOLATION_IN_JAVA")
 package org.jetbrains.kotlin.serialization
 
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.protobuf.GeneratedMessageLite
 import org.jetbrains.kotlin.utils.Interner
 import java.util.*
diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.kt b/compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.kt
index 7f3d3391027..5fb79657acb 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.kt
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.kt
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.serialization
 
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.types.FlexibleType
 import org.jetbrains.kotlin.types.KotlinType
diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtensionBase.kt b/compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtensionBase.kt
index d827400c37e..9d86d44249a 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtensionBase.kt
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtensionBase.kt
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.serialization
 
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.constants.NullValue
 import org.jetbrains.kotlin.types.KotlinType
diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/StringTableImpl.kt b/compiler/serialization/src/org/jetbrains/kotlin/serialization/StringTableImpl.kt
index 0b1306600e0..3c172cdef78 100644
--- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/StringTableImpl.kt
+++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/StringTableImpl.kt
@@ -17,11 +17,12 @@
 package org.jetbrains.kotlin.serialization
 
 import org.jetbrains.kotlin.descriptors.ClassifierDescriptorWithTypeParameters
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.descriptorUtil.classId
-import org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName
 import org.jetbrains.kotlin.types.ErrorUtils
 import org.jetbrains.kotlin.utils.Interner
 import java.io.OutputStream
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt
index 50124b090e1..2d9213878f1 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt
@@ -20,13 +20,13 @@ import org.jetbrains.kotlin.descriptors.Named
 import org.jetbrains.kotlin.load.java.structure.JavaNamedElement
 import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl
 import org.jetbrains.kotlin.load.java.structure.impl.JavaTypeImpl
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
 import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer
 import org.jetbrains.kotlin.types.KotlinType
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/VersionRequirementTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/VersionRequirementTest.kt
index fb32d4f19b8..d9b5fb04fc1 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/VersionRequirementTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/VersionRequirementTest.kt
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.PackageViewDescriptor
 import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
 import org.jetbrains.kotlin.resolve.scopes.getDescriptorsFiltered
diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt
index 9e4074674fb..62972b6b687 100644
--- a/compiler/tests/org/jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/serialization/jvm/JvmNameResolverTest.kt
@@ -17,10 +17,11 @@
 package org.jetbrains.kotlin.serialization.jvm
 
 import org.jetbrains.kotlin.load.kotlin.JvmNameResolver
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.*
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.*
 import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
 import java.util.*
 
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
index b15cecc7bac..e7f680e911c 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt
@@ -20,16 +20,16 @@ import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.load.java.JvmAnnotationNames
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.propertySignature
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.protobuf.MessageLite
 import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.*
 import org.jetbrains.kotlin.serialization.jvm.ClassMapperLite
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.propertySignature
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.kotlin.types.KotlinType
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt
index 3ae14d8f987..7331430737b 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt
@@ -23,10 +23,10 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationWithTarget
 import org.jetbrains.kotlin.load.java.components.DescriptorResolverUtils
 import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass.AnnotationArrayArgumentVisitor
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.constants.*
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.AnnotationDeserializer
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.kotlin.storage.StorageManager
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeDeserializer.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeDeserializer.kt
index 1e1a16c279d..57ceb3695b7 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeDeserializer.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeDeserializer.kt
@@ -17,9 +17,9 @@
 package org.jetbrains.kotlin.load.kotlin
 
 import org.jetbrains.kotlin.load.java.lazy.types.RawTypeImpl
-import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeDeserializer
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.types.ErrorUtils
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.KotlinTypeFactory
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt
index c040cc781aa..ef53a9ddd6a 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmNameResolver.kt
@@ -16,13 +16,13 @@
 
 package org.jetbrains.kotlin.load.kotlin
 
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.*
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.*
 import java.util.*
 
 class JvmNameResolver(
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt
index 29e209b608a..7ab918ad60c 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/JvmPackagePartSource.kt
@@ -17,10 +17,10 @@
 package org.jetbrains.kotlin.load.kotlin
 
 import org.jetbrains.kotlin.descriptors.SourceFile
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
index 565986bb99d..de631e882d4 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt
@@ -16,8 +16,8 @@
 
 package org.jetbrains.kotlin.load.kotlin
 
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
 
 // The purpose of this class is to hold a unique signature of either a method or a field, so that annotations on a member can be put
 // into a map indexed by these signatures
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt
index f9b78da21d8..ba792811c83 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/load/kotlin/ModuleMapping.kt
@@ -16,12 +16,12 @@
 
 package org.jetbrains.kotlin.load.kotlin
 
+import org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
 import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl
-import org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf
 import java.io.ByteArrayInputStream
 import java.io.DataInputStream
 import java.io.IOException
diff --git a/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt b/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt
index cf88228cc04..f66f4c390d6 100644
--- a/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt
+++ b/core/descriptors.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt
@@ -17,10 +17,11 @@
 package org.jetbrains.kotlin.serialization.jvm
 
 import org.jetbrains.kotlin.load.kotlin.JvmNameResolver
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite
 import org.jetbrains.kotlin.serialization.ClassData
 import org.jetbrains.kotlin.serialization.PackageData
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.*
 import java.io.ByteArrayInputStream
 import java.io.InputStream
diff --git a/core/deserialization/src/org/jetbrains/kotlin/builtins/BuiltInSerializerProtocol.kt b/core/deserialization/src/org/jetbrains/kotlin/builtins/BuiltInSerializerProtocol.kt
index 19eed1ff0f6..de4d90e8203 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/builtins/BuiltInSerializerProtocol.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/builtins/BuiltInSerializerProtocol.kt
@@ -16,10 +16,10 @@
 
 package org.jetbrains.kotlin.builtins
 
+import org.jetbrains.kotlin.metadata.builtins.BuiltInsProtoBuf
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite
 import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
-import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf
 
 object BuiltInSerializerProtocol : SerializerExtensionProtocol(
         ExtensionRegistryLite.newInstance().apply { BuiltInsProtoBuf.registerAllExtensions(this) },
diff --git a/core/deserialization/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragmentImpl.kt b/core/deserialization/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragmentImpl.kt
index dac2989e460..11dd19a35a9 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragmentImpl.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/builtins/BuiltInsPackageFragmentImpl.kt
@@ -17,8 +17,8 @@
 package org.jetbrains.kotlin.builtins
 
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.DeserializedPackageFragmentImpl
 import org.jetbrains.kotlin.storage.StorageManager
 import java.io.InputStream
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java
index 5280bad560e..3d902e9f4b0 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/Flags.java
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.serialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.metadata.ProtoBuf;
 import org.jetbrains.kotlin.protobuf.Internal;
 
 public class Flags {
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoDatas.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoDatas.kt
index 44a655520ef..3bfa930e04e 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoDatas.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoDatas.kt
@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.serialization
 
 import org.jetbrains.kotlin.descriptors.SourceElement
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 
 data class ClassData(
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt
index cff9dca3794..80e2f9176b0 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/SerializerExtensionProtocol.kt
@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.serialization
 
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite
 import org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension
 
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.kt
index 8d94dc8ee92..50503f9ac02 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoader.kt
@@ -16,8 +16,8 @@
 
 package org.jetbrains.kotlin.serialization.deserialization
 
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.protobuf.MessageLite
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.types.KotlinType
 
 // The MessageLite instance everywhere should be Constructor, Function or Property
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoaderImpl.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoaderImpl.kt
index c1ae90048d2..332baa083ce 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoaderImpl.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationAndConstantLoaderImpl.kt
@@ -20,9 +20,9 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.NotFoundClasses
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationWithTarget
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.protobuf.MessageLite
 import org.jetbrains.kotlin.resolve.constants.ConstantValue
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
 import org.jetbrains.kotlin.types.KotlinType
 
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt
index dc2397f7b48..39da58187f2 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt
@@ -21,14 +21,14 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptorImpl
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
+import org.jetbrains.kotlin.metadata.ProtoBuf.Annotation
+import org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument
+import org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value
+import org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Type
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.constants.*
-import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation
-import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument
-import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value
-import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type
 import org.jetbrains.kotlin.types.*
 import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
 import org.jetbrains.kotlin.types.typeUtil.replaceArgumentsWithStarProjections
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ContractDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ContractDeserializer.kt
index 0b076f28277..f9a80c324eb 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ContractDeserializer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ContractDeserializer.kt
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
-import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.metadata.ProtoBuf
 
 interface ContractDeserializer {
     fun deserializeContractFromFunction(
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragmentImpl.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragmentImpl.kt
index ba39366b5d7..3c9c0a3b8ff 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragmentImpl.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedPackageFragmentImpl.kt
@@ -18,8 +18,8 @@ package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.SourceElement
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
 import org.jetbrains.kotlin.storage.StorageManager
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeDeserializer.kt
index e45d81de378..669060f3423 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeDeserializer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeDeserializer.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.SimpleType
 
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
index 901bc3d8e23..cd1fad991b2 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt
@@ -24,10 +24,10 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationsImpl
 import org.jetbrains.kotlin.descriptors.impl.PropertyGetterDescriptorImpl
 import org.jetbrains.kotlin.descriptors.impl.PropertySetterDescriptorImpl
 import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.protobuf.MessageLite
 import org.jetbrains.kotlin.resolve.DescriptorFactory
 import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.*
 
 class MemberDeserializer(private val c: DeserializationContext) {
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MetadataPackageFragmentProvider.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MetadataPackageFragmentProvider.kt
index cb753b3c515..2563aa3d25b 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MetadataPackageFragmentProvider.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/MetadataPackageFragmentProvider.kt
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.descriptors.deserialization.AdditionalClassPartsProvider
 import org.jetbrains.kotlin.descriptors.deserialization.PlatformDependentDeclarationFilter
 import org.jetbrains.kotlin.incremental.components.LookupTracker
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -32,7 +33,6 @@ import org.jetbrains.kotlin.resolve.scopes.ChainedMemberScope
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.serialization.ClassData
 import org.jetbrains.kotlin.serialization.ClassDataWithSource
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
 import org.jetbrains.kotlin.storage.StorageManager
 import java.io.InputStream
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverImpl.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverImpl.kt
index 548a11393b8..582f29e176b 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverImpl.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverImpl.kt
@@ -16,11 +16,11 @@
 
 package org.jetbrains.kotlin.serialization.deserialization
 
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName
 import java.util.*
 
 class NameResolverImpl(
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt
index 60601961477..969bfb89685 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoBasedClassDataFinder.kt
@@ -17,10 +17,10 @@
 package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.kotlin.descriptors.SourceElement
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.serialization.ClassData
 import org.jetbrains.kotlin.serialization.ClassDataWithSource
-import org.jetbrains.kotlin.serialization.ProtoBuf
 
 class ProtoBasedClassDataFinder(
         proto: ProtoBuf.PackageFragment,
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt
index ac2ce0d02c8..32a00040dff 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt
@@ -17,10 +17,10 @@
 package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.kotlin.descriptors.SourceElement
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.ProtoBuf
 
 sealed class ProtoContainer(
         val nameResolver: NameResolver,
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoEnumFlags.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoEnumFlags.kt
index ce3107d8a58..df97ffd52cd 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoEnumFlags.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoEnumFlags.kt
@@ -17,8 +17,8 @@
 package org.jetbrains.kotlin.serialization.deserialization
 
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter
 import org.jetbrains.kotlin.types.Variance
 
 object ProtoEnumFlags {
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
index f11565e58e6..c4549745219 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt
@@ -21,9 +21,9 @@ import org.jetbrains.kotlin.builtins.transformRuntimeFunctionTypeToSuspendFuncti
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationWithTarget
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedAnnotationsWithPossibleTargets
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedTypeParameterDescriptor
 import org.jetbrains.kotlin.types.*
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeTable.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeTable.kt
index 90790723a24..2fe2e3af5e3 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeTable.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeTable.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.metadata.ProtoBuf
 
 class TypeTable(typeTable: ProtoBuf.TypeTable) {
     val types: List = run {
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
index 60956251140..def4fdb4052 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt
@@ -23,10 +23,10 @@ import org.jetbrains.kotlin.descriptors.deserialization.AdditionalClassPartsProv
 import org.jetbrains.kotlin.descriptors.deserialization.ClassDescriptorFactory
 import org.jetbrains.kotlin.descriptors.deserialization.PlatformDependentDeclarationFilter
 import org.jetbrains.kotlin.incremental.components.LookupTracker
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite
 import org.jetbrains.kotlin.resolve.constants.ConstantValue
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.VersionRequirementTable
 import org.jetbrains.kotlin.storage.StorageManager
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
index 0603720fad5..01207b0b918 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt
@@ -12,6 +12,7 @@ import org.jetbrains.kotlin.descriptors.impl.EnumEntrySyntheticClassDescriptor
 import org.jetbrains.kotlin.incremental.components.LookupLocation
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.incremental.record
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.DescriptorFactory
 import org.jetbrains.kotlin.resolve.NonReportingOverrideStrategy
@@ -22,7 +23,6 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.resolve.scopes.StaticScopeForKotlinEnum
 import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.*
 import org.jetbrains.kotlin.types.AbstractClassTypeConstructor
 import org.jetbrains.kotlin.types.KotlinType
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberDescriptor.kt
index be54e0826c7..f8798fa3815 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberDescriptor.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberDescriptor.kt
@@ -19,10 +19,10 @@ package org.jetbrains.kotlin.serialization.deserialization.descriptors
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.impl.*
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.protobuf.MessageLite
 import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.IncompatibleVersionErrorData
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.kotlin.serialization.deserialization.TypeTable
@@ -92,24 +92,24 @@ class DeserializedSimpleFunctionDescriptor(
 }
 
 class DeserializedPropertyDescriptor(
-        containingDeclaration: DeclarationDescriptor,
-        original: PropertyDescriptor?,
-        annotations: Annotations,
-        modality: Modality,
-        visibility: Visibility,
-        isVar: Boolean,
-        name: Name,
-        kind: CallableMemberDescriptor.Kind,
-        isLateInit: Boolean,
-        isConst: Boolean,
-        isExternal: Boolean,
-        isDelegated: Boolean,
-        isExpect: Boolean,
-        override val proto: ProtoBuf.Property,
-        override val nameResolver: NameResolver,
-        override val typeTable: TypeTable,
-        override val versionRequirementTable: VersionRequirementTable,
-        override val containerSource: DeserializedContainerSource?
+    containingDeclaration: DeclarationDescriptor,
+    original: PropertyDescriptor?,
+    annotations: Annotations,
+    modality: Modality,
+    visibility: Visibility,
+    isVar: Boolean,
+    name: Name,
+    kind: CallableMemberDescriptor.Kind,
+    isLateInit: Boolean,
+    isConst: Boolean,
+    isExternal: Boolean,
+    isDelegated: Boolean,
+    isExpect: Boolean,
+    override val proto: ProtoBuf.Property,
+    override val nameResolver: NameResolver,
+    override val typeTable: TypeTable,
+    override val versionRequirementTable: VersionRequirementTable,
+    override val containerSource: DeserializedContainerSource?
 ) : DeserializedCallableMemberDescriptor, PropertyDescriptorImpl(
         containingDeclaration, original, annotations, modality, visibility, isVar, name, kind, SourceElement.NO_SOURCE,
         isLateInit, isConst, isExpect, false, isExternal, isDelegated
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
index d01c7bb5d00..78efb96361f 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.incremental.components.LookupLocation
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.protobuf.AbstractMessageLite
@@ -26,7 +27,6 @@ import org.jetbrains.kotlin.protobuf.Parser
 import org.jetbrains.kotlin.resolve.MemberComparator
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
 import org.jetbrains.kotlin.storage.getValue
 import org.jetbrains.kotlin.utils.Printer
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
index 338499ac26a..946ff9d39e1 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt
@@ -22,10 +22,10 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.incremental.components.LookupLocation
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.incremental.record
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.kotlin.serialization.deserialization.TypeTable
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.kt
index e5cc0e4db9c..fbdbea40921 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.kt
@@ -20,8 +20,8 @@ import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.descriptors.SupertypeLoopChecker
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.impl.AbstractLazyTypeParameterDescriptor
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext
 import org.jetbrains.kotlin.serialization.deserialization.ProtoEnumFlags
 import org.jetbrains.kotlin.serialization.deserialization.upperBounds
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/VersionRequirement.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/VersionRequirement.kt
index 13b0e29eef7..1c352965095 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/VersionRequirement.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/VersionRequirement.kt
@@ -16,8 +16,8 @@
 
 package org.jetbrains.kotlin.serialization.deserialization.descriptors
 
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.protobuf.MessageLite
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 
 class VersionRequirementTable private constructor(private val infos: List) {
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoTypeTableUtil.kt b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoTypeTableUtil.kt
index 5d5b7c27cd3..cb85a54266a 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoTypeTableUtil.kt
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/protoTypeTableUtil.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.serialization.deserialization
 
-import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.utils.ifEmpty
 
 fun ProtoBuf.Class.supertypes(typeTable: TypeTable): List {
diff --git a/core/metadata.jvm/src/jvm_metadata.proto b/core/metadata.jvm/src/jvm_metadata.proto
index 1aa1964a9c2..59833c9ddbd 100644
--- a/core/metadata.jvm/src/jvm_metadata.proto
+++ b/core/metadata.jvm/src/jvm_metadata.proto
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.serialization.jvm;
+package org.jetbrains.kotlin.metadata.jvm;
 
 import "core/metadata/src/ext_options.proto";
 import "core/metadata/src/metadata.proto";
diff --git a/core/metadata.jvm/src/jvm_module.proto b/core/metadata.jvm/src/jvm_module.proto
index 26638f0f884..0ebabc7ff87 100644
--- a/core/metadata.jvm/src/jvm_module.proto
+++ b/core/metadata.jvm/src/jvm_module.proto
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.serialization.jvm;
+package org.jetbrains.kotlin.metadata.jvm;
 
 import "core/metadata/src/metadata.proto";
 
diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmModuleProtoBuf.java b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/JvmModuleProtoBuf.java
similarity index 84%
rename from core/metadata.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmModuleProtoBuf.java
rename to core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/JvmModuleProtoBuf.java
index 70de60896b9..0c616242fa7 100644
--- a/core/metadata.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmModuleProtoBuf.java
+++ b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/JvmModuleProtoBuf.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: core/metadata.jvm/src/jvm_module.proto
 
-package org.jetbrains.kotlin.serialization.jvm;
+package org.jetbrains.kotlin.metadata.jvm;
 
 public final class JvmModuleProtoBuf {
   private JvmModuleProtoBuf() {}
@@ -9,28 +9,28 @@ public final class JvmModuleProtoBuf {
       org.jetbrains.kotlin.protobuf.ExtensionRegistryLite registry) {
   }
   public interface ModuleOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.Module)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.jvm.Module)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
      * 

      */
-    java.util.List 
+    java.util.List 
         getPackagePartsList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
      * 

      */
-    org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getPackageParts(int index);
+    org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts getPackageParts(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
@@ -39,24 +39,24 @@ public final class JvmModuleProtoBuf {
     int getPackagePartsCount();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
      * 

      */
-    java.util.List 
+    java.util.List 
         getMetadataPartsList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
      * 

      */
-    org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getMetadataParts(int index);
+    org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts getMetadataParts(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
@@ -104,42 +104,42 @@ public final class JvmModuleProtoBuf {
         getJvmPackageNameBytes(int index);
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
      */
     boolean hasStringTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStringTable();
+    org.jetbrains.kotlin.metadata.ProtoBuf.StringTable getStringTable();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
      */
     boolean hasQualifiedNameTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNameTable();
+    org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable getQualifiedNameTable();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    java.util.List 
+    java.util.List 
         getAnnotationList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
@@ -148,11 +148,11 @@ public final class JvmModuleProtoBuf {
     int getAnnotationCount();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.Module}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.Module}
    */
   public static final class Module extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.Module)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.jvm.Module)
       ModuleOrBuilder {
     // Use Module.newBuilder() to construct.
     private Module(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -199,18 +199,18 @@ public final class JvmModuleProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                packageParts_ = new java.util.ArrayList();
+                packageParts_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              packageParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
+              packageParts_.add(input.readMessage(org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
               break;
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                metadataParts_ = new java.util.ArrayList();
+                metadataParts_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              metadataParts_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
+              metadataParts_.add(input.readMessage(org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts.PARSER, extensionRegistry));
               break;
             }
             case 26: {
@@ -223,11 +223,11 @@ public final class JvmModuleProtoBuf {
               break;
             }
             case 34: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = stringTable_.toBuilder();
               }
-              stringTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.PARSER, extensionRegistry);
+              stringTable_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(stringTable_);
                 stringTable_ = subBuilder.buildPartial();
@@ -236,11 +236,11 @@ public final class JvmModuleProtoBuf {
               break;
             }
             case 42: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = qualifiedNameTable_.toBuilder();
               }
-              qualifiedNameTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.PARSER, extensionRegistry);
+              qualifiedNameTable_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(qualifiedNameTable_);
                 qualifiedNameTable_ = subBuilder.buildPartial();
@@ -250,10 +250,10 @@ public final class JvmModuleProtoBuf {
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                annotation_ = new java.util.ArrayList();
+                annotation_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              annotation_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.PARSER, extensionRegistry));
+              annotation_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.PARSER, extensionRegistry));
               break;
             }
           }
@@ -303,30 +303,30 @@ public final class JvmModuleProtoBuf {
 
     private int bitField0_;
     public static final int PACKAGE_PARTS_FIELD_NUMBER = 1;
-    private java.util.List packageParts_;
+    private java.util.List packageParts_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
      * 

      */
-    public java.util.List getPackagePartsList() {
+    public java.util.List getPackagePartsList() {
       return packageParts_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
      * 

      */
-    public java.util.List 
+    public java.util.List 
         getPackagePartsOrBuilderList() {
       return packageParts_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
@@ -336,52 +336,52 @@ public final class JvmModuleProtoBuf {
       return packageParts_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
      * 

      */
-    public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getPackageParts(int index) {
+    public org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts getPackageParts(int index) {
       return packageParts_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
      *
      * 
      * Names of .class files for each package
      * 

      */
-    public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
+    public org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackagePartsOrBuilder getPackagePartsOrBuilder(
         int index) {
       return packageParts_.get(index);
     }
 
     public static final int METADATA_PARTS_FIELD_NUMBER = 2;
-    private java.util.List metadataParts_;
+    private java.util.List metadataParts_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
      * 

      */
-    public java.util.List getMetadataPartsList() {
+    public java.util.List getMetadataPartsList() {
       return metadataParts_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
      * 

      */
-    public java.util.List 
+    public java.util.List 
         getMetadataPartsOrBuilderList() {
       return metadataParts_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
@@ -391,23 +391,23 @@ public final class JvmModuleProtoBuf {
       return metadataParts_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
      * 

      */
-    public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getMetadataParts(int index) {
+    public org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts getMetadataParts(int index) {
       return metadataParts_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
      *
      * 
      * Names of .kotlin_metadata files for each package
      * 

      */
-    public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
+    public org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackagePartsOrBuilder getMetadataPartsOrBuilder(
         int index) {
       return metadataParts_.get(index);
     }
@@ -462,60 +462,60 @@ public final class JvmModuleProtoBuf {
     }
 
     public static final int STRING_TABLE_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.StringTable stringTable_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.StringTable stringTable_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
      */
     public boolean hasStringTable() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStringTable() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.StringTable getStringTable() {
       return stringTable_;
     }
 
     public static final int QUALIFIED_NAME_TABLE_FIELD_NUMBER = 5;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable qualifiedNameTable_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable qualifiedNameTable_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
      */
     public boolean hasQualifiedNameTable() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNameTable() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable getQualifiedNameTable() {
       return qualifiedNameTable_;
     }
 
     public static final int ANNOTATION_FIELD_NUMBER = 6;
-    private java.util.List annotation_;
+    private java.util.List annotation_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public java.util.List getAnnotationList() {
+    public java.util.List getAnnotationList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public java.util.List 
+    public java.util.List 
         getAnnotationOrBuilderList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
@@ -525,23 +525,23 @@ public final class JvmModuleProtoBuf {
       return annotation_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation(int index) {
       return annotation_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
         int index) {
       return annotation_.get(index);
     }
@@ -550,8 +550,8 @@ public final class JvmModuleProtoBuf {
       packageParts_ = java.util.Collections.emptyList();
       metadataParts_ = java.util.Collections.emptyList();
       jvmPackageName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
-      stringTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
-      qualifiedNameTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
+      stringTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance();
+      qualifiedNameTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance();
       annotation_ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
@@ -659,53 +659,53 @@ public final class JvmModuleProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -714,21 +714,21 @@ public final class JvmModuleProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.Module}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.Module}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module, Builder>
+          org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.Module)
-        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.ModuleOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.jvm.Module)
+        org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.ModuleOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -747,9 +747,9 @@ public final class JvmModuleProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000002);
         jvmPackageName_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000004);
-        stringTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
+        stringTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000008);
-        qualifiedNameTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
+        qualifiedNameTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000010);
         annotation_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000020);
@@ -760,20 +760,20 @@ public final class JvmModuleProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module build() {
-        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module result = buildPartial();
+      public org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module build() {
+        org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module result = new org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module(this);
+      public org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module buildPartial() {
+        org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module result = new org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -808,8 +808,8 @@ public final class JvmModuleProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module other) {
+        if (other == org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module.getDefaultInstance()) return this;
         if (!other.packageParts_.isEmpty()) {
           if (packageParts_.isEmpty()) {
             packageParts_ = other.packageParts_;
@@ -893,11 +893,11 @@ public final class JvmModuleProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module parsedMessage = null;
+        org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.Module) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.Module) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -908,27 +908,27 @@ public final class JvmModuleProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List packageParts_ =
+      private java.util.List packageParts_ =
         java.util.Collections.emptyList();
       private void ensurePackagePartsIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          packageParts_ = new java.util.ArrayList(packageParts_);
+          packageParts_ = new java.util.ArrayList(packageParts_);
           bitField0_ |= 0x00000001;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
-      public java.util.List getPackagePartsList() {
+      public java.util.List getPackagePartsList() {
         return java.util.Collections.unmodifiableList(packageParts_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
@@ -938,24 +938,24 @@ public final class JvmModuleProtoBuf {
         return packageParts_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getPackageParts(int index) {
+      public org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts getPackageParts(int index) {
         return packageParts_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
       public Builder setPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts value) {
+          int index, org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -965,27 +965,27 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
       public Builder setPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         ensurePackagePartsIsMutable();
         packageParts_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
-      public Builder addPackageParts(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts value) {
+      public Builder addPackageParts(org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -995,14 +995,14 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
       public Builder addPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts value) {
+          int index, org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1012,42 +1012,42 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
       public Builder addPackageParts(
-          org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         ensurePackagePartsIsMutable();
         packageParts_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
       public Builder addPackageParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         ensurePackagePartsIsMutable();
         packageParts_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
        * 

        */
       public Builder addAllPackageParts(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensurePackagePartsIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, packageParts_);
@@ -1055,7 +1055,7 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
@@ -1068,7 +1068,7 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts package_parts = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts package_parts = 1;
        *
        * 
        * Names of .class files for each package
@@ -1081,27 +1081,27 @@ public final class JvmModuleProtoBuf {
         return this;
       }
 
-      private java.util.List metadataParts_ =
+      private java.util.List metadataParts_ =
         java.util.Collections.emptyList();
       private void ensureMetadataPartsIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          metadataParts_ = new java.util.ArrayList(metadataParts_);
+          metadataParts_ = new java.util.ArrayList(metadataParts_);
           bitField0_ |= 0x00000002;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
-      public java.util.List getMetadataPartsList() {
+      public java.util.List getMetadataPartsList() {
         return java.util.Collections.unmodifiableList(metadataParts_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
@@ -1111,24 +1111,24 @@ public final class JvmModuleProtoBuf {
         return metadataParts_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getMetadataParts(int index) {
+      public org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts getMetadataParts(int index) {
         return metadataParts_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
       public Builder setMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts value) {
+          int index, org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1138,27 +1138,27 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
       public Builder setMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         ensureMetadataPartsIsMutable();
         metadataParts_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
-      public Builder addMetadataParts(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts value) {
+      public Builder addMetadataParts(org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1168,14 +1168,14 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
       public Builder addMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts value) {
+          int index, org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1185,42 +1185,42 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
       public Builder addMetadataParts(
-          org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         ensureMetadataPartsIsMutable();
         metadataParts_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
       public Builder addMetadataParts(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts.Builder builderForValue) {
         ensureMetadataPartsIsMutable();
         metadataParts_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
        * 

        */
       public Builder addAllMetadataParts(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureMetadataPartsIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, metadataParts_);
@@ -1228,7 +1228,7 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
@@ -1241,7 +1241,7 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.PackageParts metadata_parts = 2;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.PackageParts metadata_parts = 2;
        *
        * 
        * Names of .kotlin_metadata files for each package
@@ -1392,23 +1392,23 @@ public final class JvmModuleProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.StringTable stringTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.StringTable stringTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
       public boolean hasStringTable() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStringTable() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.StringTable getStringTable() {
         return stringTable_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
-      public Builder setStringTable(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable value) {
+      public Builder setStringTable(org.jetbrains.kotlin.metadata.ProtoBuf.StringTable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1418,23 +1418,23 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
       public Builder setStringTable(
-          org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.Builder builderForValue) {
         stringTable_ = builderForValue.build();
 
         bitField0_ |= 0x00000008;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
-      public Builder mergeStringTable(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable value) {
+      public Builder mergeStringTable(org.jetbrains.kotlin.metadata.ProtoBuf.StringTable value) {
         if (((bitField0_ & 0x00000008) == 0x00000008) &&
-            stringTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance()) {
+            stringTable_ != org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance()) {
           stringTable_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.newBuilder(stringTable_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.newBuilder(stringTable_).mergeFrom(value).buildPartial();
         } else {
           stringTable_ = value;
         }
@@ -1443,32 +1443,32 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable string_table = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable string_table = 4;
        */
       public Builder clearStringTable() {
-        stringTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
+        stringTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable qualifiedNameTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable qualifiedNameTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
       public boolean hasQualifiedNameTable() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNameTable() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable getQualifiedNameTable() {
         return qualifiedNameTable_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
-      public Builder setQualifiedNameTable(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable value) {
+      public Builder setQualifiedNameTable(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1478,23 +1478,23 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
       public Builder setQualifiedNameTable(
-          org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.Builder builderForValue) {
         qualifiedNameTable_ = builderForValue.build();
 
         bitField0_ |= 0x00000010;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
-      public Builder mergeQualifiedNameTable(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable value) {
+      public Builder mergeQualifiedNameTable(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable value) {
         if (((bitField0_ & 0x00000010) == 0x00000010) &&
-            qualifiedNameTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance()) {
+            qualifiedNameTable_ != org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance()) {
           qualifiedNameTable_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.newBuilder(qualifiedNameTable_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.newBuilder(qualifiedNameTable_).mergeFrom(value).buildPartial();
         } else {
           qualifiedNameTable_ = value;
         }
@@ -1503,36 +1503,36 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_name_table = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_name_table = 5;
        */
       public Builder clearQualifiedNameTable() {
-        qualifiedNameTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
+        qualifiedNameTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
-      private java.util.List annotation_ =
+      private java.util.List annotation_ =
         java.util.Collections.emptyList();
       private void ensureAnnotationIsMutable() {
         if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          annotation_ = new java.util.ArrayList(annotation_);
+          annotation_ = new java.util.ArrayList(annotation_);
           bitField0_ |= 0x00000020;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public java.util.List getAnnotationList() {
+      public java.util.List getAnnotationList() {
         return java.util.Collections.unmodifiableList(annotation_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
@@ -1542,24 +1542,24 @@ public final class JvmModuleProtoBuf {
         return annotation_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation(int index) {
         return annotation_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1569,27 +1569,27 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Builder builderForValue) {
         ensureAnnotationIsMutable();
         annotation_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public Builder addAnnotation(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
+      public Builder addAnnotation(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1599,14 +1599,14 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1616,42 +1616,42 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAnnotation(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Builder builderForValue) {
         ensureAnnotationIsMutable();
         annotation_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Builder builderForValue) {
         ensureAnnotationIsMutable();
         annotation_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAllAnnotation(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureAnnotationIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, annotation_);
@@ -1659,7 +1659,7 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
@@ -1672,7 +1672,7 @@ public final class JvmModuleProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
@@ -1685,7 +1685,7 @@ public final class JvmModuleProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.Module)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.jvm.Module)
     }
 
     static {
@@ -1693,11 +1693,11 @@ public final class JvmModuleProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.Module)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.jvm.Module)
   }
 
   public interface PackagePartsOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.jvm.PackageParts)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
@@ -1900,11 +1900,11 @@ public final class JvmModuleProtoBuf {
     int getClassWithJvmPackageNamePackageId(int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.PackageParts}
    */
   public static final class PackageParts extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.jvm.PackageParts)
       PackagePartsOrBuilder {
     // Use PackageParts.newBuilder() to construct.
     private PackageParts(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -2481,53 +2481,53 @@ public final class JvmModuleProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2536,21 +2536,21 @@ public final class JvmModuleProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.PackageParts}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.PackageParts}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts, Builder>
+          org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.PackageParts)
-        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackagePartsOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.jvm.PackageParts)
+        org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackagePartsOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2582,20 +2582,20 @@ public final class JvmModuleProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts build() {
-        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts result = buildPartial();
+      public org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts build() {
+        org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts result = new org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts(this);
+      public org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts buildPartial() {
+        org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts result = new org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2631,8 +2631,8 @@ public final class JvmModuleProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts other) {
+        if (other == org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts.getDefaultInstance()) return this;
         if (other.hasPackageFqName()) {
           bitField0_ |= 0x00000001;
           packageFqName_ = other.packageFqName_;
@@ -2705,11 +2705,11 @@ public final class JvmModuleProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts parsedMessage = null;
+        org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmModuleProtoBuf.PackageParts) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.jvm.JvmModuleProtoBuf.PackageParts) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -3440,7 +3440,7 @@ public final class JvmModuleProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.jvm.PackageParts)
     }
 
     static {
@@ -3448,7 +3448,7 @@ public final class JvmModuleProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.PackageParts)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.jvm.PackageParts)
   }
 
 
diff --git a/core/metadata.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/JvmProtoBuf.java
similarity index 75%
rename from core/metadata.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
rename to core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/JvmProtoBuf.java
index ee79c51d3f9..1f06176aae0 100644
--- a/core/metadata.jvm/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBuf.java
+++ b/core/metadata.jvm/src/org/jetbrains/kotlin/metadata/jvm/JvmProtoBuf.java
@@ -1,40 +1,40 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: core/metadata.jvm/src/jvm_metadata.proto
 
-package org.jetbrains.kotlin.serialization.jvm;
+package org.jetbrains.kotlin.metadata.jvm;
 
 public final class JvmProtoBuf {
   private JvmProtoBuf() {}
   public static void registerAllExtensions(
       org.jetbrains.kotlin.protobuf.ExtensionRegistryLite registry) {
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.constructorSignature);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.methodSignature);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.lambdaClassOriginName);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.propertySignature);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.typeAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.isRaw);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.typeParameterAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.classModuleName);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.classLocalVariable);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.anonymousObjectOriginName);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.packageModuleName);
-    registry.add(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.packageLocalVariable);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.constructorSignature);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.methodSignature);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.lambdaClassOriginName);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.propertySignature);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.typeAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.isRaw);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.typeParameterAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.classModuleName);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.classLocalVariable);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.anonymousObjectOriginName);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.packageModuleName);
+    registry.add(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.packageLocalVariable);
   }
   public interface StringTableTypesOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.jvm.StringTableTypes)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
-    java.util.List 
+    java.util.List 
         getRecordList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
-    org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record getRecord(int index);
+    org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record getRecord(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
     int getRecordCount();
 
@@ -64,11 +64,11 @@ public final class JvmProtoBuf {
     int getLocalName(int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.StringTableTypes}
    */
   public static final class StringTableTypes extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.jvm.StringTableTypes)
       StringTableTypesOrBuilder {
     // Use StringTableTypes.newBuilder() to construct.
     private StringTableTypes(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -115,10 +115,10 @@ public final class JvmProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                record_ = new java.util.ArrayList();
+                record_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              record_.add(input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.PARSER, extensionRegistry));
+              record_.add(input.readMessage(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.PARSER, extensionRegistry));
               break;
             }
             case 40: {
@@ -182,7 +182,7 @@ public final class JvmProtoBuf {
     }
 
     public interface RecordOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record)
         org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
       /**
@@ -246,7 +246,7 @@ public final class JvmProtoBuf {
           getStringBytes();
 
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+       * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
        *
        * 
        * Perform a described operation on the string
@@ -254,13 +254,13 @@ public final class JvmProtoBuf {
        */
       boolean hasOperation();
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+       * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
        *
        * 
        * Perform a described operation on the string
        * 

        */
-      org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation getOperation();
+      org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation getOperation();
 
       /**
        * repeated int32 substring_index = 4 [packed = true];
@@ -322,11 +322,11 @@ public final class JvmProtoBuf {
       int getReplaceChar(int index);
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record}
      */
     public static final class Record extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record)
         RecordOrBuilder {
       // Use Record.newBuilder() to construct.
       private Record(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -383,7 +383,7 @@ public final class JvmProtoBuf {
               }
               case 24: {
                 int rawValue = input.readEnum();
-                org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation value = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.valueOf(rawValue);
+                org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation value = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.valueOf(rawValue);
                 if (value == null) {
                   unknownFieldsCodedOutput.writeRawVarint32(tag);
                   unknownFieldsCodedOutput.writeRawVarint32(rawValue);
@@ -481,7 +481,7 @@ public final class JvmProtoBuf {
       }
 
       /**
-       * Protobuf enum {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation}
+       * Protobuf enum {@code org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation}
        */
       public enum Operation
           implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -562,7 +562,7 @@ public final class JvmProtoBuf {
           this.value = value;
         }
 
-        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation)
+        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation)
       }
 
       private int bitField0_;
@@ -667,9 +667,9 @@ public final class JvmProtoBuf {
       }
 
       public static final int OPERATION_FIELD_NUMBER = 3;
-      private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation operation_;
+      private org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation operation_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+       * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
        *
        * 
        * Perform a described operation on the string
@@ -679,13 +679,13 @@ public final class JvmProtoBuf {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+       * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
        *
        * 
        * Perform a described operation on the string
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation getOperation() {
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation getOperation() {
         return operation_;
       }
 
@@ -772,7 +772,7 @@ public final class JvmProtoBuf {
         range_ = 1;
         predefinedIndex_ = 0;
         string_ = "";
-        operation_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.NONE;
+        operation_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.NONE;
         substringIndex_ = java.util.Collections.emptyList();
         replaceChar_ = java.util.Collections.emptyList();
       }
@@ -880,53 +880,53 @@ public final class JvmProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(
+      public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(
           org.jetbrains.kotlin.protobuf.ByteString data)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(
+      public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(
           org.jetbrains.kotlin.protobuf.ByteString data,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(byte[] data)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(
+      public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(
           byte[] data,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(
+      public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(
           java.io.InputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseFrom(input, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record parseDelimitedFrom(
+      public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record parseDelimitedFrom(
           java.io.InputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(
+      public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(
+      public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record parseFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -935,21 +935,21 @@ public final class JvmProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
 
       /**
-       * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record}
+       * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record}
        */
       public static final class Builder extends
           org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-            org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record, Builder>
+            org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record, Builder>
           implements
-          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
-          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.RecordOrBuilder {
-        // Construct using org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.newBuilder()
+          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record)
+          org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.RecordOrBuilder {
+        // Construct using org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -968,7 +968,7 @@ public final class JvmProtoBuf {
           bitField0_ = (bitField0_ & ~0x00000002);
           string_ = "";
           bitField0_ = (bitField0_ & ~0x00000004);
-          operation_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.NONE;
+          operation_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.NONE;
           bitField0_ = (bitField0_ & ~0x00000008);
           substringIndex_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000010);
@@ -981,20 +981,20 @@ public final class JvmProtoBuf {
           return create().mergeFrom(buildPartial());
         }
 
-        public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record getDefaultInstanceForType() {
-          return org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.getDefaultInstance();
+        public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.getDefaultInstance();
         }
 
-        public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record build() {
-          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record result = buildPartial();
+        public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record build() {
+          org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record buildPartial() {
-          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record result = new org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record(this);
+        public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record buildPartial() {
+          org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record result = new org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1027,8 +1027,8 @@ public final class JvmProtoBuf {
           return result;
         }
 
-        public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record other) {
-          if (other == org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record other) {
+          if (other == org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.getDefaultInstance()) return this;
           if (other.hasRange()) {
             setRange(other.getRange());
           }
@@ -1076,11 +1076,11 @@ public final class JvmProtoBuf {
             org.jetbrains.kotlin.protobuf.CodedInputStream input,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record parsedMessage = null;
+          org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -1287,9 +1287,9 @@ public final class JvmProtoBuf {
           return this;
         }
 
-        private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation operation_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.NONE;
+        private org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation operation_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.NONE;
         /**
-         * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+         * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
          *
          * 
          * Perform a described operation on the string
@@ -1299,23 +1299,23 @@ public final class JvmProtoBuf {
           return ((bitField0_ & 0x00000008) == 0x00000008);
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+         * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
          *
          * 
          * Perform a described operation on the string
          * 

          */
-        public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation getOperation() {
+        public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation getOperation() {
           return operation_;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+         * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
          *
          * 
          * Perform a described operation on the string
          * 

          */
-        public Builder setOperation(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation value) {
+        public Builder setOperation(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -1325,7 +1325,7 @@ public final class JvmProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
+         * optional .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record.Operation operation = 3 [default = NONE];
          *
          * 
          * Perform a described operation on the string
@@ -1333,7 +1333,7 @@ public final class JvmProtoBuf {
          */
         public Builder clearOperation() {
           bitField0_ = (bitField0_ & ~0x00000008);
-          operation_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.NONE;
+          operation_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Operation.NONE;
           
           return this;
         }
@@ -1547,7 +1547,7 @@ public final class JvmProtoBuf {
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record)
       }
 
       static {
@@ -1555,40 +1555,40 @@ public final class JvmProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record)
     }
 
     public static final int RECORD_FIELD_NUMBER = 1;
-    private java.util.List record_;
+    private java.util.List record_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
-    public java.util.List getRecordList() {
+    public java.util.List getRecordList() {
       return record_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getRecordOrBuilderList() {
       return record_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
     public int getRecordCount() {
       return record_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
-    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record getRecord(int index) {
+    public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record getRecord(int index) {
       return record_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+     * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
      */
-    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.RecordOrBuilder getRecordOrBuilder(
+    public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.RecordOrBuilder getRecordOrBuilder(
         int index) {
       return record_.get(index);
     }
@@ -1694,53 +1694,53 @@ public final class JvmProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1749,21 +1749,21 @@ public final class JvmProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.StringTableTypes}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.StringTableTypes}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes, Builder>
+          org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypesOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.jvm.StringTableTypes)
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypesOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1787,20 +1787,20 @@ public final class JvmProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes build() {
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes result = buildPartial();
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes build() {
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes result = new org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes(this);
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes buildPartial() {
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes result = new org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           record_ = java.util.Collections.unmodifiableList(record_);
@@ -1815,8 +1815,8 @@ public final class JvmProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes other) {
+        if (other == org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.getDefaultInstance()) return this;
         if (!other.record_.isEmpty()) {
           if (record_.isEmpty()) {
             record_ = other.record_;
@@ -1850,11 +1850,11 @@ public final class JvmProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes parsedMessage = null;
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -1865,38 +1865,38 @@ public final class JvmProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List record_ =
+      private java.util.List record_ =
         java.util.Collections.emptyList();
       private void ensureRecordIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          record_ = new java.util.ArrayList(record_);
+          record_ = new java.util.ArrayList(record_);
           bitField0_ |= 0x00000001;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
-      public java.util.List getRecordList() {
+      public java.util.List getRecordList() {
         return java.util.Collections.unmodifiableList(record_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public int getRecordCount() {
         return record_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record getRecord(int index) {
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record getRecord(int index) {
         return record_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder setRecord(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record value) {
+          int index, org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1906,19 +1906,19 @@ public final class JvmProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder setRecord(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Builder builderForValue) {
         ensureRecordIsMutable();
         record_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
-      public Builder addRecord(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record value) {
+      public Builder addRecord(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1928,10 +1928,10 @@ public final class JvmProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder addRecord(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record value) {
+          int index, org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1941,30 +1941,30 @@ public final class JvmProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder addRecord(
-          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Builder builderForValue) {
         ensureRecordIsMutable();
         record_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder addRecord(
-          int index, org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.StringTableTypes.Record.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.StringTableTypes.Record.Builder builderForValue) {
         ensureRecordIsMutable();
         record_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder addAllRecord(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureRecordIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, record_);
@@ -1972,7 +1972,7 @@ public final class JvmProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder clearRecord() {
         record_ = java.util.Collections.emptyList();
@@ -1981,7 +1981,7 @@ public final class JvmProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.jvm.StringTableTypes.Record record = 1;
+       * repeated .org.jetbrains.kotlin.metadata.jvm.StringTableTypes.Record record = 1;
        */
       public Builder removeRecord(int index) {
         ensureRecordIsMutable();
@@ -2084,7 +2084,7 @@ public final class JvmProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.jvm.StringTableTypes)
     }
 
     static {
@@ -2092,11 +2092,11 @@ public final class JvmProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.StringTableTypes)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.jvm.StringTableTypes)
   }
 
   public interface JvmMethodSignatureOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
@@ -2126,11 +2126,11 @@ public final class JvmProtoBuf {
     int getDesc();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature}
    */
   public static final class JvmMethodSignature extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature)
       JvmMethodSignatureOrBuilder {
     // Use JvmMethodSignature.newBuilder() to construct.
     private JvmMethodSignature(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -2309,53 +2309,53 @@ public final class JvmProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2364,21 +2364,21 @@ public final class JvmProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature, Builder>
+          org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignatureOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature)
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignatureOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2402,20 +2402,20 @@ public final class JvmProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature build() {
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature result = buildPartial();
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature build() {
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature result = new org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature(this);
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature buildPartial() {
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature result = new org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2430,8 +2430,8 @@ public final class JvmProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature other) {
+        if (other == org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance()) return this;
         if (other.hasName()) {
           setName(other.getName());
         }
@@ -2451,11 +2451,11 @@ public final class JvmProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature parsedMessage = null;
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2546,7 +2546,7 @@ public final class JvmProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature)
     }
 
     static {
@@ -2554,11 +2554,11 @@ public final class JvmProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature)
   }
 
   public interface JvmFieldSignatureOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
@@ -2588,11 +2588,11 @@ public final class JvmProtoBuf {
     int getDesc();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature}
    */
   public static final class JvmFieldSignature extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature)
       JvmFieldSignatureOrBuilder {
     // Use JvmFieldSignature.newBuilder() to construct.
     private JvmFieldSignature(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -2771,53 +2771,53 @@ public final class JvmProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2826,21 +2826,21 @@ public final class JvmProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature, Builder>
+          org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignatureOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature)
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignatureOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2864,20 +2864,20 @@ public final class JvmProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature build() {
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature result = buildPartial();
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature build() {
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature result = new org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature(this);
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature buildPartial() {
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature result = new org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2892,8 +2892,8 @@ public final class JvmProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature other) {
+        if (other == org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance()) return this;
         if (other.hasName()) {
           setName(other.getName());
         }
@@ -2913,11 +2913,11 @@ public final class JvmProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature parsedMessage = null;
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -3008,7 +3008,7 @@ public final class JvmProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature)
     }
 
     static {
@@ -3016,24 +3016,24 @@ public final class JvmProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature)
   }
 
   public interface JvmPropertySignatureOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.jvm.JvmPropertySignature)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
      */
     boolean hasField();
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
      */
-    org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature getField();
+    org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature getField();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
      *
      * 
      * Annotations on properties are written on a synthetic method with this signature
@@ -3041,38 +3041,38 @@ public final class JvmProtoBuf {
      */
     boolean hasSyntheticMethod();
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
      *
      * 
      * Annotations on properties are written on a synthetic method with this signature
      * 

      */
-    org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getSyntheticMethod();
+    org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature getSyntheticMethod();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
      */
     boolean hasGetter();
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
      */
-    org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getGetter();
+    org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature getGetter();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
      */
     boolean hasSetter();
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
      */
-    org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getSetter();
+    org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature getSetter();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.JvmPropertySignature}
    */
   public static final class JvmPropertySignature extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.jvm.JvmPropertySignature)
       JvmPropertySignatureOrBuilder {
     // Use JvmPropertySignature.newBuilder() to construct.
     private JvmPropertySignature(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -3118,11 +3118,11 @@ public final class JvmProtoBuf {
               break;
             }
             case 10: {
-              org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = field_.toBuilder();
               }
-              field_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.PARSER, extensionRegistry);
+              field_ = input.readMessage(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(field_);
                 field_ = subBuilder.buildPartial();
@@ -3131,11 +3131,11 @@ public final class JvmProtoBuf {
               break;
             }
             case 18: {
-              org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = syntheticMethod_.toBuilder();
               }
-              syntheticMethod_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
+              syntheticMethod_ = input.readMessage(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(syntheticMethod_);
                 syntheticMethod_ = subBuilder.buildPartial();
@@ -3144,11 +3144,11 @@ public final class JvmProtoBuf {
               break;
             }
             case 26: {
-              org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = getter_.toBuilder();
               }
-              getter_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
+              getter_ = input.readMessage(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(getter_);
                 getter_ = subBuilder.buildPartial();
@@ -3157,11 +3157,11 @@ public final class JvmProtoBuf {
               break;
             }
             case 34: {
-              org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = setter_.toBuilder();
               }
-              setter_ = input.readMessage(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
+              setter_ = input.readMessage(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(setter_);
                 setter_ = subBuilder.buildPartial();
@@ -3204,24 +3204,24 @@ public final class JvmProtoBuf {
 
     private int bitField0_;
     public static final int FIELD_FIELD_NUMBER = 1;
-    private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature field_;
+    private org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature field_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
      */
     public boolean hasField() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
      */
-    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature getField() {
+    public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature getField() {
       return field_;
     }
 
     public static final int SYNTHETIC_METHOD_FIELD_NUMBER = 2;
-    private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature syntheticMethod_;
+    private org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature syntheticMethod_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
      *
      * 
      * Annotations on properties are written on a synthetic method with this signature
@@ -3231,51 +3231,51 @@ public final class JvmProtoBuf {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
      *
      * 
      * Annotations on properties are written on a synthetic method with this signature
      * 

      */
-    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getSyntheticMethod() {
+    public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature getSyntheticMethod() {
       return syntheticMethod_;
     }
 
     public static final int GETTER_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getter_;
+    private org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature getter_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
      */
     public boolean hasGetter() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
      */
-    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getGetter() {
+    public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature getGetter() {
       return getter_;
     }
 
     public static final int SETTER_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature setter_;
+    private org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature setter_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
      */
     public boolean hasSetter() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+     * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
      */
-    public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getSetter() {
+    public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature getSetter() {
       return setter_;
     }
 
     private void initFields() {
-      field_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
-      syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
-      getter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
-      setter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      field_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
+      syntheticMethod_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      getter_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      setter_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -3339,53 +3339,53 @@ public final class JvmProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
+    public static org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3394,21 +3394,21 @@ public final class JvmProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.jvm.JvmPropertySignature}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature, Builder>
+          org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignatureOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.jvm.JvmPropertySignature)
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignatureOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -3421,13 +3421,13 @@ public final class JvmProtoBuf {
 
       public Builder clear() {
         super.clear();
-        field_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
+        field_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000001);
-        syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+        syntheticMethod_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000002);
-        getter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+        getter_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000004);
-        setter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+        setter_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
@@ -3436,20 +3436,20 @@ public final class JvmProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature build() {
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature result = buildPartial();
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature build() {
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature buildPartial() {
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature result = new org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature(this);
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature buildPartial() {
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature result = new org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -3472,8 +3472,8 @@ public final class JvmProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature other) {
-        if (other == org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature other) {
+        if (other == org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance()) return this;
         if (other.hasField()) {
           mergeField(other.getField());
         }
@@ -3499,11 +3499,11 @@ public final class JvmProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature parsedMessage = null;
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -3514,23 +3514,23 @@ public final class JvmProtoBuf {
       }
       private int bitField0_;
 
-      private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature field_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature field_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
       public boolean hasField() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature getField() {
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature getField() {
         return field_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
-      public Builder setField(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature value) {
+      public Builder setField(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -3540,23 +3540,23 @@ public final class JvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
       public Builder setField(
-          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature.Builder builderForValue) {
         field_ = builderForValue.build();
 
         bitField0_ |= 0x00000001;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
-      public Builder mergeField(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature value) {
+      public Builder mergeField(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature value) {
         if (((bitField0_ & 0x00000001) == 0x00000001) &&
-            field_ != org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance()) {
+            field_ != org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance()) {
           field_ =
-            org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.newBuilder(field_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature.newBuilder(field_).mergeFrom(value).buildPartial();
         } else {
           field_ = value;
         }
@@ -3565,18 +3565,18 @@ public final class JvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmFieldSignature field = 1;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmFieldSignature field = 1;
        */
       public Builder clearField() {
-        field_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
+        field_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmFieldSignature.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature syntheticMethod_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
@@ -3586,23 +3586,23 @@ public final class JvmProtoBuf {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
        * 

        */
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getSyntheticMethod() {
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature getSyntheticMethod() {
         return syntheticMethod_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
        * 

        */
-      public Builder setSyntheticMethod(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature value) {
+      public Builder setSyntheticMethod(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -3612,31 +3612,31 @@ public final class JvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
        * 

        */
       public Builder setSyntheticMethod(
-          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
         syntheticMethod_ = builderForValue.build();
 
         bitField0_ |= 0x00000002;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
        * 

        */
-      public Builder mergeSyntheticMethod(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature value) {
+      public Builder mergeSyntheticMethod(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature value) {
         if (((bitField0_ & 0x00000002) == 0x00000002) &&
-            syntheticMethod_ != org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
+            syntheticMethod_ != org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
           syntheticMethod_ =
-            org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.newBuilder(syntheticMethod_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.newBuilder(syntheticMethod_).mergeFrom(value).buildPartial();
         } else {
           syntheticMethod_ = value;
         }
@@ -3645,36 +3645,36 @@ public final class JvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature synthetic_method = 2;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature synthetic_method = 2;
        *
        * 
        * Annotations on properties are written on a synthetic method with this signature
        * 

        */
       public Builder clearSyntheticMethod() {
-        syntheticMethod_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+        syntheticMethod_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature getter_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
       public boolean hasGetter() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getGetter() {
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature getGetter() {
         return getter_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
-      public Builder setGetter(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature value) {
+      public Builder setGetter(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -3684,23 +3684,23 @@ public final class JvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
       public Builder setGetter(
-          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
         getter_ = builderForValue.build();
 
         bitField0_ |= 0x00000004;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
-      public Builder mergeGetter(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature value) {
+      public Builder mergeGetter(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature value) {
         if (((bitField0_ & 0x00000004) == 0x00000004) &&
-            getter_ != org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
+            getter_ != org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
           getter_ =
-            org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.newBuilder(getter_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.newBuilder(getter_).mergeFrom(value).buildPartial();
         } else {
           getter_ = value;
         }
@@ -3709,32 +3709,32 @@ public final class JvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature getter = 3;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature getter = 3;
        */
       public Builder clearGetter() {
-        getter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+        getter_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature setter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature setter_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
       public boolean hasSetter() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
-      public org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature getSetter() {
+      public org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature getSetter() {
         return setter_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
-      public Builder setSetter(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature value) {
+      public Builder setSetter(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -3744,23 +3744,23 @@ public final class JvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
       public Builder setSetter(
-          org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.Builder builderForValue) {
         setter_ = builderForValue.build();
 
         bitField0_ |= 0x00000008;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
-      public Builder mergeSetter(org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature value) {
+      public Builder mergeSetter(org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature value) {
         if (((bitField0_ & 0x00000008) == 0x00000008) &&
-            setter_ != org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
+            setter_ != org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance()) {
           setter_ =
-            org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.newBuilder(setter_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.newBuilder(setter_).mergeFrom(value).buildPartial();
         } else {
           setter_ = value;
         }
@@ -3769,16 +3769,16 @@ public final class JvmProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.jvm.JvmMethodSignature setter = 4;
+       * optional .org.jetbrains.kotlin.metadata.jvm.JvmMethodSignature setter = 4;
        */
       public Builder clearSetter() {
-        setter_ = org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
+        setter_ = org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.jvm.JvmPropertySignature)
     }
 
     static {
@@ -3786,44 +3786,44 @@ public final class JvmProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.jvm.JvmPropertySignature)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.jvm.JvmPropertySignature)
   }
 
   public static final int CONSTRUCTOR_SIGNATURE_FIELD_NUMBER = 100;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Constructor { ... }
+   * extend .org.jetbrains.kotlin.metadata.Constructor { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Constructor,
-      org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature> constructorSignature = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.Constructor,
+      org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature> constructorSignature = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Constructor.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
         null,
         100,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.class);
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.class);
   public static final int METHOD_SIGNATURE_FIELD_NUMBER = 100;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Function { ... }
+   * extend .org.jetbrains.kotlin.metadata.Function { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Function,
-      org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature> methodSignature = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.Function,
+      org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature> methodSignature = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Function.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Function.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.getDefaultInstance(),
         null,
         100,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmMethodSignature.class);
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmMethodSignature.class);
   public static final int LAMBDA_CLASS_ORIGIN_NAME_FIELD_NUMBER = 101;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Function { ... }
+   * extend .org.jetbrains.kotlin.metadata.Function { ... }
    *
    * 
    * For lambdas from bodies of inline functions copied to the use site, the JVM internal name of the original
@@ -3832,10 +3832,10 @@ public final class JvmProtoBuf {
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Function,
+      org.jetbrains.kotlin.metadata.ProtoBuf.Function,
       java.lang.Integer> lambdaClassOriginName = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Function.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Function.getDefaultInstance(),
         0,
         null,
         null,
@@ -3844,46 +3844,46 @@ public final class JvmProtoBuf {
         java.lang.Integer.class);
   public static final int PROPERTY_SIGNATURE_FIELD_NUMBER = 100;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Property { ... }
+   * extend .org.jetbrains.kotlin.metadata.Property { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Property,
-      org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature> propertySignature = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.Property,
+      org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature> propertySignature = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Property.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature.getDefaultInstance(),
         null,
         100,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.JvmPropertySignature.class);
+        org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf.JvmPropertySignature.class);
   public static final int TYPE_ANNOTATION_FIELD_NUMBER = 100;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Type { ... }
+   * extend .org.jetbrains.kotlin.metadata.Type { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Type,
-      java.util.List> typeAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.Type,
+      java.util.List> typeAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
         null,
         100,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
         false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
   public static final int IS_RAW_FIELD_NUMBER = 101;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Type { ... }
+   * extend .org.jetbrains.kotlin.metadata.Type { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Type,
+      org.jetbrains.kotlin.metadata.ProtoBuf.Type,
       java.lang.Boolean> isRaw = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance(),
         false,
         null,
         null,
@@ -3892,23 +3892,23 @@ public final class JvmProtoBuf {
         java.lang.Boolean.class);
   public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 100;
   /**
-   * extend .org.jetbrains.kotlin.serialization.TypeParameter { ... }
+   * extend .org.jetbrains.kotlin.metadata.TypeParameter { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter,
-      java.util.List> typeParameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter,
+      java.util.List> typeParameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
         null,
         100,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
         false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
   public static final int CLASS_MODULE_NAME_FIELD_NUMBER = 101;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Class { ... }
+   * extend .org.jetbrains.kotlin.metadata.Class { ... }
    *
    * 
    * If absent, assumed to be JvmAbi.DEFAULT_MODULE_NAME
@@ -3916,10 +3916,10 @@ public final class JvmProtoBuf {
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Class,
+      org.jetbrains.kotlin.metadata.ProtoBuf.Class,
       java.lang.Integer> classModuleName = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Class.getDefaultInstance(),
         0,
         null,
         null,
@@ -3928,23 +3928,23 @@ public final class JvmProtoBuf {
         java.lang.Integer.class);
   public static final int CLASS_LOCAL_VARIABLE_FIELD_NUMBER = 102;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Class { ... }
+   * extend .org.jetbrains.kotlin.metadata.Class { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Class,
-      java.util.List> classLocalVariable = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.Class,
+      java.util.List> classLocalVariable = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Property.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Class.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(),
         null,
         102,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
         false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Property.class);
+        org.jetbrains.kotlin.metadata.ProtoBuf.Property.class);
   public static final int ANONYMOUS_OBJECT_ORIGIN_NAME_FIELD_NUMBER = 103;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Class { ... }
+   * extend .org.jetbrains.kotlin.metadata.Class { ... }
    *
    * 
    * For anonymous objects from bodies of inline functions copied to the use site, the JVM internal name of the original
@@ -3953,10 +3953,10 @@ public final class JvmProtoBuf {
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Class,
+      org.jetbrains.kotlin.metadata.ProtoBuf.Class,
       java.lang.Integer> anonymousObjectOriginName = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Class.getDefaultInstance(),
         0,
         null,
         null,
@@ -3965,14 +3965,14 @@ public final class JvmProtoBuf {
         java.lang.Integer.class);
   public static final int PACKAGE_MODULE_NAME_FIELD_NUMBER = 101;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Package { ... }
+   * extend .org.jetbrains.kotlin.metadata.Package { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Package,
+      org.jetbrains.kotlin.metadata.ProtoBuf.Package,
       java.lang.Integer> packageModuleName = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Package.getDefaultInstance(),
         0,
         null,
         null,
@@ -3981,20 +3981,20 @@ public final class JvmProtoBuf {
         java.lang.Integer.class);
   public static final int PACKAGE_LOCAL_VARIABLE_FIELD_NUMBER = 102;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Package { ... }
+   * extend .org.jetbrains.kotlin.metadata.Package { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Package,
-      java.util.List> packageLocalVariable = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.Package,
+      java.util.List> packageLocalVariable = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Property.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Package.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(),
         null,
         102,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
         false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Property.class);
+        org.jetbrains.kotlin.metadata.ProtoBuf.Property.class);
 
   static {
   }
diff --git a/core/metadata/src/builtins.proto b/core/metadata/src/builtins.proto
index 53d5e7f1280..5d75b79cb9d 100644
--- a/core/metadata/src/builtins.proto
+++ b/core/metadata/src/builtins.proto
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.serialization.builtins;
+package org.jetbrains.kotlin.metadata.builtins;
 
 import "core/metadata/src/metadata.proto";
 
diff --git a/core/metadata/src/ext_options.proto b/core/metadata/src/ext_options.proto
index 9eda441d28b..ed55fef0f38 100644
--- a/core/metadata/src/ext_options.proto
+++ b/core/metadata/src/ext_options.proto
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.serialization;
+package org.jetbrains.kotlin.metadata;
 
 import "google/protobuf/descriptor.proto";
 
diff --git a/core/metadata/src/metadata.proto b/core/metadata/src/metadata.proto
index ccfd4e8218d..386d8c0c652 100644
--- a/core/metadata/src/metadata.proto
+++ b/core/metadata/src/metadata.proto
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.serialization;
+package org.jetbrains.kotlin.metadata;
 
 import "core/metadata/src/ext_options.proto";
 
diff --git a/core/metadata/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/metadata/src/org/jetbrains/kotlin/metadata/ProtoBuf.java
similarity index 73%
rename from core/metadata/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
rename to core/metadata/src/org/jetbrains/kotlin/metadata/ProtoBuf.java
index 56291a10579..24bddea296d 100644
--- a/core/metadata/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
+++ b/core/metadata/src/org/jetbrains/kotlin/metadata/ProtoBuf.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: core/metadata/src/metadata.proto
 
-package org.jetbrains.kotlin.serialization;
+package org.jetbrains.kotlin.metadata;
 
 public final class ProtoBuf {
   private ProtoBuf() {}
@@ -9,7 +9,7 @@ public final class ProtoBuf {
       org.jetbrains.kotlin.protobuf.ExtensionRegistryLite registry) {
   }
   /**
-   * Protobuf enum {@code org.jetbrains.kotlin.serialization.Modality}
+   * Protobuf enum {@code org.jetbrains.kotlin.metadata.Modality}
    */
   public enum Modality
       implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -87,11 +87,11 @@ public final class ProtoBuf {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Modality)
+    // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Modality)
   }
 
   /**
-   * Protobuf enum {@code org.jetbrains.kotlin.serialization.Visibility}
+   * Protobuf enum {@code org.jetbrains.kotlin.metadata.Visibility}
    */
   public enum Visibility
       implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -187,11 +187,11 @@ public final class ProtoBuf {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Visibility)
+    // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Visibility)
   }
 
   /**
-   * Protobuf enum {@code org.jetbrains.kotlin.serialization.MemberKind}
+   * Protobuf enum {@code org.jetbrains.kotlin.metadata.MemberKind}
    */
   public enum MemberKind
       implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -269,11 +269,11 @@ public final class ProtoBuf {
       this.value = value;
     }
 
-    // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.MemberKind)
+    // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.MemberKind)
   }
 
   public interface StringTableOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.StringTable)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.StringTable)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
@@ -296,11 +296,11 @@ public final class ProtoBuf {
         getStringBytes(int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.StringTable}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.StringTable}
    */
   public static final class StringTable extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.StringTable)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.StringTable)
       StringTableOrBuilder {
     // Use StringTable.newBuilder() to construct.
     private StringTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -468,53 +468,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.StringTable parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.StringTable parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.StringTable parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.StringTable parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.StringTable parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.StringTable parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.StringTable parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.StringTable parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.StringTable parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.StringTable parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -523,21 +523,21 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.StringTable prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.StringTable}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.StringTable}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.StringTable, Builder>
+          org.jetbrains.kotlin.metadata.ProtoBuf.StringTable, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.StringTable)
-        org.jetbrains.kotlin.serialization.ProtoBuf.StringTableOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.StringTable)
+        org.jetbrains.kotlin.metadata.ProtoBuf.StringTableOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -559,20 +559,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.StringTable getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.StringTable build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.StringTable result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.StringTable build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.StringTable result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.StringTable buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.StringTable result = new org.jetbrains.kotlin.serialization.ProtoBuf.StringTable(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.StringTable buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.StringTable result = new org.jetbrains.kotlin.metadata.ProtoBuf.StringTable(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           string_ = string_.getUnmodifiableView();
@@ -582,8 +582,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.StringTable other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance()) return this;
         if (!other.string_.isEmpty()) {
           if (string_.isEmpty()) {
             string_ = other.string_;
@@ -607,11 +607,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.StringTable parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.StringTable parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.StringTable) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.StringTable) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -715,7 +715,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.StringTable)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.StringTable)
     }
 
     static {
@@ -723,33 +723,33 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.StringTable)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.StringTable)
   }
 
   public interface QualifiedNameTableOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.QualifiedNameTable)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.QualifiedNameTable)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
-    java.util.List 
+    java.util.List 
         getQualifiedNameList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
     int getQualifiedNameCount();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.QualifiedNameTable}
    */
   public static final class QualifiedNameTable extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.QualifiedNameTable)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.QualifiedNameTable)
       QualifiedNameTableOrBuilder {
     // Use QualifiedNameTable.newBuilder() to construct.
     private QualifiedNameTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -796,10 +796,10 @@ public final class ProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                qualifiedName_ = new java.util.ArrayList();
+                qualifiedName_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              qualifiedName_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.PARSER, extensionRegistry));
+              qualifiedName_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.PARSER, extensionRegistry));
               break;
             }
           }
@@ -839,7 +839,7 @@ public final class ProtoBuf {
     }
 
     public interface QualifiedNameOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName)
+        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName)
         org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
       /**
@@ -869,20 +869,20 @@ public final class ProtoBuf {
       int getShortName();
 
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
        */
       boolean hasKind();
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
        */
-      org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind();
+      org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind();
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName}
      */
     public static final class QualifiedName extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName)
+        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName)
         QualifiedNameOrBuilder {
       // Use QualifiedName.newBuilder() to construct.
       private QualifiedName(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -939,7 +939,7 @@ public final class ProtoBuf {
               }
               case 24: {
                 int rawValue = input.readEnum();
-                org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind value = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.valueOf(rawValue);
+                org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Kind value = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.valueOf(rawValue);
                 if (value == null) {
                   unknownFieldsCodedOutput.writeRawVarint32(tag);
                   unknownFieldsCodedOutput.writeRawVarint32(rawValue);
@@ -983,7 +983,7 @@ public final class ProtoBuf {
       }
 
       /**
-       * Protobuf enum {@code org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind}
+       * Protobuf enum {@code org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind}
        */
       public enum Kind
           implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -1044,7 +1044,7 @@ public final class ProtoBuf {
           this.value = value;
         }
 
-        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind)
+        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind)
       }
 
       private int bitField0_;
@@ -1087,24 +1087,24 @@ public final class ProtoBuf {
       }
 
       public static final int KIND_FIELD_NUMBER = 3;
-      private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_;
+      private org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
        */
       public boolean hasKind() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() {
         return kind_;
       }
 
       private void initFields() {
         parentQualifiedName_ = -1;
         shortName_ = 0;
-        kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
+        kind_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
       }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
@@ -1165,53 +1165,53 @@ public final class ProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
           org.jetbrains.kotlin.protobuf.ByteString data)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
           org.jetbrains.kotlin.protobuf.ByteString data,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(byte[] data)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
           byte[] data,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
           java.io.InputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseFrom(input, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom(
           java.io.InputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName parseFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -1220,21 +1220,21 @@ public final class ProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
 
       /**
-       * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName}
+       * Protobuf type {@code org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName}
        */
       public static final class Builder extends
           org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-            org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName, Builder>
+            org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName, Builder>
           implements
-          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName)
-          org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder {
-        // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.newBuilder()
+          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName)
+          org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder {
+        // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -1251,7 +1251,7 @@ public final class ProtoBuf {
           bitField0_ = (bitField0_ & ~0x00000001);
           shortName_ = 0;
           bitField0_ = (bitField0_ & ~0x00000002);
-          kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
+          kind_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
           bitField0_ = (bitField0_ & ~0x00000004);
           return this;
         }
@@ -1260,20 +1260,20 @@ public final class ProtoBuf {
           return create().mergeFrom(buildPartial());
         }
 
-        public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName getDefaultInstanceForType() {
-          return org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance();
+        public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance();
         }
 
-        public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName build() {
-          org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName result = buildPartial();
+        public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName build() {
+          org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName buildPartial() {
-          org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName result = new org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName(this);
+        public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName buildPartial() {
+          org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName result = new org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1292,8 +1292,8 @@ public final class ProtoBuf {
           return result;
         }
 
-        public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName other) {
-          if (other == org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName other) {
+          if (other == org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()) return this;
           if (other.hasParentQualifiedName()) {
             setParentQualifiedName(other.getParentQualifiedName());
           }
@@ -1320,11 +1320,11 @@ public final class ProtoBuf {
             org.jetbrains.kotlin.protobuf.CodedInputStream input,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName parsedMessage = null;
+          org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -1415,23 +1415,23 @@ public final class ProtoBuf {
           return this;
         }
 
-        private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
+        private org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
         /**
-         * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+         * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
          */
         public boolean hasKind() {
           return ((bitField0_ & 0x00000004) == 0x00000004);
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+         * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
          */
-        public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() {
+        public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() {
           return kind_;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+         * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
          */
-        public Builder setKind(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind value) {
+        public Builder setKind(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Kind value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -1441,16 +1441,16 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
+         * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE];
          */
         public Builder clearKind() {
           bitField0_ = (bitField0_ & ~0x00000004);
-          kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
+          kind_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE;
           
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName)
       }
 
       static {
@@ -1458,40 +1458,40 @@ public final class ProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName)
     }
 
     public static final int QUALIFIED_NAME_FIELD_NUMBER = 1;
-    private java.util.List qualifiedName_;
+    private java.util.List qualifiedName_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
-    public java.util.List getQualifiedNameList() {
+    public java.util.List getQualifiedNameList() {
       return qualifiedName_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getQualifiedNameOrBuilderList() {
       return qualifiedName_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
     public int getQualifiedNameCount() {
       return qualifiedName_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) {
       return qualifiedName_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+     * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder(
         int index) {
       return qualifiedName_.get(index);
     }
@@ -1546,53 +1546,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1601,21 +1601,21 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.QualifiedNameTable}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.QualifiedNameTable}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable, Builder>
+          org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.QualifiedNameTable)
-        org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTableOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.QualifiedNameTable)
+        org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTableOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1637,20 +1637,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable result = new org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable result = new org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           qualifiedName_ = java.util.Collections.unmodifiableList(qualifiedName_);
@@ -1660,8 +1660,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance()) return this;
         if (!other.qualifiedName_.isEmpty()) {
           if (qualifiedName_.isEmpty()) {
             qualifiedName_ = other.qualifiedName_;
@@ -1691,11 +1691,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -1706,38 +1706,38 @@ public final class ProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List qualifiedName_ =
+      private java.util.List qualifiedName_ =
         java.util.Collections.emptyList();
       private void ensureQualifiedNameIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          qualifiedName_ = new java.util.ArrayList(qualifiedName_);
+          qualifiedName_ = new java.util.ArrayList(qualifiedName_);
           bitField0_ |= 0x00000001;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
-      public java.util.List getQualifiedNameList() {
+      public java.util.List getQualifiedNameList() {
         return java.util.Collections.unmodifiableList(qualifiedName_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public int getQualifiedNameCount() {
         return qualifiedName_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) {
         return qualifiedName_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder setQualifiedName(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1747,19 +1747,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder setQualifiedName(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) {
         ensureQualifiedNameIsMutable();
         qualifiedName_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
-      public Builder addQualifiedName(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName value) {
+      public Builder addQualifiedName(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1769,10 +1769,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder addQualifiedName(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1782,30 +1782,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder addQualifiedName(
-          org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) {
         ensureQualifiedNameIsMutable();
         qualifiedName_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder addQualifiedName(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) {
         ensureQualifiedNameIsMutable();
         qualifiedName_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder addAllQualifiedName(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureQualifiedNameIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, qualifiedName_);
@@ -1813,7 +1813,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder clearQualifiedName() {
         qualifiedName_ = java.util.Collections.emptyList();
@@ -1822,7 +1822,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.QualifiedNameTable.QualifiedName qualified_name = 1;
+       * repeated .org.jetbrains.kotlin.metadata.QualifiedNameTable.QualifiedName qualified_name = 1;
        */
       public Builder removeQualifiedName(int index) {
         ensureQualifiedNameIsMutable();
@@ -1831,7 +1831,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.QualifiedNameTable)
     }
 
     static {
@@ -1839,11 +1839,11 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.QualifiedNameTable)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.QualifiedNameTable)
   }
 
   public interface AnnotationOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Annotation)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Annotation)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
@@ -1856,25 +1856,25 @@ public final class ProtoBuf {
     int getId();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
      */
-    java.util.List 
+    java.util.List 
         getArgumentList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument getArgument(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument getArgument(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
      */
     int getArgumentCount();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Annotation}
    */
   public static final class Annotation extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Annotation)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Annotation)
       AnnotationOrBuilder {
     // Use Annotation.newBuilder() to construct.
     private Annotation(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -1926,10 +1926,10 @@ public final class ProtoBuf {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                argument_ = new java.util.ArrayList();
+                argument_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              argument_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.PARSER, extensionRegistry));
+              argument_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.PARSER, extensionRegistry));
               break;
             }
           }
@@ -1969,7 +1969,7 @@ public final class ProtoBuf {
     }
 
     public interface ArgumentOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Annotation.Argument)
+        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Annotation.Argument)
         org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
       /**
@@ -1982,20 +1982,20 @@ public final class ProtoBuf {
       int getNameId();
 
       /**
-       * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+       * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
        */
       boolean hasValue();
       /**
-       * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+       * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
        */
-      org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value getValue();
+      org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value getValue();
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Annotation.Argument}
      */
     public static final class Argument extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Annotation.Argument)
+        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Annotation.Argument)
         ArgumentOrBuilder {
       // Use Argument.newBuilder() to construct.
       private Argument(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -2046,11 +2046,11 @@ public final class ProtoBuf {
                 break;
               }
               case 18: {
-                org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Builder subBuilder = null;
+                org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) == 0x00000002)) {
                   subBuilder = value_.toBuilder();
                 }
-                value_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry);
+                value_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(value_);
                   value_ = subBuilder.buildPartial();
@@ -2092,11 +2092,11 @@ public final class ProtoBuf {
       }
 
       public interface ValueOrBuilder extends
-          // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
+          // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Annotation.Argument.Value)
           org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+         * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
          *
          * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2106,7 +2106,7 @@ public final class ProtoBuf {
          */
         boolean hasType();
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+         * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
          *
          * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2114,7 +2114,7 @@ public final class ProtoBuf {
          * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
          * 

          */
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type getType();
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Type getType();
 
         /**
          * optional sint64 int_value = 2;
@@ -2179,34 +2179,34 @@ public final class ProtoBuf {
         int getEnumValueId();
 
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
          */
         boolean hasAnnotation();
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
          */
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation();
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation();
 
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
-        java.util.List 
+        java.util.List 
             getArrayElementList();
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value getArrayElement(int index);
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value getArrayElement(int index);
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
         int getArrayElementCount();
       }
       /**
-       * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument.Value}
+       * Protobuf type {@code org.jetbrains.kotlin.metadata.Annotation.Argument.Value}
        */
       public static final class Value extends
           org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-          // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
+          // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Annotation.Argument.Value)
           ValueOrBuilder {
         // Use Value.newBuilder() to construct.
         private Value(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -2253,7 +2253,7 @@ public final class ProtoBuf {
                 }
                 case 8: {
                   int rawValue = input.readEnum();
-                  org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type value = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type.valueOf(rawValue);
+                  org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Type value = org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Type.valueOf(rawValue);
                   if (value == null) {
                     unknownFieldsCodedOutput.writeRawVarint32(tag);
                     unknownFieldsCodedOutput.writeRawVarint32(rawValue);
@@ -2294,11 +2294,11 @@ public final class ProtoBuf {
                   break;
                 }
                 case 66: {
-                  org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder subBuilder = null;
+                  org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Builder subBuilder = null;
                   if (((bitField0_ & 0x00000080) == 0x00000080)) {
                     subBuilder = annotation_.toBuilder();
                   }
-                  annotation_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.PARSER, extensionRegistry);
+                  annotation_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.PARSER, extensionRegistry);
                   if (subBuilder != null) {
                     subBuilder.mergeFrom(annotation_);
                     annotation_ = subBuilder.buildPartial();
@@ -2308,10 +2308,10 @@ public final class ProtoBuf {
                 }
                 case 74: {
                   if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
-                    arrayElement_ = new java.util.ArrayList();
+                    arrayElement_ = new java.util.ArrayList();
                     mutable_bitField0_ |= 0x00000100;
                   }
-                  arrayElement_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry));
+                  arrayElement_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.PARSER, extensionRegistry));
                   break;
                 }
               }
@@ -2351,7 +2351,7 @@ public final class ProtoBuf {
         }
 
         /**
-         * Protobuf enum {@code org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type}
+         * Protobuf enum {@code org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type}
          */
         public enum Type
             implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -2502,14 +2502,14 @@ public final class ProtoBuf {
             this.value = value;
           }
 
-          // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type)
+          // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type)
         }
 
         private int bitField0_;
         public static final int TYPE_FIELD_NUMBER = 1;
-        private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type type_;
+        private org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Type type_;
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+         * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
          *
          * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2521,7 +2521,7 @@ public final class ProtoBuf {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+         * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
          *
          * 
          * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -2529,7 +2529,7 @@ public final class ProtoBuf {
          * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
          * 

          */
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type getType() {
+        public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Type getType() {
           return type_;
         }
 
@@ -2632,64 +2632,64 @@ public final class ProtoBuf {
         }
 
         public static final int ANNOTATION_FIELD_NUMBER = 8;
-        private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation annotation_;
+        private org.jetbrains.kotlin.metadata.ProtoBuf.Annotation annotation_;
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
          */
         public boolean hasAnnotation() {
           return ((bitField0_ & 0x00000080) == 0x00000080);
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+         * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
          */
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation() {
+        public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation() {
           return annotation_;
         }
 
         public static final int ARRAY_ELEMENT_FIELD_NUMBER = 9;
-        private java.util.List arrayElement_;
+        private java.util.List arrayElement_;
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
-        public java.util.List getArrayElementList() {
+        public java.util.List getArrayElementList() {
           return arrayElement_;
         }
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
-        public java.util.List 
+        public java.util.List 
             getArrayElementOrBuilderList() {
           return arrayElement_;
         }
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
         public int getArrayElementCount() {
           return arrayElement_.size();
         }
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
+        public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
           return arrayElement_.get(index);
         }
         /**
-         * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+         * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
          */
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
+        public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.ValueOrBuilder getArrayElementOrBuilder(
             int index) {
           return arrayElement_.get(index);
         }
 
         private void initFields() {
-          type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
+          type_ = org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
           intValue_ = 0L;
           floatValue_ = 0F;
           doubleValue_ = 0D;
           stringValue_ = 0;
           classId_ = 0;
           enumValueId_ = 0;
-          annotation_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance();
+          annotation_ = org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance();
           arrayElement_ = java.util.Collections.emptyList();
         }
         private byte memoizedIsInitialized = -1;
@@ -2801,53 +2801,53 @@ public final class ProtoBuf {
           return super.writeReplace();
         }
 
-        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value parseFrom(
             org.jetbrains.kotlin.protobuf.ByteString data)
             throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
           return PARSER.parseFrom(data);
         }
-        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value parseFrom(
             org.jetbrains.kotlin.protobuf.ByteString data,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
           return PARSER.parseFrom(data, extensionRegistry);
         }
-        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(byte[] data)
+        public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value parseFrom(byte[] data)
             throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
           return PARSER.parseFrom(data);
         }
-        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value parseFrom(
             byte[] data,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
           return PARSER.parseFrom(data, extensionRegistry);
         }
-        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(java.io.InputStream input)
+        public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value parseFrom(java.io.InputStream input)
             throws java.io.IOException {
           return PARSER.parseFrom(input);
         }
-        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value parseFrom(
             java.io.InputStream input,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
           return PARSER.parseFrom(input, extensionRegistry);
         }
-        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseDelimitedFrom(java.io.InputStream input)
+        public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value parseDelimitedFrom(java.io.InputStream input)
             throws java.io.IOException {
           return PARSER.parseDelimitedFrom(input);
         }
-        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseDelimitedFrom(
+        public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value parseDelimitedFrom(
             java.io.InputStream input,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
           return PARSER.parseDelimitedFrom(input, extensionRegistry);
         }
-        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value parseFrom(
             org.jetbrains.kotlin.protobuf.CodedInputStream input)
             throws java.io.IOException {
           return PARSER.parseFrom(input);
         }
-        public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parseFrom(
+        public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value parseFrom(
             org.jetbrains.kotlin.protobuf.CodedInputStream input,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
@@ -2856,21 +2856,21 @@ public final class ProtoBuf {
 
         public static Builder newBuilder() { return Builder.create(); }
         public Builder newBuilderForType() { return newBuilder(); }
-        public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value prototype) {
+        public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value prototype) {
           return newBuilder().mergeFrom(prototype);
         }
         public Builder toBuilder() { return newBuilder(this); }
 
         /**
-         * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument.Value}
+         * Protobuf type {@code org.jetbrains.kotlin.metadata.Annotation.Argument.Value}
          */
         public static final class Builder extends
             org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-              org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value, Builder>
+              org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value, Builder>
             implements
-            // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
-            org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.ValueOrBuilder {
-          // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.newBuilder()
+            // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Annotation.Argument.Value)
+            org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.ValueOrBuilder {
+          // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.newBuilder()
           private Builder() {
             maybeForceBuilderInitialization();
           }
@@ -2883,7 +2883,7 @@ public final class ProtoBuf {
 
           public Builder clear() {
             super.clear();
-            type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
+            type_ = org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
             bitField0_ = (bitField0_ & ~0x00000001);
             intValue_ = 0L;
             bitField0_ = (bitField0_ & ~0x00000002);
@@ -2897,7 +2897,7 @@ public final class ProtoBuf {
             bitField0_ = (bitField0_ & ~0x00000020);
             enumValueId_ = 0;
             bitField0_ = (bitField0_ & ~0x00000040);
-            annotation_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance();
+            annotation_ = org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance();
             bitField0_ = (bitField0_ & ~0x00000080);
             arrayElement_ = java.util.Collections.emptyList();
             bitField0_ = (bitField0_ & ~0x00000100);
@@ -2908,20 +2908,20 @@ public final class ProtoBuf {
             return create().mergeFrom(buildPartial());
           }
 
-          public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value getDefaultInstanceForType() {
-            return org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+          public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value getDefaultInstanceForType() {
+            return org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
           }
 
-          public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value build() {
-            org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value result = buildPartial();
+          public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value build() {
+            org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value result = buildPartial();
             if (!result.isInitialized()) {
               throw newUninitializedMessageException(result);
             }
             return result;
           }
 
-          public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value buildPartial() {
-            org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value result = new org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value(this);
+          public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value buildPartial() {
+            org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value result = new org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value(this);
             int from_bitField0_ = bitField0_;
             int to_bitField0_ = 0;
             if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2965,8 +2965,8 @@ public final class ProtoBuf {
             return result;
           }
 
-          public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value other) {
-            if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance()) return this;
+          public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value other) {
+            if (other == org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.getDefaultInstance()) return this;
             if (other.hasType()) {
               setType(other.getType());
             }
@@ -3026,11 +3026,11 @@ public final class ProtoBuf {
               org.jetbrains.kotlin.protobuf.CodedInputStream input,
               org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
               throws java.io.IOException {
-            org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value parsedMessage = null;
+            org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value parsedMessage = null;
             try {
               parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
             } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-              parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value) e.getUnfinishedMessage();
+              parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value) e.getUnfinishedMessage();
               throw e;
             } finally {
               if (parsedMessage != null) {
@@ -3041,9 +3041,9 @@ public final class ProtoBuf {
           }
           private int bitField0_;
 
-          private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
+          private org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Type type_ = org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -3055,7 +3055,7 @@ public final class ProtoBuf {
             return ((bitField0_ & 0x00000001) == 0x00000001);
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -3063,11 +3063,11 @@ public final class ProtoBuf {
            * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
            * 

            */
-          public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type getType() {
+          public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Type getType() {
             return type_;
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -3075,7 +3075,7 @@ public final class ProtoBuf {
            * However, to save space, this field is optional: in case of homogeneous arrays, only the type of the first element is required
            * 

            */
-          public Builder setType(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type value) {
+          public Builder setType(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Type value) {
             if (value == null) {
               throw new NullPointerException();
             }
@@ -3085,7 +3085,7 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation.Argument.Value.Type type = 1;
+           * optional .org.jetbrains.kotlin.metadata.Annotation.Argument.Value.Type type = 1;
            *
            * 
            * Note: a *Value* has a Type, not an Argument! This is done for future language features which may involve using arrays
@@ -3095,7 +3095,7 @@ public final class ProtoBuf {
            */
           public Builder clearType() {
             bitField0_ = (bitField0_ & ~0x00000001);
-            type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
+            type_ = org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Type.BYTE;
             
             return this;
           }
@@ -3308,23 +3308,23 @@ public final class ProtoBuf {
             return this;
           }
 
-          private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation annotation_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance();
+          private org.jetbrains.kotlin.metadata.ProtoBuf.Annotation annotation_ = org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance();
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
           public boolean hasAnnotation() {
             return ((bitField0_ & 0x00000080) == 0x00000080);
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
-          public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation() {
+          public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation() {
             return annotation_;
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
-          public Builder setAnnotation(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
+          public Builder setAnnotation(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation value) {
             if (value == null) {
               throw new NullPointerException();
             }
@@ -3334,23 +3334,23 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
           public Builder setAnnotation(
-              org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder builderForValue) {
+              org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Builder builderForValue) {
             annotation_ = builderForValue.build();
 
             bitField0_ |= 0x00000080;
             return this;
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
-          public Builder mergeAnnotation(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
+          public Builder mergeAnnotation(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation value) {
             if (((bitField0_ & 0x00000080) == 0x00000080) &&
-                annotation_ != org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance()) {
+                annotation_ != org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance()) {
               annotation_ =
-                org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.newBuilder(annotation_).mergeFrom(value).buildPartial();
+                org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.newBuilder(annotation_).mergeFrom(value).buildPartial();
             } else {
               annotation_ = value;
             }
@@ -3359,47 +3359,47 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * optional .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+           * optional .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
            */
           public Builder clearAnnotation() {
-            annotation_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance();
+            annotation_ = org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance();
 
             bitField0_ = (bitField0_ & ~0x00000080);
             return this;
           }
 
-          private java.util.List arrayElement_ =
+          private java.util.List arrayElement_ =
             java.util.Collections.emptyList();
           private void ensureArrayElementIsMutable() {
             if (!((bitField0_ & 0x00000100) == 0x00000100)) {
-              arrayElement_ = new java.util.ArrayList(arrayElement_);
+              arrayElement_ = new java.util.ArrayList(arrayElement_);
               bitField0_ |= 0x00000100;
              }
           }
 
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
-          public java.util.List getArrayElementList() {
+          public java.util.List getArrayElementList() {
             return java.util.Collections.unmodifiableList(arrayElement_);
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public int getArrayElementCount() {
             return arrayElement_.size();
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
-          public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
+          public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value getArrayElement(int index) {
             return arrayElement_.get(index);
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder setArrayElement(
-              int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value) {
+              int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value value) {
             if (value == null) {
               throw new NullPointerException();
             }
@@ -3409,19 +3409,19 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder setArrayElement(
-              int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+              int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
             ensureArrayElementIsMutable();
             arrayElement_.set(index, builderForValue.build());
 
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
-          public Builder addArrayElement(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value) {
+          public Builder addArrayElement(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value value) {
             if (value == null) {
               throw new NullPointerException();
             }
@@ -3431,10 +3431,10 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder addArrayElement(
-              int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value) {
+              int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value value) {
             if (value == null) {
               throw new NullPointerException();
             }
@@ -3444,30 +3444,30 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder addArrayElement(
-              org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+              org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
             ensureArrayElementIsMutable();
             arrayElement_.add(builderForValue.build());
 
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder addArrayElement(
-              int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+              int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
             ensureArrayElementIsMutable();
             arrayElement_.add(index, builderForValue.build());
 
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder addAllArrayElement(
-              java.lang.Iterable values) {
+              java.lang.Iterable values) {
             ensureArrayElementIsMutable();
             org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
                 values, arrayElement_);
@@ -3475,7 +3475,7 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder clearArrayElement() {
             arrayElement_ = java.util.Collections.emptyList();
@@ -3484,7 +3484,7 @@ public final class ProtoBuf {
             return this;
           }
           /**
-           * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument.Value array_element = 9;
+           * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument.Value array_element = 9;
            */
           public Builder removeArrayElement(int index) {
             ensureArrayElementIsMutable();
@@ -3493,7 +3493,7 @@ public final class ProtoBuf {
             return this;
           }
 
-          // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
+          // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Annotation.Argument.Value)
         }
 
         static {
@@ -3501,7 +3501,7 @@ public final class ProtoBuf {
           defaultInstance.initFields();
         }
 
-        // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Annotation.Argument.Value)
+        // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Annotation.Argument.Value)
       }
 
       private int bitField0_;
@@ -3521,23 +3521,23 @@ public final class ProtoBuf {
       }
 
       public static final int VALUE_FIELD_NUMBER = 2;
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value_;
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value value_;
       /**
-       * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+       * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
        */
       public boolean hasValue() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+       * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value getValue() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value getValue() {
         return value_;
       }
 
       private void initFields() {
         nameId_ = 0;
-        value_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+        value_ = org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
       }
       private byte memoizedIsInitialized = -1;
       public final boolean isInitialized() {
@@ -3599,53 +3599,53 @@ public final class ProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.ByteString data)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.ByteString data,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument parseFrom(byte[] data)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument parseFrom(
           byte[] data,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument parseFrom(
           java.io.InputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseFrom(input, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseDelimitedFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument parseDelimitedFrom(
           java.io.InputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -3654,21 +3654,21 @@ public final class ProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
 
       /**
-       * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation.Argument}
+       * Protobuf type {@code org.jetbrains.kotlin.metadata.Annotation.Argument}
        */
       public static final class Builder extends
           org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-            org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument, Builder>
+            org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument, Builder>
           implements
-          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Annotation.Argument)
-          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.ArgumentOrBuilder {
-        // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.newBuilder()
+          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Annotation.Argument)
+          org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.ArgumentOrBuilder {
+        // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -3683,7 +3683,7 @@ public final class ProtoBuf {
           super.clear();
           nameId_ = 0;
           bitField0_ = (bitField0_ & ~0x00000001);
-          value_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+          value_ = org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
           bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
@@ -3692,20 +3692,20 @@ public final class ProtoBuf {
           return create().mergeFrom(buildPartial());
         }
 
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument getDefaultInstanceForType() {
-          return org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.getDefaultInstance();
+        public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.getDefaultInstance();
         }
 
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument build() {
-          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument result = buildPartial();
+        public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument build() {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument buildPartial() {
-          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument result = new org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument(this);
+        public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument buildPartial() {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument result = new org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -3720,8 +3720,8 @@ public final class ProtoBuf {
           return result;
         }
 
-        public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument other) {
-          if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument other) {
+          if (other == org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.getDefaultInstance()) return this;
           if (other.hasNameId()) {
             setNameId(other.getNameId());
           }
@@ -3753,11 +3753,11 @@ public final class ProtoBuf {
             org.jetbrains.kotlin.protobuf.CodedInputStream input,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument parsedMessage = null;
+          org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -3800,23 +3800,23 @@ public final class ProtoBuf {
           return this;
         }
 
-        private org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+        private org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value value_ = org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
         public boolean hasValue() {
           return ((bitField0_ & 0x00000002) == 0x00000002);
         }
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value getValue() {
+        public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value getValue() {
           return value_;
         }
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
-        public Builder setValue(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value) {
+        public Builder setValue(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -3826,23 +3826,23 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
         public Builder setValue(
-            org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
+            org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.Builder builderForValue) {
           value_ = builderForValue.build();
 
           bitField0_ |= 0x00000002;
           return this;
         }
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
-        public Builder mergeValue(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value value) {
+        public Builder mergeValue(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value value) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              value_ != org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance()) {
+              value_ != org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.getDefaultInstance()) {
             value_ =
-              org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.newBuilder(value_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.newBuilder(value_).mergeFrom(value).buildPartial();
           } else {
             value_ = value;
           }
@@ -3851,16 +3851,16 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * required .org.jetbrains.kotlin.serialization.Annotation.Argument.Value value = 2;
+         * required .org.jetbrains.kotlin.metadata.Annotation.Argument.Value value = 2;
          */
         public Builder clearValue() {
-          value_ = org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
+          value_ = org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.getDefaultInstance();
 
           bitField0_ = (bitField0_ & ~0x00000002);
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Annotation.Argument)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Annotation.Argument)
       }
 
       static {
@@ -3868,7 +3868,7 @@ public final class ProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Annotation.Argument)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Annotation.Argument)
     }
 
     private int bitField0_;
@@ -3888,36 +3888,36 @@ public final class ProtoBuf {
     }
 
     public static final int ARGUMENT_FIELD_NUMBER = 2;
-    private java.util.List argument_;
+    private java.util.List argument_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
      */
-    public java.util.List getArgumentList() {
+    public java.util.List getArgumentList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getArgumentOrBuilderList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
      */
     public int getArgumentCount() {
       return argument_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument getArgument(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument getArgument(int index) {
       return argument_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.ArgumentOrBuilder getArgumentOrBuilder(
         int index) {
       return argument_.get(index);
     }
@@ -3984,53 +3984,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Annotation parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -4039,21 +4039,21 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Annotation}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Annotation}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation, Builder>
+          org.jetbrains.kotlin.metadata.ProtoBuf.Annotation, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Annotation)
-        org.jetbrains.kotlin.serialization.ProtoBuf.AnnotationOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Annotation)
+        org.jetbrains.kotlin.metadata.ProtoBuf.AnnotationOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -4077,20 +4077,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation result = new org.jetbrains.kotlin.serialization.ProtoBuf.Annotation(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation result = new org.jetbrains.kotlin.metadata.ProtoBuf.Annotation(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -4106,8 +4106,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance()) return this;
         if (other.hasId()) {
           setId(other.getId());
         }
@@ -4144,11 +4144,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Annotation) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.Annotation) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -4191,38 +4191,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List argument_ =
+      private java.util.List argument_ =
         java.util.Collections.emptyList();
       private void ensureArgumentIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          argument_ = new java.util.ArrayList(argument_);
+          argument_ = new java.util.ArrayList(argument_);
           bitField0_ |= 0x00000002;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
-      public java.util.List getArgumentList() {
+      public java.util.List getArgumentList() {
         return java.util.Collections.unmodifiableList(argument_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public int getArgumentCount() {
         return argument_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument getArgument(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument getArgument(int index) {
         return argument_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -4232,19 +4232,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Builder builderForValue) {
         ensureArgumentIsMutable();
         argument_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
-      public Builder addArgument(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument value) {
+      public Builder addArgument(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -4254,10 +4254,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -4267,30 +4267,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder addArgument(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Builder builderForValue) {
         ensureArgumentIsMutable();
         argument_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Builder builderForValue) {
         ensureArgumentIsMutable();
         argument_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder addAllArgument(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureArgumentIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, argument_);
@@ -4298,7 +4298,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder clearArgument() {
         argument_ = java.util.Collections.emptyList();
@@ -4307,7 +4307,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation.Argument argument = 2;
        */
       public Builder removeArgument(int index) {
         ensureArgumentIsMutable();
@@ -4316,7 +4316,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Annotation)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Annotation)
     }
 
     static {
@@ -4324,25 +4324,25 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Annotation)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Annotation)
   }
 
   public interface TypeOrBuilder extends 
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Type)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Type)
        org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
             ExtendableMessageOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
-    java.util.List 
+    java.util.List 
         getArgumentList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument getArgument(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument getArgument(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
     int getArgumentCount();
 
@@ -4375,13 +4375,13 @@ public final class ProtoBuf {
     int getFlexibleTypeCapabilitiesId();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
      */
     boolean hasFlexibleUpperBound();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getFlexibleUpperBound();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getFlexibleUpperBound();
 
     /**
      * optional int32 flexible_upper_bound_id = 8;
@@ -4455,13 +4455,13 @@ public final class ProtoBuf {
     int getTypeAliasName();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+     * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
      */
     boolean hasOuterType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+     * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getOuterType();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getOuterType();
 
     /**
      * optional int32 outer_type_id = 11;
@@ -4473,13 +4473,13 @@ public final class ProtoBuf {
     int getOuterTypeId();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+     * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
      */
     boolean hasAbbreviatedType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+     * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getAbbreviatedType();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getAbbreviatedType();
 
     /**
      * optional int32 abbreviated_type_id = 14;
@@ -4508,15 +4508,15 @@ public final class ProtoBuf {
     int getFlags();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Type}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Type}
    */
   public static final class Type extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
         Type> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Type)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Type)
       TypeOrBuilder {
     // Use Type.newBuilder() to construct.
-    private Type(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+    private Type(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -4565,10 +4565,10 @@ public final class ProtoBuf {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                argument_ = new java.util.ArrayList();
+                argument_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              argument_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.PARSER, extensionRegistry));
+              argument_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.PARSER, extensionRegistry));
               break;
             }
             case 24: {
@@ -4582,11 +4582,11 @@ public final class ProtoBuf {
               break;
             }
             case 42: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = flexibleUpperBound_.toBuilder();
               }
-              flexibleUpperBound_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              flexibleUpperBound_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(flexibleUpperBound_);
                 flexibleUpperBound_ = subBuilder.buildPartial();
@@ -4615,11 +4615,11 @@ public final class ProtoBuf {
               break;
             }
             case 82: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000100) == 0x00000100)) {
                 subBuilder = outerType_.toBuilder();
               }
-              outerType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              outerType_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(outerType_);
                 outerType_ = subBuilder.buildPartial();
@@ -4638,11 +4638,11 @@ public final class ProtoBuf {
               break;
             }
             case 106: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000400) == 0x00000400)) {
                 subBuilder = abbreviatedType_.toBuilder();
               }
-              abbreviatedType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              abbreviatedType_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(abbreviatedType_);
                 abbreviatedType_ = subBuilder.buildPartial();
@@ -4692,20 +4692,20 @@ public final class ProtoBuf {
     }
 
     public interface ArgumentOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Type.Argument)
+        // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Type.Argument)
         org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
        */
       boolean hasProjection();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
        */
-      org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection getProjection();
+      org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Projection getProjection();
 
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 2;
        *
        * 
        * When projection is STAR, no type is written, otherwise type must be specified
@@ -4713,13 +4713,13 @@ public final class ProtoBuf {
        */
       boolean hasType();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 2;
        *
        * 
        * When projection is STAR, no type is written, otherwise type must be specified
        * 

        */
-      org.jetbrains.kotlin.serialization.ProtoBuf.Type getType();
+      org.jetbrains.kotlin.metadata.ProtoBuf.Type getType();
 
       /**
        * optional int32 type_id = 3;
@@ -4731,11 +4731,11 @@ public final class ProtoBuf {
       int getTypeId();
     }
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Type.Argument}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Type.Argument}
      */
     public static final class Argument extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Type.Argument)
+        // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Type.Argument)
         ArgumentOrBuilder {
       // Use Argument.newBuilder() to construct.
       private Argument(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -4782,7 +4782,7 @@ public final class ProtoBuf {
               }
               case 8: {
                 int rawValue = input.readEnum();
-                org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection value = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection.valueOf(rawValue);
+                org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Projection value = org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Projection.valueOf(rawValue);
                 if (value == null) {
                   unknownFieldsCodedOutput.writeRawVarint32(tag);
                   unknownFieldsCodedOutput.writeRawVarint32(rawValue);
@@ -4793,11 +4793,11 @@ public final class ProtoBuf {
                 break;
               }
               case 18: {
-                org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+                org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder subBuilder = null;
                 if (((bitField0_ & 0x00000002) == 0x00000002)) {
                   subBuilder = type_.toBuilder();
                 }
-                type_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+                type_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry);
                 if (subBuilder != null) {
                   subBuilder.mergeFrom(type_);
                   type_ = subBuilder.buildPartial();
@@ -4844,7 +4844,7 @@ public final class ProtoBuf {
       }
 
       /**
-       * Protobuf enum {@code org.jetbrains.kotlin.serialization.Type.Argument.Projection}
+       * Protobuf enum {@code org.jetbrains.kotlin.metadata.Type.Argument.Projection}
        */
       public enum Projection
           implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -4914,29 +4914,29 @@ public final class ProtoBuf {
           this.value = value;
         }
 
-        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Type.Argument.Projection)
+        // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Type.Argument.Projection)
       }
 
       private int bitField0_;
       public static final int PROJECTION_FIELD_NUMBER = 1;
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection projection_;
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Projection projection_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
        */
       public boolean hasProjection() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection getProjection() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Projection getProjection() {
         return projection_;
       }
 
       public static final int TYPE_FIELD_NUMBER = 2;
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_;
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Type type_;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 2;
        *
        * 
        * When projection is STAR, no type is written, otherwise type must be specified
@@ -4946,13 +4946,13 @@ public final class ProtoBuf {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 2;
        *
        * 
        * When projection is STAR, no type is written, otherwise type must be specified
        * 

        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getType() {
         return type_;
       }
 
@@ -4972,8 +4972,8 @@ public final class ProtoBuf {
       }
 
       private void initFields() {
-        projection_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection.INV;
-        type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        projection_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Projection.INV;
+        type_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
         typeId_ = 0;
       }
       private byte memoizedIsInitialized = -1;
@@ -5037,53 +5037,53 @@ public final class ProtoBuf {
         return super.writeReplace();
       }
 
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.ByteString data)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.ByteString data,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseFrom(byte[] data)
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument parseFrom(byte[] data)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument parseFrom(
           byte[] data,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
         return PARSER.parseFrom(data, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument parseFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument parseFrom(
           java.io.InputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseFrom(input, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseDelimitedFrom(java.io.InputStream input)
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument parseDelimitedFrom(java.io.InputStream input)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseDelimitedFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument parseDelimitedFrom(
           java.io.InputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
         return PARSER.parseDelimitedFrom(input, extensionRegistry);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input)
           throws java.io.IOException {
         return PARSER.parseFrom(input);
       }
-      public static org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parseFrom(
+      public static org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument parseFrom(
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
@@ -5092,21 +5092,21 @@ public final class ProtoBuf {
 
       public static Builder newBuilder() { return Builder.create(); }
       public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument prototype) {
+      public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument prototype) {
         return newBuilder().mergeFrom(prototype);
       }
       public Builder toBuilder() { return newBuilder(this); }
 
       /**
-       * Protobuf type {@code org.jetbrains.kotlin.serialization.Type.Argument}
+       * Protobuf type {@code org.jetbrains.kotlin.metadata.Type.Argument}
        */
       public static final class Builder extends
           org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument, Builder>
+            org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument, Builder>
           implements
-          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Type.Argument)
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.ArgumentOrBuilder {
-        // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.newBuilder()
+          // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Type.Argument)
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.ArgumentOrBuilder {
+        // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.newBuilder()
         private Builder() {
           maybeForceBuilderInitialization();
         }
@@ -5119,9 +5119,9 @@ public final class ProtoBuf {
 
         public Builder clear() {
           super.clear();
-          projection_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection.INV;
+          projection_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Projection.INV;
           bitField0_ = (bitField0_ & ~0x00000001);
-          type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+          type_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
           bitField0_ = (bitField0_ & ~0x00000002);
           typeId_ = 0;
           bitField0_ = (bitField0_ & ~0x00000004);
@@ -5132,20 +5132,20 @@ public final class ProtoBuf {
           return create().mergeFrom(buildPartial());
         }
 
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument getDefaultInstanceForType() {
-          return org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.getDefaultInstance();
+        public org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument getDefaultInstanceForType() {
+          return org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.getDefaultInstance();
         }
 
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument build() {
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument result = buildPartial();
+        public org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument build() {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument result = buildPartial();
           if (!result.isInitialized()) {
             throw newUninitializedMessageException(result);
           }
           return result;
         }
 
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument buildPartial() {
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument result = new org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument(this);
+        public org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument buildPartial() {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument result = new org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument(this);
           int from_bitField0_ = bitField0_;
           int to_bitField0_ = 0;
           if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -5164,8 +5164,8 @@ public final class ProtoBuf {
           return result;
         }
 
-        public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument other) {
-          if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.getDefaultInstance()) return this;
+        public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument other) {
+          if (other == org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.getDefaultInstance()) return this;
           if (other.hasProjection()) {
             setProjection(other.getProjection());
           }
@@ -5194,11 +5194,11 @@ public final class ProtoBuf {
             org.jetbrains.kotlin.protobuf.CodedInputStream input,
             org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
             throws java.io.IOException {
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument parsedMessage = null;
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument parsedMessage = null;
           try {
             parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
           } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument) e.getUnfinishedMessage();
+            parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument) e.getUnfinishedMessage();
             throw e;
           } finally {
             if (parsedMessage != null) {
@@ -5209,23 +5209,23 @@ public final class ProtoBuf {
         }
         private int bitField0_;
 
-        private org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection projection_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection.INV;
+        private org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Projection projection_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Projection.INV;
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
          */
         public boolean hasProjection() {
           return ((bitField0_ & 0x00000001) == 0x00000001);
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
          */
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection getProjection() {
+        public org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Projection getProjection() {
           return projection_;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
          */
-        public Builder setProjection(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection value) {
+        public Builder setProjection(org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Projection value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -5235,18 +5235,18 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type.Argument.Projection projection = 1 [default = INV];
+         * optional .org.jetbrains.kotlin.metadata.Type.Argument.Projection projection = 1 [default = INV];
          */
         public Builder clearProjection() {
           bitField0_ = (bitField0_ & ~0x00000001);
-          projection_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection.INV;
+          projection_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Projection.INV;
           
           return this;
         }
 
-        private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        private org.jetbrains.kotlin.metadata.ProtoBuf.Type type_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
@@ -5256,23 +5256,23 @@ public final class ProtoBuf {
           return ((bitField0_ & 0x00000002) == 0x00000002);
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
          * 

          */
-        public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
+        public org.jetbrains.kotlin.metadata.ProtoBuf.Type getType() {
           return type_;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
          * 

          */
-        public Builder setType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+        public Builder setType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
           if (value == null) {
             throw new NullPointerException();
           }
@@ -5282,31 +5282,31 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
          * 

          */
         public Builder setType(
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+            org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
           type_ = builderForValue.build();
 
           bitField0_ |= 0x00000002;
           return this;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
          * 

          */
-        public Builder mergeType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+        public Builder mergeType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
           if (((bitField0_ & 0x00000002) == 0x00000002) &&
-              type_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+              type_ != org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance()) {
             type_ =
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
+              org.jetbrains.kotlin.metadata.ProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
           } else {
             type_ = value;
           }
@@ -5315,14 +5315,14 @@ public final class ProtoBuf {
           return this;
         }
         /**
-         * optional .org.jetbrains.kotlin.serialization.Type type = 2;
+         * optional .org.jetbrains.kotlin.metadata.Type type = 2;
          *
          * 
          * When projection is STAR, no type is written, otherwise type must be specified
          * 

          */
         public Builder clearType() {
-          type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+          type_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
 
           bitField0_ = (bitField0_ & ~0x00000002);
           return this;
@@ -5360,7 +5360,7 @@ public final class ProtoBuf {
           return this;
         }
 
-        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Type.Argument)
+        // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Type.Argument)
       }
 
       static {
@@ -5368,41 +5368,41 @@ public final class ProtoBuf {
         defaultInstance.initFields();
       }
 
-      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Type.Argument)
+      // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Type.Argument)
     }
 
     private int bitField0_;
     public static final int ARGUMENT_FIELD_NUMBER = 2;
-    private java.util.List argument_;
+    private java.util.List argument_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
-    public java.util.List getArgumentList() {
+    public java.util.List getArgumentList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getArgumentOrBuilderList() {
       return argument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
     public int getArgumentCount() {
       return argument_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument getArgument(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument getArgument(int index) {
       return argument_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder(
         int index) {
       return argument_.get(index);
     }
@@ -5448,17 +5448,17 @@ public final class ProtoBuf {
     }
 
     public static final int FLEXIBLE_UPPER_BOUND_FIELD_NUMBER = 5;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Type flexibleUpperBound_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Type flexibleUpperBound_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
      */
     public boolean hasFlexibleUpperBound() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getFlexibleUpperBound() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getFlexibleUpperBound() {
       return flexibleUpperBound_;
     }
 
@@ -5564,17 +5564,17 @@ public final class ProtoBuf {
     }
 
     public static final int OUTER_TYPE_FIELD_NUMBER = 10;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Type outerType_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Type outerType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+     * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
      */
     public boolean hasOuterType() {
       return ((bitField0_ & 0x00000100) == 0x00000100);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+     * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getOuterType() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getOuterType() {
       return outerType_;
     }
 
@@ -5594,17 +5594,17 @@ public final class ProtoBuf {
     }
 
     public static final int ABBREVIATED_TYPE_FIELD_NUMBER = 13;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Type abbreviatedType_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Type abbreviatedType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+     * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
      */
     public boolean hasAbbreviatedType() {
       return ((bitField0_ & 0x00000400) == 0x00000400);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+     * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getAbbreviatedType() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getAbbreviatedType() {
       return abbreviatedType_;
     }
 
@@ -5650,15 +5650,15 @@ public final class ProtoBuf {
       argument_ = java.util.Collections.emptyList();
       nullable_ = false;
       flexibleTypeCapabilitiesId_ = 0;
-      flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      flexibleUpperBound_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       flexibleUpperBoundId_ = 0;
       className_ = 0;
       typeParameter_ = 0;
       typeParameterName_ = 0;
       typeAliasName_ = 0;
-      outerType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      outerType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       outerTypeId_ = 0;
-      abbreviatedType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      abbreviatedType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       abbreviatedTypeId_ = 0;
       flags_ = 0;
     }
@@ -5704,7 +5704,7 @@ public final class ProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00001000) == 0x00001000)) {
         output.writeInt32(1, flags_);
@@ -5827,53 +5827,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Type parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Type parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Type parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Type parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Type parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Type parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Type parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Type parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Type parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Type parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Type parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -5882,20 +5882,20 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Type prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.Type prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Type}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Type}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Type)
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder()
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Type)
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.Type.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -5914,7 +5914,7 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000002);
         flexibleTypeCapabilitiesId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
-        flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        flexibleUpperBound_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000008);
         flexibleUpperBoundId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -5926,11 +5926,11 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000080);
         typeAliasName_ = 0;
         bitField0_ = (bitField0_ & ~0x00000100);
-        outerType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        outerType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000200);
         outerTypeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000400);
-        abbreviatedType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        abbreviatedType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000800);
         abbreviatedTypeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00001000);
@@ -5943,20 +5943,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Type result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Type result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Type result = new org.jetbrains.kotlin.serialization.ProtoBuf.Type(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Type result = new org.jetbrains.kotlin.metadata.ProtoBuf.Type(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -6020,8 +6020,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Type other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.Type other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance()) return this;
         if (!other.argument_.isEmpty()) {
           if (argument_.isEmpty()) {
             argument_ = other.argument_;
@@ -6113,11 +6113,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Type parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.Type parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Type) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.Type) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -6128,38 +6128,38 @@ public final class ProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List argument_ =
+      private java.util.List argument_ =
         java.util.Collections.emptyList();
       private void ensureArgumentIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          argument_ = new java.util.ArrayList(argument_);
+          argument_ = new java.util.ArrayList(argument_);
           bitField0_ |= 0x00000001;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
-      public java.util.List getArgumentList() {
+      public java.util.List getArgumentList() {
         return java.util.Collections.unmodifiableList(argument_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public int getArgumentCount() {
         return argument_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument getArgument(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument getArgument(int index) {
         return argument_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -6169,19 +6169,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder setArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Builder builderForValue) {
         ensureArgumentIsMutable();
         argument_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
-      public Builder addArgument(org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument value) {
+      public Builder addArgument(org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -6191,10 +6191,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -6204,30 +6204,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder addArgument(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Builder builderForValue) {
         ensureArgumentIsMutable();
         argument_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder addArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Builder builderForValue) {
         ensureArgumentIsMutable();
         argument_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder addAllArgument(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureArgumentIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, argument_);
@@ -6235,7 +6235,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder clearArgument() {
         argument_ = java.util.Collections.emptyList();
@@ -6244,7 +6244,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type.Argument argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Type.Argument argument = 2;
        */
       public Builder removeArgument(int index) {
         ensureArgumentIsMutable();
@@ -6337,23 +6337,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Type flexibleUpperBound_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
       public boolean hasFlexibleUpperBound() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getFlexibleUpperBound() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getFlexibleUpperBound() {
         return flexibleUpperBound_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
-      public Builder setFlexibleUpperBound(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder setFlexibleUpperBound(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -6363,23 +6363,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
       public Builder setFlexibleUpperBound(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         flexibleUpperBound_ = builderForValue.build();
 
         bitField0_ |= 0x00000008;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
-      public Builder mergeFlexibleUpperBound(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder mergeFlexibleUpperBound(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000008) == 0x00000008) &&
-            flexibleUpperBound_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            flexibleUpperBound_ != org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance()) {
           flexibleUpperBound_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(flexibleUpperBound_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Type.newBuilder(flexibleUpperBound_).mergeFrom(value).buildPartial();
         } else {
           flexibleUpperBound_ = value;
         }
@@ -6388,10 +6388,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type flexible_upper_bound = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type flexible_upper_bound = 5;
        */
       public Builder clearFlexibleUpperBound() {
-        flexibleUpperBound_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        flexibleUpperBound_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
@@ -6609,23 +6609,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type outerType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Type outerType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
       public boolean hasOuterType() {
         return ((bitField0_ & 0x00000200) == 0x00000200);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getOuterType() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getOuterType() {
         return outerType_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
-      public Builder setOuterType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder setOuterType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -6635,23 +6635,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
       public Builder setOuterType(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         outerType_ = builderForValue.build();
 
         bitField0_ |= 0x00000200;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
-      public Builder mergeOuterType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder mergeOuterType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000200) == 0x00000200) &&
-            outerType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            outerType_ != org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance()) {
           outerType_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(outerType_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Type.newBuilder(outerType_).mergeFrom(value).buildPartial();
         } else {
           outerType_ = value;
         }
@@ -6660,10 +6660,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type outer_type = 10;
+       * optional .org.jetbrains.kotlin.metadata.Type outer_type = 10;
        */
       public Builder clearOuterType() {
-        outerType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        outerType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000200);
         return this;
@@ -6701,23 +6701,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type abbreviatedType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Type abbreviatedType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
       public boolean hasAbbreviatedType() {
         return ((bitField0_ & 0x00000800) == 0x00000800);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getAbbreviatedType() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getAbbreviatedType() {
         return abbreviatedType_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
-      public Builder setAbbreviatedType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder setAbbreviatedType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -6727,23 +6727,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
       public Builder setAbbreviatedType(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         abbreviatedType_ = builderForValue.build();
 
         bitField0_ |= 0x00000800;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
-      public Builder mergeAbbreviatedType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder mergeAbbreviatedType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000800) == 0x00000800) &&
-            abbreviatedType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            abbreviatedType_ != org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance()) {
           abbreviatedType_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(abbreviatedType_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Type.newBuilder(abbreviatedType_).mergeFrom(value).buildPartial();
         } else {
           abbreviatedType_ = value;
         }
@@ -6752,10 +6752,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type abbreviated_type = 13;
+       * optional .org.jetbrains.kotlin.metadata.Type abbreviated_type = 13;
        */
       public Builder clearAbbreviatedType() {
-        abbreviatedType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        abbreviatedType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000800);
         return this;
@@ -6841,7 +6841,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Type)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Type)
     }
 
     static {
@@ -6849,11 +6849,11 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Type)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Type)
   }
 
   public interface TypeParameterOrBuilder extends 
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.TypeParameter)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.TypeParameter)
        org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
             ExtendableMessageOrBuilder {
 
@@ -6885,25 +6885,25 @@ public final class ProtoBuf {
     boolean getReified();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
      */
     boolean hasVariance();
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance getVariance();
+    org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Variance getVariance();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
-    java.util.List 
+    java.util.List 
         getUpperBoundList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getUpperBound(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getUpperBound(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
     int getUpperBoundCount();
 
@@ -6921,15 +6921,15 @@ public final class ProtoBuf {
     int getUpperBoundId(int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeParameter}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.TypeParameter}
    */
   public static final class TypeParameter extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
         TypeParameter> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.TypeParameter)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.TypeParameter)
       TypeParameterOrBuilder {
     // Use TypeParameter.newBuilder() to construct.
-    private TypeParameter(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+    private TypeParameter(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -6988,7 +6988,7 @@ public final class ProtoBuf {
             }
             case 32: {
               int rawValue = input.readEnum();
-              org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance value = org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance.valueOf(rawValue);
+              org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Variance value = org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Variance.valueOf(rawValue);
               if (value == null) {
                 unknownFieldsCodedOutput.writeRawVarint32(tag);
                 unknownFieldsCodedOutput.writeRawVarint32(rawValue);
@@ -7000,10 +7000,10 @@ public final class ProtoBuf {
             }
             case 42: {
               if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-                upperBound_ = new java.util.ArrayList();
+                upperBound_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
-              upperBound_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry));
+              upperBound_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry));
               break;
             }
             case 48: {
@@ -7067,7 +7067,7 @@ public final class ProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.TypeParameter.Variance}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.TypeParameter.Variance}
      */
     public enum Variance
         implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -7128,7 +7128,7 @@ public final class ProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.TypeParameter.Variance)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.TypeParameter.Variance)
     }
 
     private int bitField0_;
@@ -7178,51 +7178,51 @@ public final class ProtoBuf {
     }
 
     public static final int VARIANCE_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance variance_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Variance variance_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
      */
     public boolean hasVariance() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+     * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance getVariance() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Variance getVariance() {
       return variance_;
     }
 
     public static final int UPPER_BOUND_FIELD_NUMBER = 5;
-    private java.util.List upperBound_;
+    private java.util.List upperBound_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
-    public java.util.List getUpperBoundList() {
+    public java.util.List getUpperBoundList() {
       return upperBound_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
-    public java.util.List 
+    public java.util.List 
         getUpperBoundOrBuilderList() {
       return upperBound_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
     public int getUpperBoundCount() {
       return upperBound_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getUpperBound(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getUpperBound(int index) {
       return upperBound_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+     * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeOrBuilder getUpperBoundOrBuilder(
         int index) {
       return upperBound_.get(index);
     }
@@ -7253,7 +7253,7 @@ public final class ProtoBuf {
       id_ = 0;
       name_ = 0;
       reified_ = false;
-      variance_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance.INV;
+      variance_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Variance.INV;
       upperBound_ = java.util.Collections.emptyList();
       upperBoundId_ = java.util.Collections.emptyList();
     }
@@ -7289,7 +7289,7 @@ public final class ProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, id_);
@@ -7361,53 +7361,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -7416,20 +7416,20 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeParameter}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.TypeParameter}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.TypeParameter)
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameterOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.newBuilder()
+          org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.TypeParameter)
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameterOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -7448,7 +7448,7 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000002);
         reified_ = false;
         bitField0_ = (bitField0_ & ~0x00000004);
-        variance_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance.INV;
+        variance_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Variance.INV;
         bitField0_ = (bitField0_ & ~0x00000008);
         upperBound_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -7461,20 +7461,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter result = new org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter result = new org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -7507,8 +7507,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.getDefaultInstance()) return this;
         if (other.hasId()) {
           setId(other.getId());
         }
@@ -7573,11 +7573,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -7684,23 +7684,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance variance_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance.INV;
+      private org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Variance variance_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Variance.INV;
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
        */
       public boolean hasVariance() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance getVariance() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Variance getVariance() {
         return variance_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
        */
-      public Builder setVariance(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance value) {
+      public Builder setVariance(org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Variance value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -7710,47 +7710,47 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeParameter.Variance variance = 4 [default = INV];
+       * optional .org.jetbrains.kotlin.metadata.TypeParameter.Variance variance = 4 [default = INV];
        */
       public Builder clearVariance() {
         bitField0_ = (bitField0_ & ~0x00000008);
-        variance_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance.INV;
+        variance_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Variance.INV;
         
         return this;
       }
 
-      private java.util.List upperBound_ =
+      private java.util.List upperBound_ =
         java.util.Collections.emptyList();
       private void ensureUpperBoundIsMutable() {
         if (!((bitField0_ & 0x00000010) == 0x00000010)) {
-          upperBound_ = new java.util.ArrayList(upperBound_);
+          upperBound_ = new java.util.ArrayList(upperBound_);
           bitField0_ |= 0x00000010;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
-      public java.util.List getUpperBoundList() {
+      public java.util.List getUpperBoundList() {
         return java.util.Collections.unmodifiableList(upperBound_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public int getUpperBoundCount() {
         return upperBound_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getUpperBound(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getUpperBound(int index) {
         return upperBound_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder setUpperBound(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -7760,19 +7760,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder setUpperBound(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         ensureUpperBoundIsMutable();
         upperBound_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
-      public Builder addUpperBound(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder addUpperBound(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -7782,10 +7782,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder addUpperBound(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -7795,30 +7795,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder addUpperBound(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         ensureUpperBoundIsMutable();
         upperBound_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder addUpperBound(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         ensureUpperBoundIsMutable();
         upperBound_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder addAllUpperBound(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureUpperBoundIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, upperBound_);
@@ -7826,7 +7826,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder clearUpperBound() {
         upperBound_ = java.util.Collections.emptyList();
@@ -7835,7 +7835,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type upper_bound = 5;
+       * repeated .org.jetbrains.kotlin.metadata.Type upper_bound = 5;
        */
       public Builder removeUpperBound(int index) {
         ensureUpperBoundIsMutable();
@@ -7910,7 +7910,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.TypeParameter)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.TypeParameter)
     }
 
     static {
@@ -7918,11 +7918,11 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.TypeParameter)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.TypeParameter)
   }
 
   public interface ClassOrBuilder extends 
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Class)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Class)
        org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
             ExtendableMessageOrBuilder {
 
@@ -7974,30 +7974,30 @@ public final class ProtoBuf {
     int getCompanionObjectName();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter getTypeParameter(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
     int getTypeParameterCount();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
-    java.util.List 
+    java.util.List 
         getSupertypeList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getSupertype(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getSupertype(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
     int getSupertypeCount();
 
@@ -8028,72 +8028,72 @@ public final class ProtoBuf {
     int getNestedClassName(int index);
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
-    java.util.List 
+    java.util.List 
         getConstructorList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Constructor getConstructor(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Constructor getConstructor(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
     int getConstructorCount();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
-    java.util.List 
+    java.util.List 
         getFunctionList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Function getFunction(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Function getFunction(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
     int getFunctionCount();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
-    java.util.List 
+    java.util.List 
         getPropertyList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Property getProperty(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Property getProperty(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
     int getPropertyCount();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
-    java.util.List 
+    java.util.List 
         getTypeAliasList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias getTypeAlias(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias getTypeAlias(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
     int getTypeAliasCount();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
-    java.util.List 
+    java.util.List 
         getEnumEntryList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry getEnumEntry(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry getEnumEntry(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
     int getEnumEntryCount();
 
@@ -8111,13 +8111,13 @@ public final class ProtoBuf {
     int getSealedSubclassFqName(int index);
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
     boolean hasTypeTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable();
+    org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable getTypeTable();
 
     /**
      * optional int32 version_requirement = 31;
@@ -8137,24 +8137,24 @@ public final class ProtoBuf {
     int getVersionRequirement();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
     boolean hasVersionRequirementTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable getVersionRequirementTable();
+    org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable getVersionRequirementTable();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Class}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Class}
    */
   public static final class Class extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
         Class> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Class)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Class)
       ClassOrBuilder {
     // Use Class.newBuilder() to construct.
-    private Class(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+    private Class(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -8234,18 +8234,18 @@ public final class ProtoBuf {
             }
             case 42: {
               if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                typeParameter_ = new java.util.ArrayList();
+                typeParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000008;
               }
-              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
+              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
               break;
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
-                supertype_ = new java.util.ArrayList();
+                supertype_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000010;
               }
-              supertype_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry));
+              supertype_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry));
               break;
             }
             case 56: {
@@ -8271,42 +8271,42 @@ public final class ProtoBuf {
             }
             case 66: {
               if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
-                constructor_ = new java.util.ArrayList();
+                constructor_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000080;
               }
-              constructor_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.PARSER, extensionRegistry));
+              constructor_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Constructor.PARSER, extensionRegistry));
               break;
             }
             case 74: {
               if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
-                function_ = new java.util.ArrayList();
+                function_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000100;
               }
-              function_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Function.PARSER, extensionRegistry));
+              function_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Function.PARSER, extensionRegistry));
               break;
             }
             case 82: {
               if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
-                property_ = new java.util.ArrayList();
+                property_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000200;
               }
-              property_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Property.PARSER, extensionRegistry));
+              property_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Property.PARSER, extensionRegistry));
               break;
             }
             case 90: {
               if (!((mutable_bitField0_ & 0x00000400) == 0x00000400)) {
-                typeAlias_ = new java.util.ArrayList();
+                typeAlias_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000400;
               }
-              typeAlias_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias.PARSER, extensionRegistry));
+              typeAlias_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias.PARSER, extensionRegistry));
               break;
             }
             case 106: {
               if (!((mutable_bitField0_ & 0x00000800) == 0x00000800)) {
-                enumEntry_ = new java.util.ArrayList();
+                enumEntry_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000800;
               }
-              enumEntry_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry.PARSER, extensionRegistry));
+              enumEntry_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry.PARSER, extensionRegistry));
               break;
             }
             case 128: {
@@ -8331,11 +8331,11 @@ public final class ProtoBuf {
               break;
             }
             case 242: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = typeTable_.toBuilder();
               }
-              typeTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.PARSER, extensionRegistry);
+              typeTable_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(typeTable_);
                 typeTable_ = subBuilder.buildPartial();
@@ -8349,11 +8349,11 @@ public final class ProtoBuf {
               break;
             }
             case 258: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000020) == 0x00000020)) {
                 subBuilder = versionRequirementTable_.toBuilder();
               }
-              versionRequirementTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.PARSER, extensionRegistry);
+              versionRequirementTable_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(versionRequirementTable_);
                 versionRequirementTable_ = subBuilder.buildPartial();
@@ -8425,7 +8425,7 @@ public final class ProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.Class.Kind}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.Class.Kind}
      */
     public enum Kind
         implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -8530,7 +8530,7 @@ public final class ProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Class.Kind)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Class.Kind)
     }
 
     private int bitField0_;
@@ -8600,71 +8600,71 @@ public final class ProtoBuf {
     }
 
     public static final int TYPE_PARAMETER_FIELD_NUMBER = 5;
-    private java.util.List typeParameter_;
+    private java.util.List typeParameter_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
-    public java.util.List getTypeParameterList() {
+    public java.util.List getTypeParameterList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeParameterOrBuilderList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
     public int getTypeParameterCount() {
       return typeParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter getTypeParameter(int index) {
       return typeParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index) {
       return typeParameter_.get(index);
     }
 
     public static final int SUPERTYPE_FIELD_NUMBER = 6;
-    private java.util.List supertype_;
+    private java.util.List supertype_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
-    public java.util.List getSupertypeList() {
+    public java.util.List getSupertypeList() {
       return supertype_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
-    public java.util.List 
+    public java.util.List 
         getSupertypeOrBuilderList() {
       return supertype_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
     public int getSupertypeCount() {
       return supertype_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getSupertype(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getSupertype(int index) {
       return supertype_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeOrBuilder getSupertypeOrBuilder(
         int index) {
       return supertype_.get(index);
     }
@@ -8716,176 +8716,176 @@ public final class ProtoBuf {
     private int nestedClassNameMemoizedSerializedSize = -1;
 
     public static final int CONSTRUCTOR_FIELD_NUMBER = 8;
-    private java.util.List constructor_;
+    private java.util.List constructor_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
-    public java.util.List getConstructorList() {
+    public java.util.List getConstructorList() {
       return constructor_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
-    public java.util.List 
+    public java.util.List 
         getConstructorOrBuilderList() {
       return constructor_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
     public int getConstructorCount() {
       return constructor_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Constructor getConstructor(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Constructor getConstructor(int index) {
       return constructor_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.ConstructorOrBuilder getConstructorOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.ConstructorOrBuilder getConstructorOrBuilder(
         int index) {
       return constructor_.get(index);
     }
 
     public static final int FUNCTION_FIELD_NUMBER = 9;
-    private java.util.List function_;
+    private java.util.List function_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
-    public java.util.List getFunctionList() {
+    public java.util.List getFunctionList() {
       return function_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
-    public java.util.List 
+    public java.util.List 
         getFunctionOrBuilderList() {
       return function_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
     public int getFunctionCount() {
       return function_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Function getFunction(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Function getFunction(int index) {
       return function_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
         int index) {
       return function_.get(index);
     }
 
     public static final int PROPERTY_FIELD_NUMBER = 10;
-    private java.util.List property_;
+    private java.util.List property_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
-    public java.util.List getPropertyList() {
+    public java.util.List getPropertyList() {
       return property_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
-    public java.util.List 
+    public java.util.List 
         getPropertyOrBuilderList() {
       return property_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
     public int getPropertyCount() {
       return property_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Property getProperty(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Property getProperty(int index) {
       return property_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
         int index) {
       return property_.get(index);
     }
 
     public static final int TYPE_ALIAS_FIELD_NUMBER = 11;
-    private java.util.List typeAlias_;
+    private java.util.List typeAlias_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
-    public java.util.List getTypeAliasList() {
+    public java.util.List getTypeAliasList() {
       return typeAlias_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeAliasOrBuilderList() {
       return typeAlias_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
     public int getTypeAliasCount() {
       return typeAlias_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias getTypeAlias(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias getTypeAlias(int index) {
       return typeAlias_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
         int index) {
       return typeAlias_.get(index);
     }
 
     public static final int ENUM_ENTRY_FIELD_NUMBER = 13;
-    private java.util.List enumEntry_;
+    private java.util.List enumEntry_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
-    public java.util.List getEnumEntryList() {
+    public java.util.List getEnumEntryList() {
       return enumEntry_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
-    public java.util.List 
+    public java.util.List 
         getEnumEntryOrBuilderList() {
       return enumEntry_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
     public int getEnumEntryCount() {
       return enumEntry_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry getEnumEntry(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry getEnumEntry(int index) {
       return enumEntry_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+     * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntryOrBuilder getEnumEntryOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntryOrBuilder getEnumEntryOrBuilder(
         int index) {
       return enumEntry_.get(index);
     }
@@ -8914,17 +8914,17 @@ public final class ProtoBuf {
     private int sealedSubclassFqNameMemoizedSerializedSize = -1;
 
     public static final int TYPE_TABLE_FIELD_NUMBER = 30;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable typeTable_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
     public boolean hasTypeTable() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable getTypeTable() {
       return typeTable_;
     }
 
@@ -8952,17 +8952,17 @@ public final class ProtoBuf {
     }
 
     public static final int VERSION_REQUIREMENT_TABLE_FIELD_NUMBER = 32;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable versionRequirementTable_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable versionRequirementTable_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
     public boolean hasVersionRequirementTable() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable getVersionRequirementTable() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable getVersionRequirementTable() {
       return versionRequirementTable_;
     }
 
@@ -8980,9 +8980,9 @@ public final class ProtoBuf {
       typeAlias_ = java.util.Collections.emptyList();
       enumEntry_ = java.util.Collections.emptyList();
       sealedSubclassFqName_ = java.util.Collections.emptyList();
-      typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+      typeTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance();
       versionRequirement_ = 0;
-      versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
+      versionRequirementTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -9054,7 +9054,7 @@ public final class ProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, flags_);
@@ -9233,53 +9233,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Class parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Class parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Class parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Class parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Class parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Class parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Class parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Class parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Class parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Class parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Class parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -9288,20 +9288,20 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Class prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.Class prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Class}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Class}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.Class, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Class)
-        org.jetbrains.kotlin.serialization.ProtoBuf.ClassOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Class.newBuilder()
+          org.jetbrains.kotlin.metadata.ProtoBuf.Class, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Class)
+        org.jetbrains.kotlin.metadata.ProtoBuf.ClassOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.Class.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -9340,11 +9340,11 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000800);
         sealedSubclassFqName_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00001000);
-        typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+        typeTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00002000);
         versionRequirement_ = 0;
         bitField0_ = (bitField0_ & ~0x00004000);
-        versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
+        versionRequirementTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00008000);
         return this;
       }
@@ -9353,20 +9353,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Class getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Class getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.Class.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Class build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Class result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Class build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Class result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Class buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Class result = new org.jetbrains.kotlin.serialization.ProtoBuf.Class(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Class buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Class result = new org.jetbrains.kotlin.metadata.ProtoBuf.Class(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -9447,8 +9447,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Class other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.Class other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.Class.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -9637,11 +9637,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Class parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.Class parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Class) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.Class) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -9788,38 +9788,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List typeParameter_ =
+      private java.util.List typeParameter_ =
         java.util.Collections.emptyList();
       private void ensureTypeParameterIsMutable() {
         if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-          typeParameter_ = new java.util.ArrayList(typeParameter_);
+          typeParameter_ = new java.util.ArrayList(typeParameter_);
           bitField0_ |= 0x00000008;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
-      public java.util.List getTypeParameterList() {
+      public java.util.List getTypeParameterList() {
         return java.util.Collections.unmodifiableList(typeParameter_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public int getTypeParameterCount() {
         return typeParameter_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter getTypeParameter(int index) {
         return typeParameter_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -9829,19 +9829,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
-      public Builder addTypeParameter(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
+      public Builder addTypeParameter(org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -9851,10 +9851,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -9864,30 +9864,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder addTypeParameter(
-          org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder addAllTypeParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureTypeParameterIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, typeParameter_);
@@ -9895,7 +9895,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder clearTypeParameter() {
         typeParameter_ = java.util.Collections.emptyList();
@@ -9904,7 +9904,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 5;
        */
       public Builder removeTypeParameter(int index) {
         ensureTypeParameterIsMutable();
@@ -9913,38 +9913,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List supertype_ =
+      private java.util.List supertype_ =
         java.util.Collections.emptyList();
       private void ensureSupertypeIsMutable() {
         if (!((bitField0_ & 0x00000010) == 0x00000010)) {
-          supertype_ = new java.util.ArrayList(supertype_);
+          supertype_ = new java.util.ArrayList(supertype_);
           bitField0_ |= 0x00000010;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
-      public java.util.List getSupertypeList() {
+      public java.util.List getSupertypeList() {
         return java.util.Collections.unmodifiableList(supertype_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public int getSupertypeCount() {
         return supertype_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getSupertype(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getSupertype(int index) {
         return supertype_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder setSupertype(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -9954,19 +9954,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder setSupertype(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         ensureSupertypeIsMutable();
         supertype_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
-      public Builder addSupertype(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder addSupertype(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -9976,10 +9976,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder addSupertype(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -9989,30 +9989,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder addSupertype(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         ensureSupertypeIsMutable();
         supertype_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder addSupertype(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         ensureSupertypeIsMutable();
         supertype_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder addAllSupertype(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureSupertypeIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, supertype_);
@@ -10020,7 +10020,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder clearSupertype() {
         supertype_ = java.util.Collections.emptyList();
@@ -10029,7 +10029,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type supertype = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Type supertype = 6;
        */
       public Builder removeSupertype(int index) {
         ensureSupertypeIsMutable();
@@ -10170,38 +10170,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List constructor_ =
+      private java.util.List constructor_ =
         java.util.Collections.emptyList();
       private void ensureConstructorIsMutable() {
         if (!((bitField0_ & 0x00000080) == 0x00000080)) {
-          constructor_ = new java.util.ArrayList(constructor_);
+          constructor_ = new java.util.ArrayList(constructor_);
           bitField0_ |= 0x00000080;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
-      public java.util.List getConstructorList() {
+      public java.util.List getConstructorList() {
         return java.util.Collections.unmodifiableList(constructor_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public int getConstructorCount() {
         return constructor_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Constructor getConstructor(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Constructor getConstructor(int index) {
         return constructor_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder setConstructor(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Constructor value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Constructor value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10211,19 +10211,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder setConstructor(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Constructor.Builder builderForValue) {
         ensureConstructorIsMutable();
         constructor_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
-      public Builder addConstructor(org.jetbrains.kotlin.serialization.ProtoBuf.Constructor value) {
+      public Builder addConstructor(org.jetbrains.kotlin.metadata.ProtoBuf.Constructor value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10233,10 +10233,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder addConstructor(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Constructor value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Constructor value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10246,30 +10246,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder addConstructor(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Constructor.Builder builderForValue) {
         ensureConstructorIsMutable();
         constructor_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder addConstructor(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Constructor.Builder builderForValue) {
         ensureConstructorIsMutable();
         constructor_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder addAllConstructor(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureConstructorIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, constructor_);
@@ -10277,7 +10277,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder clearConstructor() {
         constructor_ = java.util.Collections.emptyList();
@@ -10286,7 +10286,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Constructor constructor = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Constructor constructor = 8;
        */
       public Builder removeConstructor(int index) {
         ensureConstructorIsMutable();
@@ -10295,38 +10295,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List function_ =
+      private java.util.List function_ =
         java.util.Collections.emptyList();
       private void ensureFunctionIsMutable() {
         if (!((bitField0_ & 0x00000100) == 0x00000100)) {
-          function_ = new java.util.ArrayList(function_);
+          function_ = new java.util.ArrayList(function_);
           bitField0_ |= 0x00000100;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
-      public java.util.List getFunctionList() {
+      public java.util.List getFunctionList() {
         return java.util.Collections.unmodifiableList(function_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public int getFunctionCount() {
         return function_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Function getFunction(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Function getFunction(int index) {
         return function_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder setFunction(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Function value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Function value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10336,19 +10336,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder setFunction(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Function.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Function.Builder builderForValue) {
         ensureFunctionIsMutable();
         function_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
-      public Builder addFunction(org.jetbrains.kotlin.serialization.ProtoBuf.Function value) {
+      public Builder addFunction(org.jetbrains.kotlin.metadata.ProtoBuf.Function value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10358,10 +10358,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder addFunction(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Function value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Function value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10371,30 +10371,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder addFunction(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Function.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Function.Builder builderForValue) {
         ensureFunctionIsMutable();
         function_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder addFunction(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Function.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Function.Builder builderForValue) {
         ensureFunctionIsMutable();
         function_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder addAllFunction(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureFunctionIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, function_);
@@ -10402,7 +10402,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder clearFunction() {
         function_ = java.util.Collections.emptyList();
@@ -10411,7 +10411,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 9;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 9;
        */
       public Builder removeFunction(int index) {
         ensureFunctionIsMutable();
@@ -10420,38 +10420,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List property_ =
+      private java.util.List property_ =
         java.util.Collections.emptyList();
       private void ensurePropertyIsMutable() {
         if (!((bitField0_ & 0x00000200) == 0x00000200)) {
-          property_ = new java.util.ArrayList(property_);
+          property_ = new java.util.ArrayList(property_);
           bitField0_ |= 0x00000200;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
-      public java.util.List getPropertyList() {
+      public java.util.List getPropertyList() {
         return java.util.Collections.unmodifiableList(property_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public int getPropertyCount() {
         return property_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Property getProperty(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Property getProperty(int index) {
         return property_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder setProperty(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Property value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Property value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10461,19 +10461,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder setProperty(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Property.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Property.Builder builderForValue) {
         ensurePropertyIsMutable();
         property_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
-      public Builder addProperty(org.jetbrains.kotlin.serialization.ProtoBuf.Property value) {
+      public Builder addProperty(org.jetbrains.kotlin.metadata.ProtoBuf.Property value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10483,10 +10483,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder addProperty(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Property value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Property value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10496,30 +10496,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder addProperty(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Property.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Property.Builder builderForValue) {
         ensurePropertyIsMutable();
         property_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder addProperty(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Property.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Property.Builder builderForValue) {
         ensurePropertyIsMutable();
         property_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder addAllProperty(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensurePropertyIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, property_);
@@ -10527,7 +10527,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder clearProperty() {
         property_ = java.util.Collections.emptyList();
@@ -10536,7 +10536,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 10;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 10;
        */
       public Builder removeProperty(int index) {
         ensurePropertyIsMutable();
@@ -10545,38 +10545,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List typeAlias_ =
+      private java.util.List typeAlias_ =
         java.util.Collections.emptyList();
       private void ensureTypeAliasIsMutable() {
         if (!((bitField0_ & 0x00000400) == 0x00000400)) {
-          typeAlias_ = new java.util.ArrayList(typeAlias_);
+          typeAlias_ = new java.util.ArrayList(typeAlias_);
           bitField0_ |= 0x00000400;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
-      public java.util.List getTypeAliasList() {
+      public java.util.List getTypeAliasList() {
         return java.util.Collections.unmodifiableList(typeAlias_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public int getTypeAliasCount() {
         return typeAlias_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias getTypeAlias(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias getTypeAlias(int index) {
         return typeAlias_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder setTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10586,19 +10586,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder setTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias.Builder builderForValue) {
         ensureTypeAliasIsMutable();
         typeAlias_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
-      public Builder addTypeAlias(org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias value) {
+      public Builder addTypeAlias(org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10608,10 +10608,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder addTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10621,30 +10621,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder addTypeAlias(
-          org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias.Builder builderForValue) {
         ensureTypeAliasIsMutable();
         typeAlias_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder addTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias.Builder builderForValue) {
         ensureTypeAliasIsMutable();
         typeAlias_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder addAllTypeAlias(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureTypeAliasIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, typeAlias_);
@@ -10652,7 +10652,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder clearTypeAlias() {
         typeAlias_ = java.util.Collections.emptyList();
@@ -10661,7 +10661,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 11;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 11;
        */
       public Builder removeTypeAlias(int index) {
         ensureTypeAliasIsMutable();
@@ -10670,38 +10670,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List enumEntry_ =
+      private java.util.List enumEntry_ =
         java.util.Collections.emptyList();
       private void ensureEnumEntryIsMutable() {
         if (!((bitField0_ & 0x00000800) == 0x00000800)) {
-          enumEntry_ = new java.util.ArrayList(enumEntry_);
+          enumEntry_ = new java.util.ArrayList(enumEntry_);
           bitField0_ |= 0x00000800;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
-      public java.util.List getEnumEntryList() {
+      public java.util.List getEnumEntryList() {
         return java.util.Collections.unmodifiableList(enumEntry_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public int getEnumEntryCount() {
         return enumEntry_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry getEnumEntry(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry getEnumEntry(int index) {
         return enumEntry_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder setEnumEntry(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10711,19 +10711,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder setEnumEntry(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry.Builder builderForValue) {
         ensureEnumEntryIsMutable();
         enumEntry_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
-      public Builder addEnumEntry(org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry value) {
+      public Builder addEnumEntry(org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10733,10 +10733,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder addEnumEntry(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10746,30 +10746,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder addEnumEntry(
-          org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry.Builder builderForValue) {
         ensureEnumEntryIsMutable();
         enumEntry_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder addEnumEntry(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry.Builder builderForValue) {
         ensureEnumEntryIsMutable();
         enumEntry_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder addAllEnumEntry(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureEnumEntryIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, enumEntry_);
@@ -10777,7 +10777,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder clearEnumEntry() {
         enumEntry_ = java.util.Collections.emptyList();
@@ -10786,7 +10786,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.EnumEntry enum_entry = 13;
+       * repeated .org.jetbrains.kotlin.metadata.EnumEntry enum_entry = 13;
        */
       public Builder removeEnumEntry(int index) {
         ensureEnumEntryIsMutable();
@@ -10861,23 +10861,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public boolean hasTypeTable() {
         return ((bitField0_ & 0x00002000) == 0x00002000);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable getTypeTable() {
         return typeTable_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public Builder setTypeTable(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable value) {
+      public Builder setTypeTable(org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10887,23 +10887,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public Builder setTypeTable(
-          org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.Builder builderForValue) {
         typeTable_ = builderForValue.build();
 
         bitField0_ |= 0x00002000;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public Builder mergeTypeTable(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable value) {
+      public Builder mergeTypeTable(org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable value) {
         if (((bitField0_ & 0x00002000) == 0x00002000) &&
-            typeTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance()) {
+            typeTable_ != org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance()) {
           typeTable_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
         } else {
           typeTable_ = value;
         }
@@ -10912,10 +10912,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public Builder clearTypeTable() {
-        typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+        typeTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00002000);
         return this;
@@ -10969,23 +10969,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable versionRequirementTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
       public boolean hasVersionRequirementTable() {
         return ((bitField0_ & 0x00008000) == 0x00008000);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable getVersionRequirementTable() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable getVersionRequirementTable() {
         return versionRequirementTable_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public Builder setVersionRequirementTable(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable value) {
+      public Builder setVersionRequirementTable(org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -10995,23 +10995,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
       public Builder setVersionRequirementTable(
-          org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.Builder builderForValue) {
         versionRequirementTable_ = builderForValue.build();
 
         bitField0_ |= 0x00008000;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public Builder mergeVersionRequirementTable(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable value) {
+      public Builder mergeVersionRequirementTable(org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable value) {
         if (((bitField0_ & 0x00008000) == 0x00008000) &&
-            versionRequirementTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance()) {
+            versionRequirementTable_ != org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.getDefaultInstance()) {
           versionRequirementTable_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.newBuilder(versionRequirementTable_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.newBuilder(versionRequirementTable_).mergeFrom(value).buildPartial();
         } else {
           versionRequirementTable_ = value;
         }
@@ -11020,16 +11020,16 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
       public Builder clearVersionRequirementTable() {
-        versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
+        versionRequirementTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00008000);
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Class)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Class)
     }
 
     static {
@@ -11037,84 +11037,84 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Class)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Class)
   }
 
   public interface PackageOrBuilder extends 
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Package)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Package)
        org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
             ExtendableMessageOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
-    java.util.List 
+    java.util.List 
         getFunctionList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Function getFunction(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Function getFunction(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
     int getFunctionCount();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
-    java.util.List 
+    java.util.List 
         getPropertyList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Property getProperty(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Property getProperty(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
     int getPropertyCount();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
-    java.util.List 
+    java.util.List 
         getTypeAliasList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias getTypeAlias(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias getTypeAlias(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
     int getTypeAliasCount();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
     boolean hasTypeTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable();
+    org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable getTypeTable();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
     boolean hasVersionRequirementTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable getVersionRequirementTable();
+    org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable getVersionRequirementTable();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Package}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Package}
    */
   public static final class Package extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
         Package> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Package)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Package)
       PackageOrBuilder {
     // Use Package.newBuilder() to construct.
-    private Package(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+    private Package(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -11158,34 +11158,34 @@ public final class ProtoBuf {
             }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                function_ = new java.util.ArrayList();
+                function_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              function_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Function.PARSER, extensionRegistry));
+              function_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Function.PARSER, extensionRegistry));
               break;
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                property_ = new java.util.ArrayList();
+                property_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              property_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Property.PARSER, extensionRegistry));
+              property_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Property.PARSER, extensionRegistry));
               break;
             }
             case 42: {
               if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-                typeAlias_ = new java.util.ArrayList();
+                typeAlias_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
-              typeAlias_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias.PARSER, extensionRegistry));
+              typeAlias_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias.PARSER, extensionRegistry));
               break;
             }
             case 242: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = typeTable_.toBuilder();
               }
-              typeTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.PARSER, extensionRegistry);
+              typeTable_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(typeTable_);
                 typeTable_ = subBuilder.buildPartial();
@@ -11194,11 +11194,11 @@ public final class ProtoBuf {
               break;
             }
             case 258: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = versionRequirementTable_.toBuilder();
               }
-              versionRequirementTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.PARSER, extensionRegistry);
+              versionRequirementTable_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(versionRequirementTable_);
                 versionRequirementTable_ = subBuilder.buildPartial();
@@ -11250,137 +11250,137 @@ public final class ProtoBuf {
 
     private int bitField0_;
     public static final int FUNCTION_FIELD_NUMBER = 3;
-    private java.util.List function_;
+    private java.util.List function_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
-    public java.util.List getFunctionList() {
+    public java.util.List getFunctionList() {
       return function_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
-    public java.util.List 
+    public java.util.List 
         getFunctionOrBuilderList() {
       return function_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
     public int getFunctionCount() {
       return function_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Function getFunction(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Function getFunction(int index) {
       return function_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+     * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.FunctionOrBuilder getFunctionOrBuilder(
         int index) {
       return function_.get(index);
     }
 
     public static final int PROPERTY_FIELD_NUMBER = 4;
-    private java.util.List property_;
+    private java.util.List property_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
-    public java.util.List getPropertyList() {
+    public java.util.List getPropertyList() {
       return property_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
-    public java.util.List 
+    public java.util.List 
         getPropertyOrBuilderList() {
       return property_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
     public int getPropertyCount() {
       return property_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Property getProperty(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Property getProperty(int index) {
       return property_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.PropertyOrBuilder getPropertyOrBuilder(
         int index) {
       return property_.get(index);
     }
 
     public static final int TYPE_ALIAS_FIELD_NUMBER = 5;
-    private java.util.List typeAlias_;
+    private java.util.List typeAlias_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
-    public java.util.List getTypeAliasList() {
+    public java.util.List getTypeAliasList() {
       return typeAlias_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeAliasOrBuilderList() {
       return typeAlias_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
     public int getTypeAliasCount() {
       return typeAlias_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias getTypeAlias(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias getTypeAlias(int index) {
       return typeAlias_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+     * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeAliasOrBuilder getTypeAliasOrBuilder(
         int index) {
       return typeAlias_.get(index);
     }
 
     public static final int TYPE_TABLE_FIELD_NUMBER = 30;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable typeTable_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
     public boolean hasTypeTable() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable getTypeTable() {
       return typeTable_;
     }
 
     public static final int VERSION_REQUIREMENT_TABLE_FIELD_NUMBER = 32;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable versionRequirementTable_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable versionRequirementTable_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
     public boolean hasVersionRequirementTable() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable getVersionRequirementTable() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable getVersionRequirementTable() {
       return versionRequirementTable_;
     }
 
@@ -11388,8 +11388,8 @@ public final class ProtoBuf {
       function_ = java.util.Collections.emptyList();
       property_ = java.util.Collections.emptyList();
       typeAlias_ = java.util.Collections.emptyList();
-      typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
-      versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
+      typeTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance();
+      versionRequirementTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -11433,7 +11433,7 @@ public final class ProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       for (int i = 0; i < function_.size(); i++) {
         output.writeMessage(3, function_.get(i));
@@ -11493,53 +11493,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Package parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Package parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Package parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Package parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Package parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Package parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Package parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Package parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Package parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Package parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Package parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -11548,20 +11548,20 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Package prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.Package prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Package}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Package}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.Package, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Package)
-        org.jetbrains.kotlin.serialization.ProtoBuf.PackageOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Package.newBuilder()
+          org.jetbrains.kotlin.metadata.ProtoBuf.Package, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Package)
+        org.jetbrains.kotlin.metadata.ProtoBuf.PackageOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.Package.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -11580,9 +11580,9 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000002);
         typeAlias_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000004);
-        typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+        typeTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000008);
-        versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
+        versionRequirementTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
@@ -11591,20 +11591,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Package getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Package getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.Package.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Package build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Package result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Package build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Package result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Package buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Package result = new org.jetbrains.kotlin.serialization.ProtoBuf.Package(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Package buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Package result = new org.jetbrains.kotlin.metadata.ProtoBuf.Package(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -11634,8 +11634,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Package other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.Package other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.Package.getDefaultInstance()) return this;
         if (!other.function_.isEmpty()) {
           if (function_.isEmpty()) {
             function_ = other.function_;
@@ -11714,11 +11714,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Package parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.Package parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Package) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.Package) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -11729,38 +11729,38 @@ public final class ProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List function_ =
+      private java.util.List function_ =
         java.util.Collections.emptyList();
       private void ensureFunctionIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          function_ = new java.util.ArrayList(function_);
+          function_ = new java.util.ArrayList(function_);
           bitField0_ |= 0x00000001;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
-      public java.util.List getFunctionList() {
+      public java.util.List getFunctionList() {
         return java.util.Collections.unmodifiableList(function_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public int getFunctionCount() {
         return function_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Function getFunction(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Function getFunction(int index) {
         return function_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder setFunction(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Function value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Function value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -11770,19 +11770,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder setFunction(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Function.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Function.Builder builderForValue) {
         ensureFunctionIsMutable();
         function_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
-      public Builder addFunction(org.jetbrains.kotlin.serialization.ProtoBuf.Function value) {
+      public Builder addFunction(org.jetbrains.kotlin.metadata.ProtoBuf.Function value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -11792,10 +11792,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder addFunction(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Function value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Function value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -11805,30 +11805,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder addFunction(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Function.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Function.Builder builderForValue) {
         ensureFunctionIsMutable();
         function_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder addFunction(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Function.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Function.Builder builderForValue) {
         ensureFunctionIsMutable();
         function_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder addAllFunction(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureFunctionIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, function_);
@@ -11836,7 +11836,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder clearFunction() {
         function_ = java.util.Collections.emptyList();
@@ -11845,7 +11845,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Function function = 3;
+       * repeated .org.jetbrains.kotlin.metadata.Function function = 3;
        */
       public Builder removeFunction(int index) {
         ensureFunctionIsMutable();
@@ -11854,38 +11854,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List property_ =
+      private java.util.List property_ =
         java.util.Collections.emptyList();
       private void ensurePropertyIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          property_ = new java.util.ArrayList(property_);
+          property_ = new java.util.ArrayList(property_);
           bitField0_ |= 0x00000002;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
-      public java.util.List getPropertyList() {
+      public java.util.List getPropertyList() {
         return java.util.Collections.unmodifiableList(property_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public int getPropertyCount() {
         return property_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Property getProperty(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Property getProperty(int index) {
         return property_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder setProperty(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Property value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Property value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -11895,19 +11895,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder setProperty(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Property.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Property.Builder builderForValue) {
         ensurePropertyIsMutable();
         property_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
-      public Builder addProperty(org.jetbrains.kotlin.serialization.ProtoBuf.Property value) {
+      public Builder addProperty(org.jetbrains.kotlin.metadata.ProtoBuf.Property value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -11917,10 +11917,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder addProperty(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Property value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Property value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -11930,30 +11930,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder addProperty(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Property.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Property.Builder builderForValue) {
         ensurePropertyIsMutable();
         property_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder addProperty(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Property.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Property.Builder builderForValue) {
         ensurePropertyIsMutable();
         property_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder addAllProperty(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensurePropertyIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, property_);
@@ -11961,7 +11961,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder clearProperty() {
         property_ = java.util.Collections.emptyList();
@@ -11970,7 +11970,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Property property = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Property property = 4;
        */
       public Builder removeProperty(int index) {
         ensurePropertyIsMutable();
@@ -11979,38 +11979,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List typeAlias_ =
+      private java.util.List typeAlias_ =
         java.util.Collections.emptyList();
       private void ensureTypeAliasIsMutable() {
         if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-          typeAlias_ = new java.util.ArrayList(typeAlias_);
+          typeAlias_ = new java.util.ArrayList(typeAlias_);
           bitField0_ |= 0x00000004;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
-      public java.util.List getTypeAliasList() {
+      public java.util.List getTypeAliasList() {
         return java.util.Collections.unmodifiableList(typeAlias_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public int getTypeAliasCount() {
         return typeAlias_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias getTypeAlias(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias getTypeAlias(int index) {
         return typeAlias_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder setTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -12020,19 +12020,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder setTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias.Builder builderForValue) {
         ensureTypeAliasIsMutable();
         typeAlias_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
-      public Builder addTypeAlias(org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias value) {
+      public Builder addTypeAlias(org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -12042,10 +12042,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder addTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -12055,30 +12055,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder addTypeAlias(
-          org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias.Builder builderForValue) {
         ensureTypeAliasIsMutable();
         typeAlias_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder addTypeAlias(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias.Builder builderForValue) {
         ensureTypeAliasIsMutable();
         typeAlias_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder addAllTypeAlias(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureTypeAliasIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, typeAlias_);
@@ -12086,7 +12086,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder clearTypeAlias() {
         typeAlias_ = java.util.Collections.emptyList();
@@ -12095,7 +12095,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeAlias type_alias = 5;
+       * repeated .org.jetbrains.kotlin.metadata.TypeAlias type_alias = 5;
        */
       public Builder removeTypeAlias(int index) {
         ensureTypeAliasIsMutable();
@@ -12104,23 +12104,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public boolean hasTypeTable() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable getTypeTable() {
         return typeTable_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public Builder setTypeTable(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable value) {
+      public Builder setTypeTable(org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -12130,23 +12130,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public Builder setTypeTable(
-          org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.Builder builderForValue) {
         typeTable_ = builderForValue.build();
 
         bitField0_ |= 0x00000008;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public Builder mergeTypeTable(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable value) {
+      public Builder mergeTypeTable(org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable value) {
         if (((bitField0_ & 0x00000008) == 0x00000008) &&
-            typeTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance()) {
+            typeTable_ != org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance()) {
           typeTable_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
         } else {
           typeTable_ = value;
         }
@@ -12155,32 +12155,32 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public Builder clearTypeTable() {
-        typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+        typeTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable versionRequirementTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
       public boolean hasVersionRequirementTable() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable getVersionRequirementTable() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable getVersionRequirementTable() {
         return versionRequirementTable_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public Builder setVersionRequirementTable(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable value) {
+      public Builder setVersionRequirementTable(org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -12190,23 +12190,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
       public Builder setVersionRequirementTable(
-          org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.Builder builderForValue) {
         versionRequirementTable_ = builderForValue.build();
 
         bitField0_ |= 0x00000010;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
-      public Builder mergeVersionRequirementTable(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable value) {
+      public Builder mergeVersionRequirementTable(org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable value) {
         if (((bitField0_ & 0x00000010) == 0x00000010) &&
-            versionRequirementTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance()) {
+            versionRequirementTable_ != org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.getDefaultInstance()) {
           versionRequirementTable_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.newBuilder(versionRequirementTable_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.newBuilder(versionRequirementTable_).mergeFrom(value).buildPartial();
         } else {
           versionRequirementTable_ = value;
         }
@@ -12215,16 +12215,16 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirementTable version_requirement_table = 32;
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirementTable version_requirement_table = 32;
        */
       public Builder clearVersionRequirementTable() {
-        versionRequirementTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
+        versionRequirementTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Package)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Package)
     }
 
     static {
@@ -12232,24 +12232,24 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Package)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Package)
   }
 
   public interface TypeTableOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.TypeTable)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.TypeTable)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
-    java.util.List 
+    java.util.List 
         getTypeList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getType(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getType(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
     int getTypeCount();
 
@@ -12273,11 +12273,11 @@ public final class ProtoBuf {
     int getFirstNullable();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeTable}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.TypeTable}
    */
   public static final class TypeTable extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.TypeTable)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.TypeTable)
       TypeTableOrBuilder {
     // Use TypeTable.newBuilder() to construct.
     private TypeTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -12324,10 +12324,10 @@ public final class ProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                type_ = new java.util.ArrayList();
+                type_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              type_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry));
+              type_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry));
               break;
             }
             case 16: {
@@ -12373,36 +12373,36 @@ public final class ProtoBuf {
 
     private int bitField0_;
     public static final int TYPE_FIELD_NUMBER = 1;
-    private java.util.List type_;
+    private java.util.List type_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
-    public java.util.List getTypeList() {
+    public java.util.List getTypeList() {
       return type_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeOrBuilderList() {
       return type_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
     public int getTypeCount() {
       return type_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getType(int index) {
       return type_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeOrBuilder getTypeOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeOrBuilder getTypeOrBuilder(
         int index) {
       return type_.get(index);
     }
@@ -12490,53 +12490,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -12545,21 +12545,21 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeTable}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.TypeTable}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable, Builder>
+          org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.TypeTable)
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeTableOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.TypeTable)
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeTableOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -12583,20 +12583,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable result = new org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable result = new org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -12612,8 +12612,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance()) return this;
         if (!other.type_.isEmpty()) {
           if (type_.isEmpty()) {
             type_ = other.type_;
@@ -12646,11 +12646,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -12661,38 +12661,38 @@ public final class ProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List type_ =
+      private java.util.List type_ =
         java.util.Collections.emptyList();
       private void ensureTypeIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          type_ = new java.util.ArrayList(type_);
+          type_ = new java.util.ArrayList(type_);
           bitField0_ |= 0x00000001;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
-      public java.util.List getTypeList() {
+      public java.util.List getTypeList() {
         return java.util.Collections.unmodifiableList(type_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public int getTypeCount() {
         return type_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getType(int index) {
         return type_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder setType(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -12702,19 +12702,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder setType(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         ensureTypeIsMutable();
         type_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
-      public Builder addType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder addType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -12724,10 +12724,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder addType(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -12737,30 +12737,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder addType(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         ensureTypeIsMutable();
         type_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder addType(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         ensureTypeIsMutable();
         type_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder addAllType(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureTypeIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, type_);
@@ -12768,7 +12768,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder clearType() {
         type_ = java.util.Collections.emptyList();
@@ -12777,7 +12777,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Type type = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Type type = 1;
        */
       public Builder removeType(int index) {
         ensureTypeIsMutable();
@@ -12838,7 +12838,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.TypeTable)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.TypeTable)
     }
 
     static {
@@ -12846,11 +12846,11 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.TypeTable)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.TypeTable)
   }
 
   public interface ConstructorOrBuilder extends 
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Constructor)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Constructor)
        org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
             ExtendableMessageOrBuilder {
 
@@ -12876,16 +12876,16 @@ public final class ProtoBuf {
     int getFlags();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
-    java.util.List 
+    java.util.List 
         getValueParameterList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getValueParameter(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter getValueParameter(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
     int getValueParameterCount();
 
@@ -12907,15 +12907,15 @@ public final class ProtoBuf {
     int getVersionRequirement();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Constructor}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Constructor}
    */
   public static final class Constructor extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
         Constructor> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Constructor)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Constructor)
       ConstructorOrBuilder {
     // Use Constructor.newBuilder() to construct.
-    private Constructor(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+    private Constructor(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -12964,10 +12964,10 @@ public final class ProtoBuf {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                valueParameter_ = new java.util.ArrayList();
+                valueParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.PARSER, extensionRegistry));
+              valueParameter_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.PARSER, extensionRegistry));
               break;
             }
             case 248: {
@@ -13040,36 +13040,36 @@ public final class ProtoBuf {
     }
 
     public static final int VALUE_PARAMETER_FIELD_NUMBER = 2;
-    private java.util.List valueParameter_;
+    private java.util.List valueParameter_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
-    public java.util.List getValueParameterList() {
+    public java.util.List getValueParameterList() {
       return valueParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getValueParameterOrBuilderList() {
       return valueParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
     public int getValueParameterCount() {
       return valueParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getValueParameter(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter getValueParameter(int index) {
       return valueParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
         int index) {
       return valueParameter_.get(index);
     }
@@ -13126,7 +13126,7 @@ public final class ProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, flags_);
@@ -13172,53 +13172,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Constructor parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Constructor parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Constructor parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Constructor parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Constructor parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Constructor parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Constructor parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Constructor parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Constructor parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Constructor parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Constructor parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Constructor parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Constructor parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Constructor parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Constructor parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Constructor parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Constructor parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Constructor parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Constructor parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Constructor parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -13227,20 +13227,20 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Constructor prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.Constructor prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Constructor}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Constructor}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.Constructor, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Constructor)
-        org.jetbrains.kotlin.serialization.ProtoBuf.ConstructorOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.newBuilder()
+          org.jetbrains.kotlin.metadata.ProtoBuf.Constructor, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Constructor)
+        org.jetbrains.kotlin.metadata.ProtoBuf.ConstructorOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.Constructor.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -13266,20 +13266,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Constructor getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Constructor getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.Constructor.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Constructor build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Constructor result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Constructor build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Constructor result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Constructor buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Constructor result = new org.jetbrains.kotlin.serialization.ProtoBuf.Constructor(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Constructor buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Constructor result = new org.jetbrains.kotlin.metadata.ProtoBuf.Constructor(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -13299,8 +13299,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Constructor other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.Constructor other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.Constructor.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -13341,11 +13341,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Constructor parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.Constructor parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Constructor) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.Constructor) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -13412,38 +13412,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List valueParameter_ =
+      private java.util.List valueParameter_ =
         java.util.Collections.emptyList();
       private void ensureValueParameterIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          valueParameter_ = new java.util.ArrayList(valueParameter_);
+          valueParameter_ = new java.util.ArrayList(valueParameter_);
           bitField0_ |= 0x00000002;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
-      public java.util.List getValueParameterList() {
+      public java.util.List getValueParameterList() {
         return java.util.Collections.unmodifiableList(valueParameter_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public int getValueParameterCount() {
         return valueParameter_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getValueParameter(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter getValueParameter(int index) {
         return valueParameter_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder setValueParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -13453,19 +13453,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder setValueParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.Builder builderForValue) {
         ensureValueParameterIsMutable();
         valueParameter_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
-      public Builder addValueParameter(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
+      public Builder addValueParameter(org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -13475,10 +13475,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder addValueParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -13488,30 +13488,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder addValueParameter(
-          org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.Builder builderForValue) {
         ensureValueParameterIsMutable();
         valueParameter_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder addValueParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.Builder builderForValue) {
         ensureValueParameterIsMutable();
         valueParameter_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder addAllValueParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureValueParameterIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, valueParameter_);
@@ -13519,7 +13519,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder clearValueParameter() {
         valueParameter_ = java.util.Collections.emptyList();
@@ -13528,7 +13528,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 2;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 2;
        */
       public Builder removeValueParameter(int index) {
         ensureValueParameterIsMutable();
@@ -13585,7 +13585,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Constructor)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Constructor)
     }
 
     static {
@@ -13593,11 +13593,11 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Constructor)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Constructor)
   }
 
   public interface FunctionOrBuilder extends 
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Function)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Function)
        org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
             ExtendableMessageOrBuilder {
 
@@ -13657,13 +13657,13 @@ public final class ProtoBuf {
     int getName();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
     boolean hasReturnType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getReturnType();
 
     /**
      * optional int32 return_type_id = 7;
@@ -13675,27 +13675,27 @@ public final class ProtoBuf {
     int getReturnTypeId();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter getTypeParameter(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
     int getTypeParameterCount();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
     boolean hasReceiverType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getReceiverType();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getReceiverType();
 
     /**
      * optional int32 receiver_type_id = 8;
@@ -13707,27 +13707,27 @@ public final class ProtoBuf {
     int getReceiverTypeId();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
-    java.util.List 
+    java.util.List 
         getValueParameterList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getValueParameter(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter getValueParameter(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
     int getValueParameterCount();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
     boolean hasTypeTable();
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable();
+    org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable getTypeTable();
 
     /**
      * optional int32 version_requirement = 31;
@@ -13747,24 +13747,24 @@ public final class ProtoBuf {
     int getVersionRequirement();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+     * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
      */
     boolean hasContract();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+     * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Contract getContract();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Contract getContract();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Function}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Function}
    */
   public static final class Function extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
         Function> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Function)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Function)
       FunctionOrBuilder {
     // Use Function.newBuilder() to construct.
-    private Function(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+    private Function(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -13817,11 +13817,11 @@ public final class ProtoBuf {
               break;
             }
             case 26: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = returnType_.toBuilder();
               }
-              returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              returnType_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(returnType_);
                 returnType_ = subBuilder.buildPartial();
@@ -13831,18 +13831,18 @@ public final class ProtoBuf {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                typeParameter_ = new java.util.ArrayList();
+                typeParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
+              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
               break;
             }
             case 42: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000020) == 0x00000020)) {
                 subBuilder = receiverType_.toBuilder();
               }
-              receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              receiverType_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(receiverType_);
                 receiverType_ = subBuilder.buildPartial();
@@ -13852,10 +13852,10 @@ public final class ProtoBuf {
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) {
-                valueParameter_ = new java.util.ArrayList();
+                valueParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000100;
               }
-              valueParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.PARSER, extensionRegistry));
+              valueParameter_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.PARSER, extensionRegistry));
               break;
             }
             case 56: {
@@ -13874,11 +13874,11 @@ public final class ProtoBuf {
               break;
             }
             case 242: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000080) == 0x00000080)) {
                 subBuilder = typeTable_.toBuilder();
               }
-              typeTable_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.PARSER, extensionRegistry);
+              typeTable_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(typeTable_);
                 typeTable_ = subBuilder.buildPartial();
@@ -13892,11 +13892,11 @@ public final class ProtoBuf {
               break;
             }
             case 258: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Contract.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Contract.Builder subBuilder = null;
               if (((bitField0_ & 0x00000200) == 0x00000200)) {
                 subBuilder = contract_.toBuilder();
               }
-              contract_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Contract.PARSER, extensionRegistry);
+              contract_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Contract.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(contract_);
                 contract_ = subBuilder.buildPartial();
@@ -14018,17 +14018,17 @@ public final class ProtoBuf {
     }
 
     public static final int RETURN_TYPE_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Type returnType_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Type returnType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
     public boolean hasReturnType() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getReturnType() {
       return returnType_;
     }
 
@@ -14048,52 +14048,52 @@ public final class ProtoBuf {
     }
 
     public static final int TYPE_PARAMETER_FIELD_NUMBER = 4;
-    private java.util.List typeParameter_;
+    private java.util.List typeParameter_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public java.util.List getTypeParameterList() {
+    public java.util.List getTypeParameterList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeParameterOrBuilderList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
     public int getTypeParameterCount() {
       return typeParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter getTypeParameter(int index) {
       return typeParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index) {
       return typeParameter_.get(index);
     }
 
     public static final int RECEIVER_TYPE_FIELD_NUMBER = 5;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Type receiverType_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Type receiverType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
     public boolean hasReceiverType() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReceiverType() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getReceiverType() {
       return receiverType_;
     }
 
@@ -14113,52 +14113,52 @@ public final class ProtoBuf {
     }
 
     public static final int VALUE_PARAMETER_FIELD_NUMBER = 6;
-    private java.util.List valueParameter_;
+    private java.util.List valueParameter_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
-    public java.util.List getValueParameterList() {
+    public java.util.List getValueParameterList() {
       return valueParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
-    public java.util.List 
+    public java.util.List 
         getValueParameterOrBuilderList() {
       return valueParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
     public int getValueParameterCount() {
       return valueParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getValueParameter(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter getValueParameter(int index) {
       return valueParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+     * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameterOrBuilder getValueParameterOrBuilder(
         int index) {
       return valueParameter_.get(index);
     }
 
     public static final int TYPE_TABLE_FIELD_NUMBER = 30;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable typeTable_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
     public boolean hasTypeTable() {
       return ((bitField0_ & 0x00000080) == 0x00000080);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+     * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable getTypeTable() {
       return typeTable_;
     }
 
@@ -14186,17 +14186,17 @@ public final class ProtoBuf {
     }
 
     public static final int CONTRACT_FIELD_NUMBER = 32;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Contract contract_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Contract contract_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+     * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
      */
     public boolean hasContract() {
       return ((bitField0_ & 0x00000200) == 0x00000200);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+     * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Contract getContract() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Contract getContract() {
       return contract_;
     }
 
@@ -14204,15 +14204,15 @@ public final class ProtoBuf {
       flags_ = 6;
       oldFlags_ = 6;
       name_ = 0;
-      returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      returnType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       returnTypeId_ = 0;
       typeParameter_ = java.util.Collections.emptyList();
-      receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      receiverType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       receiverTypeId_ = 0;
       valueParameter_ = java.util.Collections.emptyList();
-      typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+      typeTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance();
       versionRequirement_ = 0;
-      contract_ = org.jetbrains.kotlin.serialization.ProtoBuf.Contract.getDefaultInstance();
+      contract_ = org.jetbrains.kotlin.metadata.ProtoBuf.Contract.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -14272,7 +14272,7 @@ public final class ProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeInt32(1, oldFlags_);
@@ -14381,53 +14381,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Function parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Function parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Function parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Function parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Function parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Function parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Function parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Function parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Function parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Function parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Function parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Function parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Function parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Function parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Function parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Function parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Function parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Function parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Function parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Function parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -14436,20 +14436,20 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Function prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.Function prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Function}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Function}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.Function, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Function)
-        org.jetbrains.kotlin.serialization.ProtoBuf.FunctionOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Function.newBuilder()
+          org.jetbrains.kotlin.metadata.ProtoBuf.Function, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Function)
+        org.jetbrains.kotlin.metadata.ProtoBuf.FunctionOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.Function.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -14468,23 +14468,23 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000002);
         name_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
-        returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        returnType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000008);
         returnTypeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000010);
         typeParameter_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000020);
-        receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        receiverType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000040);
         receiverTypeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000080);
         valueParameter_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000100);
-        typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+        typeTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000200);
         versionRequirement_ = 0;
         bitField0_ = (bitField0_ & ~0x00000400);
-        contract_ = org.jetbrains.kotlin.serialization.ProtoBuf.Contract.getDefaultInstance();
+        contract_ = org.jetbrains.kotlin.metadata.ProtoBuf.Contract.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000800);
         return this;
       }
@@ -14493,20 +14493,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Function getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.Function.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Function getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.Function.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Function build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Function result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Function build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Function result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Function buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Function result = new org.jetbrains.kotlin.serialization.ProtoBuf.Function(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Function buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Function result = new org.jetbrains.kotlin.metadata.ProtoBuf.Function(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -14563,8 +14563,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Function other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Function.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.Function other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.Function.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -14673,11 +14673,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Function parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.Function parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Function) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.Function) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -14840,23 +14840,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Type returnType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
       public boolean hasReturnType() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getReturnType() {
         return returnType_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public Builder setReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder setReturnType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -14866,23 +14866,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
       public Builder setReturnType(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         returnType_ = builderForValue.build();
 
         bitField0_ |= 0x00000008;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public Builder mergeReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder mergeReturnType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000008) == 0x00000008) &&
-            returnType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            returnType_ != org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance()) {
           returnType_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
         } else {
           returnType_ = value;
         }
@@ -14891,10 +14891,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
       public Builder clearReturnType() {
-        returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        returnType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
@@ -14932,38 +14932,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List typeParameter_ =
+      private java.util.List typeParameter_ =
         java.util.Collections.emptyList();
       private void ensureTypeParameterIsMutable() {
         if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          typeParameter_ = new java.util.ArrayList(typeParameter_);
+          typeParameter_ = new java.util.ArrayList(typeParameter_);
           bitField0_ |= 0x00000020;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public java.util.List getTypeParameterList() {
+      public java.util.List getTypeParameterList() {
         return java.util.Collections.unmodifiableList(typeParameter_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public int getTypeParameterCount() {
         return typeParameter_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter getTypeParameter(int index) {
         return typeParameter_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -14973,19 +14973,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public Builder addTypeParameter(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
+      public Builder addTypeParameter(org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -14995,10 +14995,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -15008,30 +15008,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addAllTypeParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureTypeParameterIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, typeParameter_);
@@ -15039,7 +15039,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder clearTypeParameter() {
         typeParameter_ = java.util.Collections.emptyList();
@@ -15048,7 +15048,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder removeTypeParameter(int index) {
         ensureTypeParameterIsMutable();
@@ -15057,23 +15057,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Type receiverType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
       public boolean hasReceiverType() {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReceiverType() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getReceiverType() {
         return receiverType_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public Builder setReceiverType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder setReceiverType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -15083,23 +15083,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
       public Builder setReceiverType(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         receiverType_ = builderForValue.build();
 
         bitField0_ |= 0x00000040;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder mergeReceiverType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000040) == 0x00000040) &&
-            receiverType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            receiverType_ != org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance()) {
           receiverType_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
         } else {
           receiverType_ = value;
         }
@@ -15108,10 +15108,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
       public Builder clearReceiverType() {
-        receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        receiverType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000040);
         return this;
@@ -15149,38 +15149,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List valueParameter_ =
+      private java.util.List valueParameter_ =
         java.util.Collections.emptyList();
       private void ensureValueParameterIsMutable() {
         if (!((bitField0_ & 0x00000100) == 0x00000100)) {
-          valueParameter_ = new java.util.ArrayList(valueParameter_);
+          valueParameter_ = new java.util.ArrayList(valueParameter_);
           bitField0_ |= 0x00000100;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
-      public java.util.List getValueParameterList() {
+      public java.util.List getValueParameterList() {
         return java.util.Collections.unmodifiableList(valueParameter_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public int getValueParameterCount() {
         return valueParameter_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getValueParameter(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter getValueParameter(int index) {
         return valueParameter_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder setValueParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -15190,19 +15190,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder setValueParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.Builder builderForValue) {
         ensureValueParameterIsMutable();
         valueParameter_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
-      public Builder addValueParameter(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
+      public Builder addValueParameter(org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -15212,10 +15212,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder addValueParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -15225,30 +15225,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder addValueParameter(
-          org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.Builder builderForValue) {
         ensureValueParameterIsMutable();
         valueParameter_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder addValueParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.Builder builderForValue) {
         ensureValueParameterIsMutable();
         valueParameter_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder addAllValueParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureValueParameterIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, valueParameter_);
@@ -15256,7 +15256,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder clearValueParameter() {
         valueParameter_ = java.util.Collections.emptyList();
@@ -15265,7 +15265,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.ValueParameter value_parameter = 6;
+       * repeated .org.jetbrains.kotlin.metadata.ValueParameter value_parameter = 6;
        */
       public Builder removeValueParameter(int index) {
         ensureValueParameterIsMutable();
@@ -15274,23 +15274,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable typeTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public boolean hasTypeTable() {
         return ((bitField0_ & 0x00000200) == 0x00000200);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable getTypeTable() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable getTypeTable() {
         return typeTable_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public Builder setTypeTable(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable value) {
+      public Builder setTypeTable(org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -15300,23 +15300,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public Builder setTypeTable(
-          org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.Builder builderForValue) {
         typeTable_ = builderForValue.build();
 
         bitField0_ |= 0x00000200;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
-      public Builder mergeTypeTable(org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable value) {
+      public Builder mergeTypeTable(org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable value) {
         if (((bitField0_ & 0x00000200) == 0x00000200) &&
-            typeTable_ != org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance()) {
+            typeTable_ != org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance()) {
           typeTable_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.newBuilder(typeTable_).mergeFrom(value).buildPartial();
         } else {
           typeTable_ = value;
         }
@@ -15325,10 +15325,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.TypeTable type_table = 30;
+       * optional .org.jetbrains.kotlin.metadata.TypeTable type_table = 30;
        */
       public Builder clearTypeTable() {
-        typeTable_ = org.jetbrains.kotlin.serialization.ProtoBuf.TypeTable.getDefaultInstance();
+        typeTable_ = org.jetbrains.kotlin.metadata.ProtoBuf.TypeTable.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000200);
         return this;
@@ -15382,23 +15382,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Contract contract_ = org.jetbrains.kotlin.serialization.ProtoBuf.Contract.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Contract contract_ = org.jetbrains.kotlin.metadata.ProtoBuf.Contract.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
       public boolean hasContract() {
         return ((bitField0_ & 0x00000800) == 0x00000800);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Contract getContract() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Contract getContract() {
         return contract_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
-      public Builder setContract(org.jetbrains.kotlin.serialization.ProtoBuf.Contract value) {
+      public Builder setContract(org.jetbrains.kotlin.metadata.ProtoBuf.Contract value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -15408,23 +15408,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
       public Builder setContract(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Contract.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Contract.Builder builderForValue) {
         contract_ = builderForValue.build();
 
         bitField0_ |= 0x00000800;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
-      public Builder mergeContract(org.jetbrains.kotlin.serialization.ProtoBuf.Contract value) {
+      public Builder mergeContract(org.jetbrains.kotlin.metadata.ProtoBuf.Contract value) {
         if (((bitField0_ & 0x00000800) == 0x00000800) &&
-            contract_ != org.jetbrains.kotlin.serialization.ProtoBuf.Contract.getDefaultInstance()) {
+            contract_ != org.jetbrains.kotlin.metadata.ProtoBuf.Contract.getDefaultInstance()) {
           contract_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Contract.newBuilder(contract_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Contract.newBuilder(contract_).mergeFrom(value).buildPartial();
         } else {
           contract_ = value;
         }
@@ -15433,16 +15433,16 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Contract contract = 32;
+       * optional .org.jetbrains.kotlin.metadata.Contract contract = 32;
        */
       public Builder clearContract() {
-        contract_ = org.jetbrains.kotlin.serialization.ProtoBuf.Contract.getDefaultInstance();
+        contract_ = org.jetbrains.kotlin.metadata.ProtoBuf.Contract.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000800);
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Function)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Function)
     }
 
     static {
@@ -15450,11 +15450,11 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Function)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Function)
   }
 
   public interface PropertyOrBuilder extends 
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Property)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Property)
        org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
             ExtendableMessageOrBuilder {
 
@@ -15518,13 +15518,13 @@ public final class ProtoBuf {
     int getName();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
     boolean hasReturnType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getReturnType();
 
     /**
      * optional int32 return_type_id = 9;
@@ -15536,27 +15536,27 @@ public final class ProtoBuf {
     int getReturnTypeId();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter getTypeParameter(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
     int getTypeParameterCount();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
     boolean hasReceiverType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getReceiverType();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getReceiverType();
 
     /**
      * optional int32 receiver_type_id = 10;
@@ -15568,13 +15568,13 @@ public final class ProtoBuf {
     int getReceiverTypeId();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+     * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
      */
     boolean hasSetterValueParameter();
     /**
-     * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+     * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getSetterValueParameter();
+    org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter getSetterValueParameter();
 
     /**
      * optional int32 getter_flags = 7;
@@ -15630,15 +15630,15 @@ public final class ProtoBuf {
     int getVersionRequirement();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Property}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Property}
    */
   public static final class Property extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
         Property> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Property)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Property)
       PropertyOrBuilder {
     // Use Property.newBuilder() to construct.
-    private Property(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+    private Property(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -15691,11 +15691,11 @@ public final class ProtoBuf {
               break;
             }
             case 26: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = returnType_.toBuilder();
               }
-              returnType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              returnType_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(returnType_);
                 returnType_ = subBuilder.buildPartial();
@@ -15705,18 +15705,18 @@ public final class ProtoBuf {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                typeParameter_ = new java.util.ArrayList();
+                typeParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
+              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
               break;
             }
             case 42: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000020) == 0x00000020)) {
                 subBuilder = receiverType_.toBuilder();
               }
-              receiverType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              receiverType_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(receiverType_);
                 receiverType_ = subBuilder.buildPartial();
@@ -15725,11 +15725,11 @@ public final class ProtoBuf {
               break;
             }
             case 50: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.Builder subBuilder = null;
               if (((bitField0_ & 0x00000080) == 0x00000080)) {
                 subBuilder = setterValueParameter_.toBuilder();
               }
-              setterValueParameter_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.PARSER, extensionRegistry);
+              setterValueParameter_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(setterValueParameter_);
                 setterValueParameter_ = subBuilder.buildPartial();
@@ -15882,17 +15882,17 @@ public final class ProtoBuf {
     }
 
     public static final int RETURN_TYPE_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Type returnType_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Type returnType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
     public boolean hasReturnType() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getReturnType() {
       return returnType_;
     }
 
@@ -15912,52 +15912,52 @@ public final class ProtoBuf {
     }
 
     public static final int TYPE_PARAMETER_FIELD_NUMBER = 4;
-    private java.util.List typeParameter_;
+    private java.util.List typeParameter_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public java.util.List getTypeParameterList() {
+    public java.util.List getTypeParameterList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeParameterOrBuilderList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
     public int getTypeParameterCount() {
       return typeParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter getTypeParameter(int index) {
       return typeParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index) {
       return typeParameter_.get(index);
     }
 
     public static final int RECEIVER_TYPE_FIELD_NUMBER = 5;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Type receiverType_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Type receiverType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
     public boolean hasReceiverType() {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+     * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReceiverType() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getReceiverType() {
       return receiverType_;
     }
 
@@ -15977,17 +15977,17 @@ public final class ProtoBuf {
     }
 
     public static final int SETTER_VALUE_PARAMETER_FIELD_NUMBER = 6;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter setterValueParameter_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter setterValueParameter_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+     * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
      */
     public boolean hasSetterValueParameter() {
       return ((bitField0_ & 0x00000080) == 0x00000080);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+     * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getSetterValueParameter() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter getSetterValueParameter() {
       return setterValueParameter_;
     }
 
@@ -16066,12 +16066,12 @@ public final class ProtoBuf {
       flags_ = 518;
       oldFlags_ = 2054;
       name_ = 0;
-      returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      returnType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       returnTypeId_ = 0;
       typeParameter_ = java.util.Collections.emptyList();
-      receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      receiverType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       receiverTypeId_ = 0;
-      setterValueParameter_ = org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance();
+      setterValueParameter_ = org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.getDefaultInstance();
       getterFlags_ = 0;
       setterFlags_ = 0;
       versionRequirement_ = 0;
@@ -16122,7 +16122,7 @@ public final class ProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeInt32(1, oldFlags_);
@@ -16231,53 +16231,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Property parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Property parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Property parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Property parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Property parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Property parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Property parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Property parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Property parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Property parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Property parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Property parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Property parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Property parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Property parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Property parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Property parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Property parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Property parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Property parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -16286,20 +16286,20 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Property prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.Property prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Property}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Property}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.Property, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Property)
-        org.jetbrains.kotlin.serialization.ProtoBuf.PropertyOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Property.newBuilder()
+          org.jetbrains.kotlin.metadata.ProtoBuf.Property, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Property)
+        org.jetbrains.kotlin.metadata.ProtoBuf.PropertyOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.Property.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -16318,17 +16318,17 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000002);
         name_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
-        returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        returnType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000008);
         returnTypeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000010);
         typeParameter_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000020);
-        receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        receiverType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000040);
         receiverTypeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000080);
-        setterValueParameter_ = org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance();
+        setterValueParameter_ = org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000100);
         getterFlags_ = 0;
         bitField0_ = (bitField0_ & ~0x00000200);
@@ -16343,20 +16343,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Property getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.Property.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Property getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Property build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Property result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Property build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Property result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Property buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Property result = new org.jetbrains.kotlin.serialization.ProtoBuf.Property(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Property buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Property result = new org.jetbrains.kotlin.metadata.ProtoBuf.Property(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -16412,8 +16412,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Property other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Property.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.Property other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -16503,11 +16503,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Property parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.Property parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Property) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.Property) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -16678,23 +16678,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Type returnType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
       public boolean hasReturnType() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReturnType() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getReturnType() {
         return returnType_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public Builder setReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder setReturnType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -16704,23 +16704,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
       public Builder setReturnType(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         returnType_ = builderForValue.build();
 
         bitField0_ |= 0x00000008;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
-      public Builder mergeReturnType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder mergeReturnType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000008) == 0x00000008) &&
-            returnType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            returnType_ != org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance()) {
           returnType_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial();
         } else {
           returnType_ = value;
         }
@@ -16729,10 +16729,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type return_type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type return_type = 3;
        */
       public Builder clearReturnType() {
-        returnType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        returnType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
@@ -16770,38 +16770,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List typeParameter_ =
+      private java.util.List typeParameter_ =
         java.util.Collections.emptyList();
       private void ensureTypeParameterIsMutable() {
         if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          typeParameter_ = new java.util.ArrayList(typeParameter_);
+          typeParameter_ = new java.util.ArrayList(typeParameter_);
           bitField0_ |= 0x00000020;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public java.util.List getTypeParameterList() {
+      public java.util.List getTypeParameterList() {
         return java.util.Collections.unmodifiableList(typeParameter_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public int getTypeParameterCount() {
         return typeParameter_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter getTypeParameter(int index) {
         return typeParameter_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -16811,19 +16811,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
-      public Builder addTypeParameter(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
+      public Builder addTypeParameter(org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -16833,10 +16833,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -16846,30 +16846,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder addAllTypeParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureTypeParameterIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, typeParameter_);
@@ -16877,7 +16877,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder clearTypeParameter() {
         typeParameter_ = java.util.Collections.emptyList();
@@ -16886,7 +16886,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 4;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 4;
        */
       public Builder removeTypeParameter(int index) {
         ensureTypeParameterIsMutable();
@@ -16895,23 +16895,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Type receiverType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
       public boolean hasReceiverType() {
         return ((bitField0_ & 0x00000040) == 0x00000040);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getReceiverType() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getReceiverType() {
         return receiverType_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public Builder setReceiverType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder setReceiverType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -16921,23 +16921,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
       public Builder setReceiverType(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         receiverType_ = builderForValue.build();
 
         bitField0_ |= 0x00000040;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
-      public Builder mergeReceiverType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder mergeReceiverType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000040) == 0x00000040) &&
-            receiverType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            receiverType_ != org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance()) {
           receiverType_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial();
         } else {
           receiverType_ = value;
         }
@@ -16946,10 +16946,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type receiver_type = 5;
+       * optional .org.jetbrains.kotlin.metadata.Type receiver_type = 5;
        */
       public Builder clearReceiverType() {
-        receiverType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        receiverType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000040);
         return this;
@@ -16987,23 +16987,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter setterValueParameter_ = org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter setterValueParameter_ = org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
       public boolean hasSetterValueParameter() {
         return ((bitField0_ & 0x00000100) == 0x00000100);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getSetterValueParameter() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter getSetterValueParameter() {
         return setterValueParameter_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
-      public Builder setSetterValueParameter(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
+      public Builder setSetterValueParameter(org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -17013,23 +17013,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
       public Builder setSetterValueParameter(
-          org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.Builder builderForValue) {
         setterValueParameter_ = builderForValue.build();
 
         bitField0_ |= 0x00000100;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
-      public Builder mergeSetterValueParameter(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter value) {
+      public Builder mergeSetterValueParameter(org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter value) {
         if (((bitField0_ & 0x00000100) == 0x00000100) &&
-            setterValueParameter_ != org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance()) {
+            setterValueParameter_ != org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.getDefaultInstance()) {
           setterValueParameter_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.newBuilder(setterValueParameter_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.newBuilder(setterValueParameter_).mergeFrom(value).buildPartial();
         } else {
           setterValueParameter_ = value;
         }
@@ -17038,10 +17038,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.ValueParameter setter_value_parameter = 6;
+       * optional .org.jetbrains.kotlin.metadata.ValueParameter setter_value_parameter = 6;
        */
       public Builder clearSetterValueParameter() {
-        setterValueParameter_ = org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance();
+        setterValueParameter_ = org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000100);
         return this;
@@ -17195,7 +17195,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Property)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Property)
     }
 
     static {
@@ -17203,11 +17203,11 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Property)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Property)
   }
 
   public interface ValueParameterOrBuilder extends 
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.ValueParameter)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.ValueParameter)
        org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
             ExtendableMessageOrBuilder {
 
@@ -17244,13 +17244,13 @@ public final class ProtoBuf {
     int getName();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type type = 3;
      */
     boolean hasType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type type = 3;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getType();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getType();
 
     /**
      * optional int32 type_id = 5;
@@ -17262,13 +17262,13 @@ public final class ProtoBuf {
     int getTypeId();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
      */
     boolean hasVarargElementType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getVarargElementType();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getVarargElementType();
 
     /**
      * optional int32 vararg_element_type_id = 6;
@@ -17280,15 +17280,15 @@ public final class ProtoBuf {
     int getVarargElementTypeId();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.ValueParameter}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.ValueParameter}
    */
   public static final class ValueParameter extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
         ValueParameter> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.ValueParameter)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.ValueParameter)
       ValueParameterOrBuilder {
     // Use ValueParameter.newBuilder() to construct.
-    private ValueParameter(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+    private ValueParameter(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -17341,11 +17341,11 @@ public final class ProtoBuf {
               break;
             }
             case 26: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = type_.toBuilder();
               }
-              type_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              type_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(type_);
                 type_ = subBuilder.buildPartial();
@@ -17354,11 +17354,11 @@ public final class ProtoBuf {
               break;
             }
             case 34: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000010) == 0x00000010)) {
                 subBuilder = varargElementType_.toBuilder();
               }
-              varargElementType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              varargElementType_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(varargElementType_);
                 varargElementType_ = subBuilder.buildPartial();
@@ -17455,17 +17455,17 @@ public final class ProtoBuf {
     }
 
     public static final int TYPE_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Type type_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type type = 3;
      */
     public boolean hasType() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+     * optional .org.jetbrains.kotlin.metadata.Type type = 3;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getType() {
       return type_;
     }
 
@@ -17485,17 +17485,17 @@ public final class ProtoBuf {
     }
 
     public static final int VARARG_ELEMENT_TYPE_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Type varargElementType_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Type varargElementType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
      */
     public boolean hasVarargElementType() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getVarargElementType() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getVarargElementType() {
       return varargElementType_;
     }
 
@@ -17517,9 +17517,9 @@ public final class ProtoBuf {
     private void initFields() {
       flags_ = 0;
       name_ = 0;
-      type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      type_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       typeId_ = 0;
-      varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      varargElementType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       varargElementTypeId_ = 0;
     }
     private byte memoizedIsInitialized = -1;
@@ -17556,7 +17556,7 @@ public final class ProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, flags_);
@@ -17623,53 +17623,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -17678,20 +17678,20 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.ValueParameter}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.ValueParameter}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.ValueParameter)
-        org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameterOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.newBuilder()
+          org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.ValueParameter)
+        org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameterOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -17708,11 +17708,11 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000001);
         name_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
-        type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        type_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000004);
         typeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000008);
-        varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        varargElementType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000010);
         varargElementTypeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000020);
@@ -17723,20 +17723,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter result = new org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter result = new org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -17767,8 +17767,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -17821,11 +17821,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -17928,23 +17928,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Type type_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
       public boolean hasType() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getType() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getType() {
         return type_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
-      public Builder setType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder setType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -17954,23 +17954,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
       public Builder setType(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         type_ = builderForValue.build();
 
         bitField0_ |= 0x00000004;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
-      public Builder mergeType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder mergeType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000004) == 0x00000004) &&
-            type_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            type_ != org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance()) {
           type_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial();
         } else {
           type_ = value;
         }
@@ -17979,10 +17979,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type type = 3;
+       * optional .org.jetbrains.kotlin.metadata.Type type = 3;
        */
       public Builder clearType() {
-        type_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        type_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
@@ -18020,23 +18020,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Type varargElementType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
       public boolean hasVarargElementType() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getVarargElementType() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getVarargElementType() {
         return varargElementType_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
-      public Builder setVarargElementType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder setVarargElementType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -18046,23 +18046,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
       public Builder setVarargElementType(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         varargElementType_ = builderForValue.build();
 
         bitField0_ |= 0x00000010;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
-      public Builder mergeVarargElementType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder mergeVarargElementType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000010) == 0x00000010) &&
-            varargElementType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            varargElementType_ != org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance()) {
           varargElementType_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(varargElementType_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Type.newBuilder(varargElementType_).mergeFrom(value).buildPartial();
         } else {
           varargElementType_ = value;
         }
@@ -18071,10 +18071,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type vararg_element_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type vararg_element_type = 4;
        */
       public Builder clearVarargElementType() {
-        varargElementType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        varargElementType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000010);
         return this;
@@ -18112,7 +18112,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.ValueParameter)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.ValueParameter)
     }
 
     static {
@@ -18120,11 +18120,11 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.ValueParameter)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.ValueParameter)
   }
 
   public interface TypeAliasOrBuilder extends 
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.TypeAlias)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.TypeAlias)
        org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
             ExtendableMessageOrBuilder {
 
@@ -18157,27 +18157,27 @@ public final class ProtoBuf {
     int getName();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
-    java.util.List 
+    java.util.List 
         getTypeParameterList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter getTypeParameter(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
     int getTypeParameterCount();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
      */
     boolean hasUnderlyingType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getUnderlyingType();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getUnderlyingType();
 
     /**
      * optional int32 underlying_type_id = 5;
@@ -18189,13 +18189,13 @@ public final class ProtoBuf {
     int getUnderlyingTypeId();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+     * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
      */
     boolean hasExpandedType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+     * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getExpandedType();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getExpandedType();
 
     /**
      * optional int32 expanded_type_id = 7;
@@ -18207,16 +18207,16 @@ public final class ProtoBuf {
     int getExpandedTypeId();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
-    java.util.List 
+    java.util.List 
         getAnnotationList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
     int getAnnotationCount();
 
@@ -18238,15 +18238,15 @@ public final class ProtoBuf {
     int getVersionRequirement();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeAlias}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.TypeAlias}
    */
   public static final class TypeAlias extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
         TypeAlias> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.TypeAlias)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.TypeAlias)
       TypeAliasOrBuilder {
     // Use TypeAlias.newBuilder() to construct.
-    private TypeAlias(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+    private TypeAlias(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -18300,18 +18300,18 @@ public final class ProtoBuf {
             }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
-                typeParameter_ = new java.util.ArrayList();
+                typeParameter_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000004;
               }
-              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
+              typeParameter_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.PARSER, extensionRegistry));
               break;
             }
             case 34: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = underlyingType_.toBuilder();
               }
-              underlyingType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              underlyingType_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(underlyingType_);
                 underlyingType_ = subBuilder.buildPartial();
@@ -18325,11 +18325,11 @@ public final class ProtoBuf {
               break;
             }
             case 50: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000010) == 0x00000010)) {
                 subBuilder = expandedType_.toBuilder();
               }
-              expandedType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              expandedType_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(expandedType_);
                 expandedType_ = subBuilder.buildPartial();
@@ -18344,10 +18344,10 @@ public final class ProtoBuf {
             }
             case 66: {
               if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) {
-                annotation_ = new java.util.ArrayList();
+                annotation_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000080;
               }
-              annotation_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.PARSER, extensionRegistry));
+              annotation_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.PARSER, extensionRegistry));
               break;
             }
             case 248: {
@@ -18436,52 +18436,52 @@ public final class ProtoBuf {
     }
 
     public static final int TYPE_PARAMETER_FIELD_NUMBER = 3;
-    private java.util.List typeParameter_;
+    private java.util.List typeParameter_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
-    public java.util.List getTypeParameterList() {
+    public java.util.List getTypeParameterList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
-    public java.util.List 
+    public java.util.List 
         getTypeParameterOrBuilderList() {
       return typeParameter_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
     public int getTypeParameterCount() {
       return typeParameter_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter getTypeParameter(int index) {
       return typeParameter_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+     * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder(
         int index) {
       return typeParameter_.get(index);
     }
 
     public static final int UNDERLYING_TYPE_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Type underlyingType_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Type underlyingType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
      */
     public boolean hasUnderlyingType() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getUnderlyingType() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getUnderlyingType() {
       return underlyingType_;
     }
 
@@ -18501,17 +18501,17 @@ public final class ProtoBuf {
     }
 
     public static final int EXPANDED_TYPE_FIELD_NUMBER = 6;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Type expandedType_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Type expandedType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+     * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
      */
     public boolean hasExpandedType() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+     * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getExpandedType() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getExpandedType() {
       return expandedType_;
     }
 
@@ -18531,36 +18531,36 @@ public final class ProtoBuf {
     }
 
     public static final int ANNOTATION_FIELD_NUMBER = 8;
-    private java.util.List annotation_;
+    private java.util.List annotation_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
-    public java.util.List getAnnotationList() {
+    public java.util.List getAnnotationList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
-    public java.util.List 
+    public java.util.List 
         getAnnotationOrBuilderList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
     public int getAnnotationCount() {
       return annotation_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation(int index) {
       return annotation_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
         int index) {
       return annotation_.get(index);
     }
@@ -18592,9 +18592,9 @@ public final class ProtoBuf {
       flags_ = 6;
       name_ = 0;
       typeParameter_ = java.util.Collections.emptyList();
-      underlyingType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      underlyingType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       underlyingTypeId_ = 0;
-      expandedType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      expandedType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       expandedTypeId_ = 0;
       annotation_ = java.util.Collections.emptyList();
       versionRequirement_ = 0;
@@ -18645,7 +18645,7 @@ public final class ProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, flags_);
@@ -18733,53 +18733,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -18788,20 +18788,20 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.TypeAlias}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.TypeAlias}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.TypeAlias)
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeAliasOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias.newBuilder()
+          org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.TypeAlias)
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeAliasOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -18820,11 +18820,11 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000002);
         typeParameter_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000004);
-        underlyingType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        underlyingType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000008);
         underlyingTypeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000010);
-        expandedType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        expandedType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000020);
         expandedTypeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000040);
@@ -18839,20 +18839,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias result = new org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias result = new org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -18897,8 +18897,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -18986,11 +18986,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.TypeAlias) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.TypeAlias) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -19085,38 +19085,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List typeParameter_ =
+      private java.util.List typeParameter_ =
         java.util.Collections.emptyList();
       private void ensureTypeParameterIsMutable() {
         if (!((bitField0_ & 0x00000004) == 0x00000004)) {
-          typeParameter_ = new java.util.ArrayList(typeParameter_);
+          typeParameter_ = new java.util.ArrayList(typeParameter_);
           bitField0_ |= 0x00000004;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
-      public java.util.List getTypeParameterList() {
+      public java.util.List getTypeParameterList() {
         return java.util.Collections.unmodifiableList(typeParameter_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public int getTypeParameterCount() {
         return typeParameter_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter getTypeParameter(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter getTypeParameter(int index) {
         return typeParameter_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -19126,19 +19126,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder setTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
-      public Builder addTypeParameter(org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
+      public Builder addTypeParameter(org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -19148,10 +19148,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -19161,30 +19161,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder addTypeParameter(
-          org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder addTypeParameter(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Builder builderForValue) {
         ensureTypeParameterIsMutable();
         typeParameter_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder addAllTypeParameter(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureTypeParameterIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, typeParameter_);
@@ -19192,7 +19192,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder clearTypeParameter() {
         typeParameter_ = java.util.Collections.emptyList();
@@ -19201,7 +19201,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.TypeParameter type_parameter = 3;
+       * repeated .org.jetbrains.kotlin.metadata.TypeParameter type_parameter = 3;
        */
       public Builder removeTypeParameter(int index) {
         ensureTypeParameterIsMutable();
@@ -19210,23 +19210,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type underlyingType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Type underlyingType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
       public boolean hasUnderlyingType() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getUnderlyingType() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getUnderlyingType() {
         return underlyingType_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
-      public Builder setUnderlyingType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder setUnderlyingType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -19236,23 +19236,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
       public Builder setUnderlyingType(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         underlyingType_ = builderForValue.build();
 
         bitField0_ |= 0x00000008;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
-      public Builder mergeUnderlyingType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder mergeUnderlyingType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000008) == 0x00000008) &&
-            underlyingType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            underlyingType_ != org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance()) {
           underlyingType_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(underlyingType_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Type.newBuilder(underlyingType_).mergeFrom(value).buildPartial();
         } else {
           underlyingType_ = value;
         }
@@ -19261,10 +19261,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type underlying_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type underlying_type = 4;
        */
       public Builder clearUnderlyingType() {
-        underlyingType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        underlyingType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
@@ -19302,23 +19302,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type expandedType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Type expandedType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
       public boolean hasExpandedType() {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getExpandedType() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getExpandedType() {
         return expandedType_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
-      public Builder setExpandedType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder setExpandedType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -19328,23 +19328,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
       public Builder setExpandedType(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         expandedType_ = builderForValue.build();
 
         bitField0_ |= 0x00000020;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
-      public Builder mergeExpandedType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder mergeExpandedType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000020) == 0x00000020) &&
-            expandedType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            expandedType_ != org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance()) {
           expandedType_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(expandedType_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Type.newBuilder(expandedType_).mergeFrom(value).buildPartial();
         } else {
           expandedType_ = value;
         }
@@ -19353,10 +19353,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type expanded_type = 6;
+       * optional .org.jetbrains.kotlin.metadata.Type expanded_type = 6;
        */
       public Builder clearExpandedType() {
-        expandedType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        expandedType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000020);
         return this;
@@ -19394,38 +19394,38 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List annotation_ =
+      private java.util.List annotation_ =
         java.util.Collections.emptyList();
       private void ensureAnnotationIsMutable() {
         if (!((bitField0_ & 0x00000080) == 0x00000080)) {
-          annotation_ = new java.util.ArrayList(annotation_);
+          annotation_ = new java.util.ArrayList(annotation_);
           bitField0_ |= 0x00000080;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
-      public java.util.List getAnnotationList() {
+      public java.util.List getAnnotationList() {
         return java.util.Collections.unmodifiableList(annotation_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public int getAnnotationCount() {
         return annotation_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation(int index) {
         return annotation_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -19435,19 +19435,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Builder builderForValue) {
         ensureAnnotationIsMutable();
         annotation_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
-      public Builder addAnnotation(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
+      public Builder addAnnotation(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -19457,10 +19457,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -19470,30 +19470,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder addAnnotation(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Builder builderForValue) {
         ensureAnnotationIsMutable();
         annotation_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Builder builderForValue) {
         ensureAnnotationIsMutable();
         annotation_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder addAllAnnotation(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureAnnotationIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, annotation_);
@@ -19501,7 +19501,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder clearAnnotation() {
         annotation_ = java.util.Collections.emptyList();
@@ -19510,7 +19510,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 8;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 8;
        */
       public Builder removeAnnotation(int index) {
         ensureAnnotationIsMutable();
@@ -19567,7 +19567,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.TypeAlias)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.TypeAlias)
     }
 
     static {
@@ -19575,11 +19575,11 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.TypeAlias)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.TypeAlias)
   }
 
   public interface EnumEntryOrBuilder extends 
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.EnumEntry)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.EnumEntry)
        org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
             ExtendableMessageOrBuilder {
 
@@ -19593,15 +19593,15 @@ public final class ProtoBuf {
     int getName();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.EnumEntry}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.EnumEntry}
    */
   public static final class EnumEntry extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
         EnumEntry> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.EnumEntry)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.EnumEntry)
       EnumEntryOrBuilder {
     // Use EnumEntry.newBuilder() to construct.
-    private EnumEntry(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+    private EnumEntry(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -19718,7 +19718,7 @@ public final class ProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeInt32(1, name_);
@@ -19750,53 +19750,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -19805,20 +19805,20 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.EnumEntry}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.EnumEntry}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.EnumEntry)
-        org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntryOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry.newBuilder()
+          org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.EnumEntry)
+        org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntryOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -19840,20 +19840,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry result = new org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry result = new org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -19864,8 +19864,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry.getDefaultInstance()) return this;
         if (other.hasName()) {
           setName(other.getName());
         }
@@ -19887,11 +19887,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -19934,7 +19934,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.EnumEntry)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.EnumEntry)
     }
 
     static {
@@ -19942,11 +19942,11 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.EnumEntry)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.EnumEntry)
   }
 
   public interface VersionRequirementOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.VersionRequirement)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.VersionRequirement)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
@@ -19990,7 +19990,7 @@ public final class ProtoBuf {
     int getVersionFull();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
      *
      * 
      * Level of the reported diagnostic
@@ -19998,13 +19998,13 @@ public final class ProtoBuf {
      */
     boolean hasLevel();
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
      *
      * 
      * Level of the reported diagnostic
      * 

      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level getLevel();
+    org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Level getLevel();
 
     /**
      * optional int32 error_code = 4;
@@ -20041,7 +20041,7 @@ public final class ProtoBuf {
     int getMessage();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
      *
      * 
      * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
@@ -20050,21 +20050,21 @@ public final class ProtoBuf {
      */
     boolean hasVersionKind();
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
      *
      * 
      * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
      * (the "-api-version" argument value when compiling the call site) to be of at least the specified value
      * 

      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.VersionKind getVersionKind();
+    org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.VersionKind getVersionKind();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.VersionRequirement}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.VersionRequirement}
    */
   public static final class VersionRequirement extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.VersionRequirement)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.VersionRequirement)
       VersionRequirementOrBuilder {
     // Use VersionRequirement.newBuilder() to construct.
     private VersionRequirement(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -20121,7 +20121,7 @@ public final class ProtoBuf {
             }
             case 24: {
               int rawValue = input.readEnum();
-              org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level value = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level.valueOf(rawValue);
+              org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Level value = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Level.valueOf(rawValue);
               if (value == null) {
                 unknownFieldsCodedOutput.writeRawVarint32(tag);
                 unknownFieldsCodedOutput.writeRawVarint32(rawValue);
@@ -20143,7 +20143,7 @@ public final class ProtoBuf {
             }
             case 48: {
               int rawValue = input.readEnum();
-              org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.VersionKind value = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.VersionKind.valueOf(rawValue);
+              org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.VersionKind value = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.VersionKind.valueOf(rawValue);
               if (value == null) {
                 unknownFieldsCodedOutput.writeRawVarint32(tag);
                 unknownFieldsCodedOutput.writeRawVarint32(rawValue);
@@ -20187,7 +20187,7 @@ public final class ProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.VersionRequirement.Level}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.VersionRequirement.Level}
      */
     public enum Level
         implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -20248,11 +20248,11 @@ public final class ProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.VersionRequirement.Level)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.VersionRequirement.Level)
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind}
      */
     public enum VersionKind
         implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -20313,7 +20313,7 @@ public final class ProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind)
     }
 
     private int bitField0_;
@@ -20370,9 +20370,9 @@ public final class ProtoBuf {
     }
 
     public static final int LEVEL_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level level_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Level level_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
      *
      * 
      * Level of the reported diagnostic
@@ -20382,13 +20382,13 @@ public final class ProtoBuf {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
      *
      * 
      * Level of the reported diagnostic
      * 

      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level getLevel() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Level getLevel() {
       return level_;
     }
 
@@ -20439,9 +20439,9 @@ public final class ProtoBuf {
     }
 
     public static final int VERSION_KIND_FIELD_NUMBER = 6;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.VersionKind versionKind_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.VersionKind versionKind_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
      *
      * 
      * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
@@ -20452,24 +20452,24 @@ public final class ProtoBuf {
       return ((bitField0_ & 0x00000020) == 0x00000020);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+     * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
      *
      * 
      * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
      * (the "-api-version" argument value when compiling the call site) to be of at least the specified value
      * 

      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.VersionKind getVersionKind() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.VersionKind getVersionKind() {
       return versionKind_;
     }
 
     private void initFields() {
       version_ = 0;
       versionFull_ = 0;
-      level_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level.ERROR;
+      level_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Level.ERROR;
       errorCode_ = 0;
       message_ = 0;
-      versionKind_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
+      versionKind_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -20547,53 +20547,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -20602,21 +20602,21 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.VersionRequirement}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.VersionRequirement}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement, Builder>
+          org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.VersionRequirement)
-        org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.VersionRequirement)
+        org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -20633,13 +20633,13 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000001);
         versionFull_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
-        level_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level.ERROR;
+        level_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Level.ERROR;
         bitField0_ = (bitField0_ & ~0x00000004);
         errorCode_ = 0;
         bitField0_ = (bitField0_ & ~0x00000008);
         message_ = 0;
         bitField0_ = (bitField0_ & ~0x00000010);
-        versionKind_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
+        versionKind_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
         bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
@@ -20648,20 +20648,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement result = new org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement result = new org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -20692,8 +20692,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.getDefaultInstance()) return this;
         if (other.hasVersion()) {
           setVersion(other.getVersion());
         }
@@ -20725,11 +20725,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -20848,9 +20848,9 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level level_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level.ERROR;
+      private org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Level level_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Level.ERROR;
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
        *
        * 
        * Level of the reported diagnostic
@@ -20860,23 +20860,23 @@ public final class ProtoBuf {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
        *
        * 
        * Level of the reported diagnostic
        * 

        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level getLevel() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Level getLevel() {
         return level_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
        *
        * 
        * Level of the reported diagnostic
        * 

        */
-      public Builder setLevel(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level value) {
+      public Builder setLevel(org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Level value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -20886,7 +20886,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.Level level = 3 [default = ERROR];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.Level level = 3 [default = ERROR];
        *
        * 
        * Level of the reported diagnostic
@@ -20894,7 +20894,7 @@ public final class ProtoBuf {
        */
       public Builder clearLevel() {
         bitField0_ = (bitField0_ & ~0x00000004);
-        level_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Level.ERROR;
+        level_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Level.ERROR;
         
         return this;
       }
@@ -20995,9 +20995,9 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.VersionKind versionKind_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
+      private org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.VersionKind versionKind_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
        *
        * 
        * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
@@ -21008,25 +21008,25 @@ public final class ProtoBuf {
         return ((bitField0_ & 0x00000020) == 0x00000020);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
        *
        * 
        * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
        * (the "-api-version" argument value when compiling the call site) to be of at least the specified value
        * 

        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.VersionKind getVersionKind() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.VersionKind getVersionKind() {
         return versionKind_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
        *
        * 
        * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
        * (the "-api-version" argument value when compiling the call site) to be of at least the specified value
        * 

        */
-      public Builder setVersionKind(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.VersionKind value) {
+      public Builder setVersionKind(org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.VersionKind value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -21036,7 +21036,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
+       * optional .org.jetbrains.kotlin.metadata.VersionRequirement.VersionKind version_kind = 6 [default = LANGUAGE_VERSION];
        *
        * 
        * Which version is this requirement for. For example, if version_kind = API_VERSION, this declaration requires the API version
@@ -21045,12 +21045,12 @@ public final class ProtoBuf {
        */
       public Builder clearVersionKind() {
         bitField0_ = (bitField0_ & ~0x00000020);
-        versionKind_ = org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
+        versionKind_ = org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.VersionKind.LANGUAGE_VERSION;
         
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.VersionRequirement)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.VersionRequirement)
     }
 
     static {
@@ -21058,33 +21058,33 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.VersionRequirement)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.VersionRequirement)
   }
 
   public interface VersionRequirementTableOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.VersionRequirementTable)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.VersionRequirementTable)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
-    java.util.List 
+    java.util.List 
         getRequirementList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement getRequirement(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement getRequirement(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
     int getRequirementCount();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.VersionRequirementTable}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.VersionRequirementTable}
    */
   public static final class VersionRequirementTable extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.VersionRequirementTable)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.VersionRequirementTable)
       VersionRequirementTableOrBuilder {
     // Use VersionRequirementTable.newBuilder() to construct.
     private VersionRequirementTable(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -21131,10 +21131,10 @@ public final class ProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                requirement_ = new java.util.ArrayList();
+                requirement_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              requirement_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.PARSER, extensionRegistry));
+              requirement_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.PARSER, extensionRegistry));
               break;
             }
           }
@@ -21174,36 +21174,36 @@ public final class ProtoBuf {
     }
 
     public static final int REQUIREMENT_FIELD_NUMBER = 1;
-    private java.util.List requirement_;
+    private java.util.List requirement_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
-    public java.util.List getRequirementList() {
+    public java.util.List getRequirementList() {
       return requirement_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getRequirementOrBuilderList() {
       return requirement_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
     public int getRequirementCount() {
       return requirement_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement getRequirement(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement getRequirement(int index) {
       return requirement_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+     * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementOrBuilder getRequirementOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementOrBuilder getRequirementOrBuilder(
         int index) {
       return requirement_.get(index);
     }
@@ -21252,53 +21252,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -21307,21 +21307,21 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.VersionRequirementTable}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.VersionRequirementTable}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable, Builder>
+          org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.VersionRequirementTable)
-        org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTableOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.VersionRequirementTable)
+        org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTableOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -21343,20 +21343,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable result = new org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable result = new org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           requirement_ = java.util.Collections.unmodifiableList(requirement_);
@@ -21366,8 +21366,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable.getDefaultInstance()) return this;
         if (!other.requirement_.isEmpty()) {
           if (requirement_.isEmpty()) {
             requirement_ = other.requirement_;
@@ -21391,11 +21391,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirementTable) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirementTable) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -21406,38 +21406,38 @@ public final class ProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List requirement_ =
+      private java.util.List requirement_ =
         java.util.Collections.emptyList();
       private void ensureRequirementIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          requirement_ = new java.util.ArrayList(requirement_);
+          requirement_ = new java.util.ArrayList(requirement_);
           bitField0_ |= 0x00000001;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
-      public java.util.List getRequirementList() {
+      public java.util.List getRequirementList() {
         return java.util.Collections.unmodifiableList(requirement_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public int getRequirementCount() {
         return requirement_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement getRequirement(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement getRequirement(int index) {
         return requirement_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder setRequirement(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -21447,19 +21447,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder setRequirement(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Builder builderForValue) {
         ensureRequirementIsMutable();
         requirement_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
-      public Builder addRequirement(org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement value) {
+      public Builder addRequirement(org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -21469,10 +21469,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder addRequirement(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -21482,30 +21482,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder addRequirement(
-          org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Builder builderForValue) {
         ensureRequirementIsMutable();
         requirement_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder addRequirement(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.VersionRequirement.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.VersionRequirement.Builder builderForValue) {
         ensureRequirementIsMutable();
         requirement_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder addAllRequirement(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureRequirementIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, requirement_);
@@ -21513,7 +21513,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder clearRequirement() {
         requirement_ = java.util.Collections.emptyList();
@@ -21522,7 +21522,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.VersionRequirement requirement = 1;
+       * repeated .org.jetbrains.kotlin.metadata.VersionRequirement requirement = 1;
        */
       public Builder removeRequirement(int index) {
         ensureRequirementIsMutable();
@@ -21531,7 +21531,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.VersionRequirementTable)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.VersionRequirementTable)
     }
 
     static {
@@ -21539,57 +21539,57 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.VersionRequirementTable)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.VersionRequirementTable)
   }
 
   public interface PackageFragmentOrBuilder extends 
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.PackageFragment)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.PackageFragment)
        org.jetbrains.kotlin.protobuf.GeneratedMessageLite.
             ExtendableMessageOrBuilder {
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
      */
     boolean hasStrings();
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStrings();
+    org.jetbrains.kotlin.metadata.ProtoBuf.StringTable getStrings();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
      */
     boolean hasQualifiedNames();
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNames();
+    org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable getQualifiedNames();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+     * optional .org.jetbrains.kotlin.metadata.Package package = 3;
      */
     boolean hasPackage();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+     * optional .org.jetbrains.kotlin.metadata.Package package = 3;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Package getPackage();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Package getPackage();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
-    java.util.List 
+    java.util.List 
         getClass_List();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass_(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Class getClass_(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
     int getClass_Count();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.PackageFragment}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.PackageFragment}
    *
    * 
    * A part of the package, which is used to serialize .kjsm/.meta.js, .kotlin_builtins and .kotlin_metadata files.
@@ -21599,10 +21599,10 @@ public final class ProtoBuf {
   public static final class PackageFragment extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableMessage<
         PackageFragment> implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.PackageFragment)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.PackageFragment)
       PackageFragmentOrBuilder {
     // Use PackageFragment.newBuilder() to construct.
-    private PackageFragment(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
+    private PackageFragment(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder builder) {
       super(builder);
       this.unknownFields = builder.getUnknownFields();
     }
@@ -21645,11 +21645,11 @@ public final class ProtoBuf {
               break;
             }
             case 10: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000001) == 0x00000001)) {
                 subBuilder = strings_.toBuilder();
               }
-              strings_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.PARSER, extensionRegistry);
+              strings_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(strings_);
                 strings_ = subBuilder.buildPartial();
@@ -21658,11 +21658,11 @@ public final class ProtoBuf {
               break;
             }
             case 18: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = qualifiedNames_.toBuilder();
               }
-              qualifiedNames_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.PARSER, extensionRegistry);
+              qualifiedNames_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(qualifiedNames_);
                 qualifiedNames_ = subBuilder.buildPartial();
@@ -21671,11 +21671,11 @@ public final class ProtoBuf {
               break;
             }
             case 26: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Package.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Package.Builder subBuilder = null;
               if (((bitField0_ & 0x00000004) == 0x00000004)) {
                 subBuilder = package_.toBuilder();
               }
-              package_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Package.PARSER, extensionRegistry);
+              package_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Package.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(package_);
                 package_ = subBuilder.buildPartial();
@@ -21685,10 +21685,10 @@ public final class ProtoBuf {
             }
             case 34: {
               if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) {
-                class__ = new java.util.ArrayList();
+                class__ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000008;
               }
-              class__.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Class.PARSER, extensionRegistry));
+              class__.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Class.PARSER, extensionRegistry));
               break;
             }
           }
@@ -21729,89 +21729,89 @@ public final class ProtoBuf {
 
     private int bitField0_;
     public static final int STRINGS_FIELD_NUMBER = 1;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.StringTable strings_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.StringTable strings_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
      */
     public boolean hasStrings() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStrings() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.StringTable getStrings() {
       return strings_;
     }
 
     public static final int QUALIFIED_NAMES_FIELD_NUMBER = 2;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable qualifiedNames_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable qualifiedNames_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
      */
     public boolean hasQualifiedNames() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNames() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable getQualifiedNames() {
       return qualifiedNames_;
     }
 
     public static final int PACKAGE_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Package package_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Package package_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+     * optional .org.jetbrains.kotlin.metadata.Package package = 3;
      */
     public boolean hasPackage() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+     * optional .org.jetbrains.kotlin.metadata.Package package = 3;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Package getPackage() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Package getPackage() {
       return package_;
     }
 
     public static final int CLASS_FIELD_NUMBER = 4;
-    private java.util.List class__;
+    private java.util.List class__;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
-    public java.util.List getClass_List() {
+    public java.util.List getClass_List() {
       return class__;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
-    public java.util.List 
+    public java.util.List 
         getClass_OrBuilderList() {
       return class__;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
     public int getClass_Count() {
       return class__.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass_(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Class getClass_(int index) {
       return class__.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+     * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.ClassOrBuilder getClass_OrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.ClassOrBuilder getClass_OrBuilder(
         int index) {
       return class__.get(index);
     }
 
     private void initFields() {
-      strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
-      qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
-      package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance();
+      strings_ = org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance();
+      qualifiedNames_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance();
+      package_ = org.jetbrains.kotlin.metadata.ProtoBuf.Package.getDefaultInstance();
       class__ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
@@ -21850,7 +21850,7 @@ public final class ProtoBuf {
                         throws java.io.IOException {
       getSerializedSize();
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-        .ExtendableMessage.ExtensionWriter extensionWriter =
+        .ExtendableMessage.ExtensionWriter extensionWriter =
           newExtensionWriter();
       if (((bitField0_ & 0x00000001) == 0x00000001)) {
         output.writeMessage(1, strings_);
@@ -21903,53 +21903,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -21958,13 +21958,13 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.PackageFragment}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.PackageFragment}
      *
      * 
      * A part of the package, which is used to serialize .kjsm/.meta.js, .kotlin_builtins and .kotlin_metadata files.
@@ -21973,10 +21973,10 @@ public final class ProtoBuf {
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.ExtendableBuilder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment, Builder> implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.PackageFragment)
-        org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragmentOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment.newBuilder()
+          org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment, Builder> implements
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.PackageFragment)
+        org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragmentOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -21989,11 +21989,11 @@ public final class ProtoBuf {
 
       public Builder clear() {
         super.clear();
-        strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
+        strings_ = org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000001);
-        qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
+        qualifiedNames_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000002);
-        package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance();
+        package_ = org.jetbrains.kotlin.metadata.ProtoBuf.Package.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000004);
         class__ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -22004,20 +22004,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment result = new org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment result = new org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -22041,8 +22041,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment.getDefaultInstance()) return this;
         if (other.hasStrings()) {
           mergeStrings(other.getStrings());
         }
@@ -22098,11 +22098,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -22113,23 +22113,23 @@ public final class ProtoBuf {
       }
       private int bitField0_;
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.StringTable strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.StringTable strings_ = org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
       public boolean hasStrings() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStrings() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.StringTable getStrings() {
         return strings_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
-      public Builder setStrings(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable value) {
+      public Builder setStrings(org.jetbrains.kotlin.metadata.ProtoBuf.StringTable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -22139,23 +22139,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
       public Builder setStrings(
-          org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.Builder builderForValue) {
         strings_ = builderForValue.build();
 
         bitField0_ |= 0x00000001;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
-      public Builder mergeStrings(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable value) {
+      public Builder mergeStrings(org.jetbrains.kotlin.metadata.ProtoBuf.StringTable value) {
         if (((bitField0_ & 0x00000001) == 0x00000001) &&
-            strings_ != org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance()) {
+            strings_ != org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance()) {
           strings_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.newBuilder(strings_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.newBuilder(strings_).mergeFrom(value).buildPartial();
         } else {
           strings_ = value;
         }
@@ -22164,32 +22164,32 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 1;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 1;
        */
       public Builder clearStrings() {
-        strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
+        strings_ = org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
       public boolean hasQualifiedNames() {
         return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNames() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable getQualifiedNames() {
         return qualifiedNames_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
-      public Builder setQualifiedNames(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable value) {
+      public Builder setQualifiedNames(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -22199,23 +22199,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
       public Builder setQualifiedNames(
-          org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.Builder builderForValue) {
         qualifiedNames_ = builderForValue.build();
 
         bitField0_ |= 0x00000002;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
-      public Builder mergeQualifiedNames(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable value) {
+      public Builder mergeQualifiedNames(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable value) {
         if (((bitField0_ & 0x00000002) == 0x00000002) &&
-            qualifiedNames_ != org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance()) {
+            qualifiedNames_ != org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance()) {
           qualifiedNames_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.newBuilder(qualifiedNames_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.newBuilder(qualifiedNames_).mergeFrom(value).buildPartial();
         } else {
           qualifiedNames_ = value;
         }
@@ -22224,32 +22224,32 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 2;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 2;
        */
       public Builder clearQualifiedNames() {
-        qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
+        qualifiedNames_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Package package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Package package_ = org.jetbrains.kotlin.metadata.ProtoBuf.Package.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
       public boolean hasPackage() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Package getPackage() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Package getPackage() {
         return package_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
-      public Builder setPackage(org.jetbrains.kotlin.serialization.ProtoBuf.Package value) {
+      public Builder setPackage(org.jetbrains.kotlin.metadata.ProtoBuf.Package value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -22259,23 +22259,23 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
       public Builder setPackage(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Package.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Package.Builder builderForValue) {
         package_ = builderForValue.build();
 
         bitField0_ |= 0x00000004;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
-      public Builder mergePackage(org.jetbrains.kotlin.serialization.ProtoBuf.Package value) {
+      public Builder mergePackage(org.jetbrains.kotlin.metadata.ProtoBuf.Package value) {
         if (((bitField0_ & 0x00000004) == 0x00000004) &&
-            package_ != org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance()) {
+            package_ != org.jetbrains.kotlin.metadata.ProtoBuf.Package.getDefaultInstance()) {
           package_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Package.newBuilder(package_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Package.newBuilder(package_).mergeFrom(value).buildPartial();
         } else {
           package_ = value;
         }
@@ -22284,47 +22284,47 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Package package = 3;
+       * optional .org.jetbrains.kotlin.metadata.Package package = 3;
        */
       public Builder clearPackage() {
-        package_ = org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance();
+        package_ = org.jetbrains.kotlin.metadata.ProtoBuf.Package.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
-      private java.util.List class__ =
+      private java.util.List class__ =
         java.util.Collections.emptyList();
       private void ensureClass_IsMutable() {
         if (!((bitField0_ & 0x00000008) == 0x00000008)) {
-          class__ = new java.util.ArrayList(class__);
+          class__ = new java.util.ArrayList(class__);
           bitField0_ |= 0x00000008;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
-      public java.util.List getClass_List() {
+      public java.util.List getClass_List() {
         return java.util.Collections.unmodifiableList(class__);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public int getClass_Count() {
         return class__.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Class getClass_(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Class getClass_(int index) {
         return class__.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder setClass_(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Class value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -22334,19 +22334,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder setClass_(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Class.Builder builderForValue) {
         ensureClass_IsMutable();
         class__.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
-      public Builder addClass_(org.jetbrains.kotlin.serialization.ProtoBuf.Class value) {
+      public Builder addClass_(org.jetbrains.kotlin.metadata.ProtoBuf.Class value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -22356,10 +22356,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder addClass_(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Class value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -22369,30 +22369,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder addClass_(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Class.Builder builderForValue) {
         ensureClass_IsMutable();
         class__.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder addClass_(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Class.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Class.Builder builderForValue) {
         ensureClass_IsMutable();
         class__.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder addAllClass_(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureClass_IsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, class__);
@@ -22400,7 +22400,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder clearClass_() {
         class__ = java.util.Collections.emptyList();
@@ -22409,7 +22409,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Class class = 4;
+       * repeated .org.jetbrains.kotlin.metadata.Class class = 4;
        */
       public Builder removeClass_(int index) {
         ensureClass_IsMutable();
@@ -22418,7 +22418,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.PackageFragment)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.PackageFragment)
     }
 
     static {
@@ -22426,33 +22426,33 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.PackageFragment)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.PackageFragment)
   }
 
   public interface ContractOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Contract)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Contract)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
-    java.util.List 
+    java.util.List 
         getEffectList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Effect getEffect(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Effect getEffect(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
     int getEffectCount();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Contract}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Contract}
    */
   public static final class Contract extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Contract)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Contract)
       ContractOrBuilder {
     // Use Contract.newBuilder() to construct.
     private Contract(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -22499,10 +22499,10 @@ public final class ProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                effect_ = new java.util.ArrayList();
+                effect_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              effect_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Effect.PARSER, extensionRegistry));
+              effect_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Effect.PARSER, extensionRegistry));
               break;
             }
           }
@@ -22542,36 +22542,36 @@ public final class ProtoBuf {
     }
 
     public static final int EFFECT_FIELD_NUMBER = 1;
-    private java.util.List effect_;
+    private java.util.List effect_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
-    public java.util.List getEffectList() {
+    public java.util.List getEffectList() {
       return effect_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getEffectOrBuilderList() {
       return effect_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
     public int getEffectCount() {
       return effect_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Effect getEffect(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Effect getEffect(int index) {
       return effect_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+     * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.EffectOrBuilder getEffectOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.EffectOrBuilder getEffectOrBuilder(
         int index) {
       return effect_.get(index);
     }
@@ -22626,53 +22626,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Contract parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Contract parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Contract parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Contract parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Contract parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Contract parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Contract parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Contract parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Contract parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Contract parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Contract parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Contract parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Contract parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Contract parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Contract parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Contract parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Contract parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Contract parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Contract parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Contract parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -22681,21 +22681,21 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Contract prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.Contract prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Contract}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Contract}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.Contract, Builder>
+          org.jetbrains.kotlin.metadata.ProtoBuf.Contract, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Contract)
-        org.jetbrains.kotlin.serialization.ProtoBuf.ContractOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Contract.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Contract)
+        org.jetbrains.kotlin.metadata.ProtoBuf.ContractOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.Contract.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -22717,20 +22717,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Contract getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.Contract.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Contract getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.Contract.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Contract build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Contract result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Contract build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Contract result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Contract buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Contract result = new org.jetbrains.kotlin.serialization.ProtoBuf.Contract(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Contract buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Contract result = new org.jetbrains.kotlin.metadata.ProtoBuf.Contract(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           effect_ = java.util.Collections.unmodifiableList(effect_);
@@ -22740,8 +22740,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Contract other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Contract.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.Contract other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.Contract.getDefaultInstance()) return this;
         if (!other.effect_.isEmpty()) {
           if (effect_.isEmpty()) {
             effect_ = other.effect_;
@@ -22771,11 +22771,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Contract parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.Contract parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Contract) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.Contract) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -22786,38 +22786,38 @@ public final class ProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List effect_ =
+      private java.util.List effect_ =
         java.util.Collections.emptyList();
       private void ensureEffectIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          effect_ = new java.util.ArrayList(effect_);
+          effect_ = new java.util.ArrayList(effect_);
           bitField0_ |= 0x00000001;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
-      public java.util.List getEffectList() {
+      public java.util.List getEffectList() {
         return java.util.Collections.unmodifiableList(effect_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public int getEffectCount() {
         return effect_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Effect getEffect(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Effect getEffect(int index) {
         return effect_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder setEffect(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Effect value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Effect value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -22827,19 +22827,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder setEffect(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Effect.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Effect.Builder builderForValue) {
         ensureEffectIsMutable();
         effect_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
-      public Builder addEffect(org.jetbrains.kotlin.serialization.ProtoBuf.Effect value) {
+      public Builder addEffect(org.jetbrains.kotlin.metadata.ProtoBuf.Effect value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -22849,10 +22849,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder addEffect(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Effect value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Effect value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -22862,30 +22862,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder addEffect(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Effect.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Effect.Builder builderForValue) {
         ensureEffectIsMutable();
         effect_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder addEffect(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Effect.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Effect.Builder builderForValue) {
         ensureEffectIsMutable();
         effect_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder addAllEffect(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureEffectIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, effect_);
@@ -22893,7 +22893,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder clearEffect() {
         effect_ = java.util.Collections.emptyList();
@@ -22902,7 +22902,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Effect effect = 1;
+       * repeated .org.jetbrains.kotlin.metadata.Effect effect = 1;
        */
       public Builder removeEffect(int index) {
         ensureEffectIsMutable();
@@ -22911,7 +22911,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Contract)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Contract)
     }
 
     static {
@@ -22919,38 +22919,38 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Contract)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Contract)
   }
 
   public interface EffectOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Effect)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Effect)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+     * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
      */
     boolean hasEffectType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+     * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Effect.EffectType getEffectType();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Effect.EffectType getEffectType();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
-    java.util.List 
+    java.util.List 
         getEffectConstructorArgumentList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Expression getEffectConstructorArgument(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Expression getEffectConstructorArgument(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
     int getEffectConstructorArgumentCount();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
      *
      * 
      * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
@@ -22959,30 +22959,30 @@ public final class ProtoBuf {
      */
     boolean hasConclusionOfConditionalEffect();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
      *
      * 
      * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
      * is given by other fields in this message, and 'Expression' is stored in this field.
      * 

      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Expression getConclusionOfConditionalEffect();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Expression getConclusionOfConditionalEffect();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+     * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
      */
     boolean hasKind();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+     * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Effect.InvocationKind getKind();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Effect.InvocationKind getKind();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Effect}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Effect}
    */
   public static final class Effect extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Effect)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Effect)
       EffectOrBuilder {
     // Use Effect.newBuilder() to construct.
     private Effect(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -23029,7 +23029,7 @@ public final class ProtoBuf {
             }
             case 8: {
               int rawValue = input.readEnum();
-              org.jetbrains.kotlin.serialization.ProtoBuf.Effect.EffectType value = org.jetbrains.kotlin.serialization.ProtoBuf.Effect.EffectType.valueOf(rawValue);
+              org.jetbrains.kotlin.metadata.ProtoBuf.Effect.EffectType value = org.jetbrains.kotlin.metadata.ProtoBuf.Effect.EffectType.valueOf(rawValue);
               if (value == null) {
                 unknownFieldsCodedOutput.writeRawVarint32(tag);
                 unknownFieldsCodedOutput.writeRawVarint32(rawValue);
@@ -23041,18 +23041,18 @@ public final class ProtoBuf {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                effectConstructorArgument_ = new java.util.ArrayList();
+                effectConstructorArgument_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              effectConstructorArgument_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Expression.PARSER, extensionRegistry));
+              effectConstructorArgument_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Expression.PARSER, extensionRegistry));
               break;
             }
             case 26: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Expression.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Expression.Builder subBuilder = null;
               if (((bitField0_ & 0x00000002) == 0x00000002)) {
                 subBuilder = conclusionOfConditionalEffect_.toBuilder();
               }
-              conclusionOfConditionalEffect_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Expression.PARSER, extensionRegistry);
+              conclusionOfConditionalEffect_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Expression.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(conclusionOfConditionalEffect_);
                 conclusionOfConditionalEffect_ = subBuilder.buildPartial();
@@ -23062,7 +23062,7 @@ public final class ProtoBuf {
             }
             case 32: {
               int rawValue = input.readEnum();
-              org.jetbrains.kotlin.serialization.ProtoBuf.Effect.InvocationKind value = org.jetbrains.kotlin.serialization.ProtoBuf.Effect.InvocationKind.valueOf(rawValue);
+              org.jetbrains.kotlin.metadata.ProtoBuf.Effect.InvocationKind value = org.jetbrains.kotlin.metadata.ProtoBuf.Effect.InvocationKind.valueOf(rawValue);
               if (value == null) {
                 unknownFieldsCodedOutput.writeRawVarint32(tag);
                 unknownFieldsCodedOutput.writeRawVarint32(rawValue);
@@ -23109,7 +23109,7 @@ public final class ProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.Effect.EffectType}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.Effect.EffectType}
      *
      * 
      * This enum controls which effect this message contains and how 'effectConstructorArguments'
@@ -23204,11 +23204,11 @@ public final class ProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Effect.EffectType)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Effect.EffectType)
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.Effect.InvocationKind}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.Effect.InvocationKind}
      */
     public enum InvocationKind
         implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -23269,64 +23269,64 @@ public final class ProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Effect.InvocationKind)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Effect.InvocationKind)
     }
 
     private int bitField0_;
     public static final int EFFECT_TYPE_FIELD_NUMBER = 1;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Effect.EffectType effectType_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Effect.EffectType effectType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+     * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
      */
     public boolean hasEffectType() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+     * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Effect.EffectType getEffectType() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Effect.EffectType getEffectType() {
       return effectType_;
     }
 
     public static final int EFFECT_CONSTRUCTOR_ARGUMENT_FIELD_NUMBER = 2;
-    private java.util.List effectConstructorArgument_;
+    private java.util.List effectConstructorArgument_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
-    public java.util.List getEffectConstructorArgumentList() {
+    public java.util.List getEffectConstructorArgumentList() {
       return effectConstructorArgument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getEffectConstructorArgumentOrBuilderList() {
       return effectConstructorArgument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
     public int getEffectConstructorArgumentCount() {
       return effectConstructorArgument_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Expression getEffectConstructorArgument(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Expression getEffectConstructorArgument(int index) {
       return effectConstructorArgument_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.ExpressionOrBuilder getEffectConstructorArgumentOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.ExpressionOrBuilder getEffectConstructorArgumentOrBuilder(
         int index) {
       return effectConstructorArgument_.get(index);
     }
 
     public static final int CONCLUSION_OF_CONDITIONAL_EFFECT_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Expression conclusionOfConditionalEffect_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Expression conclusionOfConditionalEffect_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
      *
      * 
      * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
@@ -23337,37 +23337,37 @@ public final class ProtoBuf {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
      *
      * 
      * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
      * is given by other fields in this message, and 'Expression' is stored in this field.
      * 

      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Expression getConclusionOfConditionalEffect() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Expression getConclusionOfConditionalEffect() {
       return conclusionOfConditionalEffect_;
     }
 
     public static final int KIND_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Effect.InvocationKind kind_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Effect.InvocationKind kind_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+     * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
      */
     public boolean hasKind() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+     * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Effect.InvocationKind getKind() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Effect.InvocationKind getKind() {
       return kind_;
     }
 
     private void initFields() {
-      effectType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
+      effectType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
       effectConstructorArgument_ = java.util.Collections.emptyList();
-      conclusionOfConditionalEffect_ = org.jetbrains.kotlin.serialization.ProtoBuf.Expression.getDefaultInstance();
-      kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
+      conclusionOfConditionalEffect_ = org.jetbrains.kotlin.metadata.ProtoBuf.Expression.getDefaultInstance();
+      kind_ = org.jetbrains.kotlin.metadata.ProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -23443,53 +23443,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Effect parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Effect parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Effect parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Effect parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Effect parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Effect parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Effect parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Effect parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Effect parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Effect parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Effect parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Effect parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Effect parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Effect parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Effect parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Effect parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Effect parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Effect parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Effect parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Effect parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -23498,21 +23498,21 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Effect prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.Effect prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Effect}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Effect}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.Effect, Builder>
+          org.jetbrains.kotlin.metadata.ProtoBuf.Effect, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Effect)
-        org.jetbrains.kotlin.serialization.ProtoBuf.EffectOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Effect.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Effect)
+        org.jetbrains.kotlin.metadata.ProtoBuf.EffectOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.Effect.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -23525,13 +23525,13 @@ public final class ProtoBuf {
 
       public Builder clear() {
         super.clear();
-        effectType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
+        effectType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
         bitField0_ = (bitField0_ & ~0x00000001);
         effectConstructorArgument_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
-        conclusionOfConditionalEffect_ = org.jetbrains.kotlin.serialization.ProtoBuf.Expression.getDefaultInstance();
+        conclusionOfConditionalEffect_ = org.jetbrains.kotlin.metadata.ProtoBuf.Expression.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000004);
-        kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
+        kind_ = org.jetbrains.kotlin.metadata.ProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
@@ -23540,20 +23540,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Effect getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.Effect.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Effect getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.Effect.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Effect build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Effect result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Effect build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Effect result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Effect buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Effect result = new org.jetbrains.kotlin.serialization.ProtoBuf.Effect(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Effect buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Effect result = new org.jetbrains.kotlin.metadata.ProtoBuf.Effect(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -23577,8 +23577,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Effect other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Effect.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.Effect other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.Effect.getDefaultInstance()) return this;
         if (other.hasEffectType()) {
           setEffectType(other.getEffectType());
         }
@@ -23623,11 +23623,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Effect parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.Effect parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Effect) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.Effect) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -23638,23 +23638,23 @@ public final class ProtoBuf {
       }
       private int bitField0_;
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Effect.EffectType effectType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Effect.EffectType effectType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+       * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
        */
       public boolean hasEffectType() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+       * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Effect.EffectType getEffectType() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Effect.EffectType getEffectType() {
         return effectType_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+       * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
        */
-      public Builder setEffectType(org.jetbrains.kotlin.serialization.ProtoBuf.Effect.EffectType value) {
+      public Builder setEffectType(org.jetbrains.kotlin.metadata.ProtoBuf.Effect.EffectType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -23664,47 +23664,47 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.EffectType effect_type = 1;
+       * optional .org.jetbrains.kotlin.metadata.Effect.EffectType effect_type = 1;
        */
       public Builder clearEffectType() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        effectType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
+        effectType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Effect.EffectType.RETURNS_CONSTANT;
         
         return this;
       }
 
-      private java.util.List effectConstructorArgument_ =
+      private java.util.List effectConstructorArgument_ =
         java.util.Collections.emptyList();
       private void ensureEffectConstructorArgumentIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          effectConstructorArgument_ = new java.util.ArrayList(effectConstructorArgument_);
+          effectConstructorArgument_ = new java.util.ArrayList(effectConstructorArgument_);
           bitField0_ |= 0x00000002;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
-      public java.util.List getEffectConstructorArgumentList() {
+      public java.util.List getEffectConstructorArgumentList() {
         return java.util.Collections.unmodifiableList(effectConstructorArgument_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public int getEffectConstructorArgumentCount() {
         return effectConstructorArgument_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Expression getEffectConstructorArgument(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Expression getEffectConstructorArgument(int index) {
         return effectConstructorArgument_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder setEffectConstructorArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Expression value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Expression value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -23714,19 +23714,19 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder setEffectConstructorArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Expression.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Expression.Builder builderForValue) {
         ensureEffectConstructorArgumentIsMutable();
         effectConstructorArgument_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
-      public Builder addEffectConstructorArgument(org.jetbrains.kotlin.serialization.ProtoBuf.Expression value) {
+      public Builder addEffectConstructorArgument(org.jetbrains.kotlin.metadata.ProtoBuf.Expression value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -23736,10 +23736,10 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder addEffectConstructorArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Expression value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Expression value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -23749,30 +23749,30 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder addEffectConstructorArgument(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Expression.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Expression.Builder builderForValue) {
         ensureEffectConstructorArgumentIsMutable();
         effectConstructorArgument_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder addEffectConstructorArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Expression.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Expression.Builder builderForValue) {
         ensureEffectConstructorArgumentIsMutable();
         effectConstructorArgument_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder addAllEffectConstructorArgument(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureEffectConstructorArgumentIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, effectConstructorArgument_);
@@ -23780,7 +23780,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder clearEffectConstructorArgument() {
         effectConstructorArgument_ = java.util.Collections.emptyList();
@@ -23789,7 +23789,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression effect_constructor_argument = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Expression effect_constructor_argument = 2;
        */
       public Builder removeEffectConstructorArgument(int index) {
         ensureEffectConstructorArgumentIsMutable();
@@ -23798,9 +23798,9 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Expression conclusionOfConditionalEffect_ = org.jetbrains.kotlin.serialization.ProtoBuf.Expression.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Expression conclusionOfConditionalEffect_ = org.jetbrains.kotlin.metadata.ProtoBuf.Expression.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
@@ -23811,25 +23811,25 @@ public final class ProtoBuf {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
        * is given by other fields in this message, and 'Expression' is stored in this field.
        * 

        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Expression getConclusionOfConditionalEffect() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Expression getConclusionOfConditionalEffect() {
         return conclusionOfConditionalEffect_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
        * is given by other fields in this message, and 'Expression' is stored in this field.
        * 

        */
-      public Builder setConclusionOfConditionalEffect(org.jetbrains.kotlin.serialization.ProtoBuf.Expression value) {
+      public Builder setConclusionOfConditionalEffect(org.jetbrains.kotlin.metadata.ProtoBuf.Expression value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -23839,7 +23839,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
@@ -23847,25 +23847,25 @@ public final class ProtoBuf {
        * 

        */
       public Builder setConclusionOfConditionalEffect(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Expression.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Expression.Builder builderForValue) {
         conclusionOfConditionalEffect_ = builderForValue.build();
 
         bitField0_ |= 0x00000004;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
        * is given by other fields in this message, and 'Expression' is stored in this field.
        * 

        */
-      public Builder mergeConclusionOfConditionalEffect(org.jetbrains.kotlin.serialization.ProtoBuf.Expression value) {
+      public Builder mergeConclusionOfConditionalEffect(org.jetbrains.kotlin.metadata.ProtoBuf.Expression value) {
         if (((bitField0_ & 0x00000004) == 0x00000004) &&
-            conclusionOfConditionalEffect_ != org.jetbrains.kotlin.serialization.ProtoBuf.Expression.getDefaultInstance()) {
+            conclusionOfConditionalEffect_ != org.jetbrains.kotlin.metadata.ProtoBuf.Expression.getDefaultInstance()) {
           conclusionOfConditionalEffect_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Expression.newBuilder(conclusionOfConditionalEffect_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Expression.newBuilder(conclusionOfConditionalEffect_).mergeFrom(value).buildPartial();
         } else {
           conclusionOfConditionalEffect_ = value;
         }
@@ -23874,7 +23874,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression conclusion_of_conditional_effect = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression conclusion_of_conditional_effect = 3;
        *
        * 
        * If present, then whole message is clause of form 'Effect -> Expression', where 'Effect'
@@ -23882,29 +23882,29 @@ public final class ProtoBuf {
        * 

        */
       public Builder clearConclusionOfConditionalEffect() {
-        conclusionOfConditionalEffect_ = org.jetbrains.kotlin.serialization.ProtoBuf.Expression.getDefaultInstance();
+        conclusionOfConditionalEffect_ = org.jetbrains.kotlin.metadata.ProtoBuf.Expression.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Effect.InvocationKind kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Effect.InvocationKind kind_ = org.jetbrains.kotlin.metadata.ProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+       * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
        */
       public boolean hasKind() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+       * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Effect.InvocationKind getKind() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Effect.InvocationKind getKind() {
         return kind_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+       * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
        */
-      public Builder setKind(org.jetbrains.kotlin.serialization.ProtoBuf.Effect.InvocationKind value) {
+      public Builder setKind(org.jetbrains.kotlin.metadata.ProtoBuf.Effect.InvocationKind value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -23914,16 +23914,16 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Effect.InvocationKind kind = 4;
+       * optional .org.jetbrains.kotlin.metadata.Effect.InvocationKind kind = 4;
        */
       public Builder clearKind() {
         bitField0_ = (bitField0_ & ~0x00000008);
-        kind_ = org.jetbrains.kotlin.serialization.ProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
+        kind_ = org.jetbrains.kotlin.metadata.ProtoBuf.Effect.InvocationKind.AT_MOST_ONCE;
         
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Effect)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Effect)
     }
 
     static {
@@ -23931,11 +23931,11 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Effect)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Effect)
   }
 
   public interface ExpressionOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.Expression)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.Expression)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
@@ -23977,16 +23977,16 @@ public final class ProtoBuf {
     int getValueParameterReference();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
      */
     boolean hasConstantValue();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Expression.ConstantValue getConstantValue();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Expression.ConstantValue getConstantValue();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
      *
      * 
      * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
@@ -23995,14 +23995,14 @@ public final class ProtoBuf {
      */
     boolean hasIsInstanceType();
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
      *
      * 
      * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
      * and with type encoded in either one of next two fields as RHS.
      * 

      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Type getIsInstanceType();
+    org.jetbrains.kotlin.metadata.ProtoBuf.Type getIsInstanceType();
 
     /**
      * optional int32 is_instance_type_id = 5;
@@ -24014,7 +24014,7 @@ public final class ProtoBuf {
     int getIsInstanceTypeId();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -24022,10 +24022,10 @@ public final class ProtoBuf {
      * it is optimized and embedded straight into this message
      * 

      */
-    java.util.List 
+    java.util.List 
         getAndArgumentList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -24033,9 +24033,9 @@ public final class ProtoBuf {
      * it is optimized and embedded straight into this message
      * 

      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Expression getAndArgument(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Expression getAndArgument(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -24046,7 +24046,7 @@ public final class ProtoBuf {
     int getAndArgumentCount();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -24054,10 +24054,10 @@ public final class ProtoBuf {
      * it is optimized and embedded straight into this message.
      * 

      */
-    java.util.List 
+    java.util.List 
         getOrArgumentList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -24065,9 +24065,9 @@ public final class ProtoBuf {
      * it is optimized and embedded straight into this message.
      * 

      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Expression getOrArgument(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Expression getOrArgument(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -24078,7 +24078,7 @@ public final class ProtoBuf {
     int getOrArgumentCount();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.Expression}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.Expression}
    *
    * 
    * We use some trickery to optimize memory footprint of contract-expressions:
@@ -24087,7 +24087,7 @@ public final class ProtoBuf {
    */
   public static final class Expression extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.Expression)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.Expression)
       ExpressionOrBuilder {
     // Use Expression.newBuilder() to construct.
     private Expression(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -24144,7 +24144,7 @@ public final class ProtoBuf {
             }
             case 24: {
               int rawValue = input.readEnum();
-              org.jetbrains.kotlin.serialization.ProtoBuf.Expression.ConstantValue value = org.jetbrains.kotlin.serialization.ProtoBuf.Expression.ConstantValue.valueOf(rawValue);
+              org.jetbrains.kotlin.metadata.ProtoBuf.Expression.ConstantValue value = org.jetbrains.kotlin.metadata.ProtoBuf.Expression.ConstantValue.valueOf(rawValue);
               if (value == null) {
                 unknownFieldsCodedOutput.writeRawVarint32(tag);
                 unknownFieldsCodedOutput.writeRawVarint32(rawValue);
@@ -24155,11 +24155,11 @@ public final class ProtoBuf {
               break;
             }
             case 34: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = isInstanceType_.toBuilder();
               }
-              isInstanceType_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Type.PARSER, extensionRegistry);
+              isInstanceType_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Type.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(isInstanceType_);
                 isInstanceType_ = subBuilder.buildPartial();
@@ -24174,18 +24174,18 @@ public final class ProtoBuf {
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                andArgument_ = new java.util.ArrayList();
+                andArgument_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              andArgument_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Expression.PARSER, extensionRegistry));
+              andArgument_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Expression.PARSER, extensionRegistry));
               break;
             }
             case 58: {
               if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) {
-                orArgument_ = new java.util.ArrayList();
+                orArgument_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000040;
               }
-              orArgument_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Expression.PARSER, extensionRegistry));
+              orArgument_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Expression.PARSER, extensionRegistry));
               break;
             }
           }
@@ -24228,7 +24228,7 @@ public final class ProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.Expression.ConstantValue}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.Expression.ConstantValue}
      */
     public enum ConstantValue
         implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -24289,7 +24289,7 @@ public final class ProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.Expression.ConstantValue)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.Expression.ConstantValue)
     }
 
     private int bitField0_;
@@ -24344,24 +24344,24 @@ public final class ProtoBuf {
     }
 
     public static final int CONSTANT_VALUE_FIELD_NUMBER = 3;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Expression.ConstantValue constantValue_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Expression.ConstantValue constantValue_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
      */
     public boolean hasConstantValue() {
       return ((bitField0_ & 0x00000004) == 0x00000004);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+     * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Expression.ConstantValue getConstantValue() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Expression.ConstantValue getConstantValue() {
       return constantValue_;
     }
 
     public static final int IS_INSTANCE_TYPE_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.Type isInstanceType_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.Type isInstanceType_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
      *
      * 
      * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
@@ -24372,14 +24372,14 @@ public final class ProtoBuf {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+     * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
      *
      * 
      * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
      * and with type encoded in either one of next two fields as RHS.
      * 

      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Type getIsInstanceType() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Type getIsInstanceType() {
       return isInstanceType_;
     }
 
@@ -24399,9 +24399,9 @@ public final class ProtoBuf {
     }
 
     public static final int AND_ARGUMENT_FIELD_NUMBER = 6;
-    private java.util.List andArgument_;
+    private java.util.List andArgument_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -24409,11 +24409,11 @@ public final class ProtoBuf {
      * it is optimized and embedded straight into this message
      * 

      */
-    public java.util.List getAndArgumentList() {
+    public java.util.List getAndArgumentList() {
       return andArgument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -24421,12 +24421,12 @@ public final class ProtoBuf {
      * it is optimized and embedded straight into this message
      * 

      */
-    public java.util.List 
+    public java.util.List 
         getAndArgumentOrBuilderList() {
       return andArgument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -24438,7 +24438,7 @@ public final class ProtoBuf {
       return andArgument_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -24446,11 +24446,11 @@ public final class ProtoBuf {
      * it is optimized and embedded straight into this message
      * 

      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Expression getAndArgument(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Expression getAndArgument(int index) {
       return andArgument_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
      *
      * 
      * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -24458,15 +24458,15 @@ public final class ProtoBuf {
      * it is optimized and embedded straight into this message
      * 

      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.ExpressionOrBuilder getAndArgumentOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.ExpressionOrBuilder getAndArgumentOrBuilder(
         int index) {
       return andArgument_.get(index);
     }
 
     public static final int OR_ARGUMENT_FIELD_NUMBER = 7;
-    private java.util.List orArgument_;
+    private java.util.List orArgument_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -24474,11 +24474,11 @@ public final class ProtoBuf {
      * it is optimized and embedded straight into this message.
      * 

      */
-    public java.util.List getOrArgumentList() {
+    public java.util.List getOrArgumentList() {
       return orArgument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -24486,12 +24486,12 @@ public final class ProtoBuf {
      * it is optimized and embedded straight into this message.
      * 

      */
-    public java.util.List 
+    public java.util.List 
         getOrArgumentOrBuilderList() {
       return orArgument_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -24503,7 +24503,7 @@ public final class ProtoBuf {
       return orArgument_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -24511,11 +24511,11 @@ public final class ProtoBuf {
      * it is optimized and embedded straight into this message.
      * 

      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Expression getOrArgument(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Expression getOrArgument(int index) {
       return orArgument_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+     * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
      *
      * 
      * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -24523,7 +24523,7 @@ public final class ProtoBuf {
      * it is optimized and embedded straight into this message.
      * 

      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.ExpressionOrBuilder getOrArgumentOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.ExpressionOrBuilder getOrArgumentOrBuilder(
         int index) {
       return orArgument_.get(index);
     }
@@ -24531,8 +24531,8 @@ public final class ProtoBuf {
     private void initFields() {
       flags_ = 0;
       valueParameterReference_ = 0;
-      constantValue_ = org.jetbrains.kotlin.serialization.ProtoBuf.Expression.ConstantValue.TRUE;
-      isInstanceType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      constantValue_ = org.jetbrains.kotlin.metadata.ProtoBuf.Expression.ConstantValue.TRUE;
+      isInstanceType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       isInstanceTypeId_ = 0;
       andArgument_ = java.util.Collections.emptyList();
       orArgument_ = java.util.Collections.emptyList();
@@ -24638,53 +24638,53 @@ public final class ProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Expression parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Expression parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Expression parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Expression parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Expression parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Expression parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Expression parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Expression parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Expression parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Expression parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Expression parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Expression parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Expression parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Expression parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Expression parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Expression parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Expression parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Expression parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.ProtoBuf.Expression parseFrom(
+    public static org.jetbrains.kotlin.metadata.ProtoBuf.Expression parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -24693,13 +24693,13 @@ public final class ProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.ProtoBuf.Expression prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.ProtoBuf.Expression prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.Expression}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.Expression}
      *
      * 
      * We use some trickery to optimize memory footprint of contract-expressions:
@@ -24708,11 +24708,11 @@ public final class ProtoBuf {
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.ProtoBuf.Expression, Builder>
+          org.jetbrains.kotlin.metadata.ProtoBuf.Expression, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.Expression)
-        org.jetbrains.kotlin.serialization.ProtoBuf.ExpressionOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.ProtoBuf.Expression.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.Expression)
+        org.jetbrains.kotlin.metadata.ProtoBuf.ExpressionOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.ProtoBuf.Expression.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -24729,9 +24729,9 @@ public final class ProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000001);
         valueParameterReference_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
-        constantValue_ = org.jetbrains.kotlin.serialization.ProtoBuf.Expression.ConstantValue.TRUE;
+        constantValue_ = org.jetbrains.kotlin.metadata.ProtoBuf.Expression.ConstantValue.TRUE;
         bitField0_ = (bitField0_ & ~0x00000004);
-        isInstanceType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        isInstanceType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000008);
         isInstanceTypeId_ = 0;
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -24746,20 +24746,20 @@ public final class ProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Expression getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.ProtoBuf.Expression.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Expression getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.ProtoBuf.Expression.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Expression build() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Expression result = buildPartial();
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Expression build() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Expression result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Expression buildPartial() {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Expression result = new org.jetbrains.kotlin.serialization.ProtoBuf.Expression(this);
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Expression buildPartial() {
+        org.jetbrains.kotlin.metadata.ProtoBuf.Expression result = new org.jetbrains.kotlin.metadata.ProtoBuf.Expression(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -24796,8 +24796,8 @@ public final class ProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.ProtoBuf.Expression other) {
-        if (other == org.jetbrains.kotlin.serialization.ProtoBuf.Expression.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.ProtoBuf.Expression other) {
+        if (other == org.jetbrains.kotlin.metadata.ProtoBuf.Expression.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -24864,11 +24864,11 @@ public final class ProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.ProtoBuf.Expression parsedMessage = null;
+        org.jetbrains.kotlin.metadata.ProtoBuf.Expression parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.ProtoBuf.Expression) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.ProtoBuf.Expression) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -24983,23 +24983,23 @@ public final class ProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Expression.ConstantValue constantValue_ = org.jetbrains.kotlin.serialization.ProtoBuf.Expression.ConstantValue.TRUE;
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Expression.ConstantValue constantValue_ = org.jetbrains.kotlin.metadata.ProtoBuf.Expression.ConstantValue.TRUE;
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
        */
       public boolean hasConstantValue() {
         return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Expression.ConstantValue getConstantValue() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Expression.ConstantValue getConstantValue() {
         return constantValue_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
        */
-      public Builder setConstantValue(org.jetbrains.kotlin.serialization.ProtoBuf.Expression.ConstantValue value) {
+      public Builder setConstantValue(org.jetbrains.kotlin.metadata.ProtoBuf.Expression.ConstantValue value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -25009,18 +25009,18 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Expression.ConstantValue constant_value = 3;
+       * optional .org.jetbrains.kotlin.metadata.Expression.ConstantValue constant_value = 3;
        */
       public Builder clearConstantValue() {
         bitField0_ = (bitField0_ & ~0x00000004);
-        constantValue_ = org.jetbrains.kotlin.serialization.ProtoBuf.Expression.ConstantValue.TRUE;
+        constantValue_ = org.jetbrains.kotlin.metadata.ProtoBuf.Expression.ConstantValue.TRUE;
         
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.Type isInstanceType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.Type isInstanceType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
@@ -25031,25 +25031,25 @@ public final class ProtoBuf {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
        * and with type encoded in either one of next two fields as RHS.
        * 

        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Type getIsInstanceType() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Type getIsInstanceType() {
         return isInstanceType_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
        * and with type encoded in either one of next two fields as RHS.
        * 

        */
-      public Builder setIsInstanceType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder setIsInstanceType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -25059,7 +25059,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
@@ -25067,25 +25067,25 @@ public final class ProtoBuf {
        * 

        */
       public Builder setIsInstanceType(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Type.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Type.Builder builderForValue) {
         isInstanceType_ = builderForValue.build();
 
         bitField0_ |= 0x00000008;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
        * and with type encoded in either one of next two fields as RHS.
        * 

        */
-      public Builder mergeIsInstanceType(org.jetbrains.kotlin.serialization.ProtoBuf.Type value) {
+      public Builder mergeIsInstanceType(org.jetbrains.kotlin.metadata.ProtoBuf.Type value) {
         if (((bitField0_ & 0x00000008) == 0x00000008) &&
-            isInstanceType_ != org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance()) {
+            isInstanceType_ != org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance()) {
           isInstanceType_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.Type.newBuilder(isInstanceType_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.Type.newBuilder(isInstanceType_).mergeFrom(value).buildPartial();
         } else {
           isInstanceType_ = value;
         }
@@ -25094,7 +25094,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.Type is_instance_type = 4;
+       * optional .org.jetbrains.kotlin.metadata.Type is_instance_type = 4;
        *
        * 
        * present => this expression is IsInstancePredicate,  with 'variableName' as LHS
@@ -25102,7 +25102,7 @@ public final class ProtoBuf {
        * 

        */
       public Builder clearIsInstanceType() {
-        isInstanceType_ = org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance();
+        isInstanceType_ = org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
@@ -25140,17 +25140,17 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List andArgument_ =
+      private java.util.List andArgument_ =
         java.util.Collections.emptyList();
       private void ensureAndArgumentIsMutable() {
         if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          andArgument_ = new java.util.ArrayList(andArgument_);
+          andArgument_ = new java.util.ArrayList(andArgument_);
           bitField0_ |= 0x00000020;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -25158,11 +25158,11 @@ public final class ProtoBuf {
        * it is optimized and embedded straight into this message
        * 

        */
-      public java.util.List getAndArgumentList() {
+      public java.util.List getAndArgumentList() {
         return java.util.Collections.unmodifiableList(andArgument_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -25174,7 +25174,7 @@ public final class ProtoBuf {
         return andArgument_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -25182,11 +25182,11 @@ public final class ProtoBuf {
        * it is optimized and embedded straight into this message
        * 

        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Expression getAndArgument(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Expression getAndArgument(int index) {
         return andArgument_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -25195,7 +25195,7 @@ public final class ProtoBuf {
        * 

        */
       public Builder setAndArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Expression value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Expression value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -25205,7 +25205,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -25214,14 +25214,14 @@ public final class ProtoBuf {
        * 

        */
       public Builder setAndArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Expression.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Expression.Builder builderForValue) {
         ensureAndArgumentIsMutable();
         andArgument_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -25229,7 +25229,7 @@ public final class ProtoBuf {
        * it is optimized and embedded straight into this message
        * 

        */
-      public Builder addAndArgument(org.jetbrains.kotlin.serialization.ProtoBuf.Expression value) {
+      public Builder addAndArgument(org.jetbrains.kotlin.metadata.ProtoBuf.Expression value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -25239,7 +25239,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -25248,7 +25248,7 @@ public final class ProtoBuf {
        * 

        */
       public Builder addAndArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Expression value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Expression value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -25258,7 +25258,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -25267,14 +25267,14 @@ public final class ProtoBuf {
        * 

        */
       public Builder addAndArgument(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Expression.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Expression.Builder builderForValue) {
         ensureAndArgumentIsMutable();
         andArgument_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -25283,14 +25283,14 @@ public final class ProtoBuf {
        * 

        */
       public Builder addAndArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Expression.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Expression.Builder builderForValue) {
         ensureAndArgumentIsMutable();
         andArgument_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -25299,7 +25299,7 @@ public final class ProtoBuf {
        * 

        */
       public Builder addAllAndArgument(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureAndArgumentIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, andArgument_);
@@ -25307,7 +25307,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -25322,7 +25322,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression and_argument = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Expression and_argument = 6;
        *
        * 
        * non-empty => this expression is boolean formula of form 'andArguments[0] && andArguments[1] && ...'
@@ -25337,17 +25337,17 @@ public final class ProtoBuf {
         return this;
       }
 
-      private java.util.List orArgument_ =
+      private java.util.List orArgument_ =
         java.util.Collections.emptyList();
       private void ensureOrArgumentIsMutable() {
         if (!((bitField0_ & 0x00000040) == 0x00000040)) {
-          orArgument_ = new java.util.ArrayList(orArgument_);
+          orArgument_ = new java.util.ArrayList(orArgument_);
           bitField0_ |= 0x00000040;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -25355,11 +25355,11 @@ public final class ProtoBuf {
        * it is optimized and embedded straight into this message.
        * 

        */
-      public java.util.List getOrArgumentList() {
+      public java.util.List getOrArgumentList() {
         return java.util.Collections.unmodifiableList(orArgument_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -25371,7 +25371,7 @@ public final class ProtoBuf {
         return orArgument_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -25379,11 +25379,11 @@ public final class ProtoBuf {
        * it is optimized and embedded straight into this message.
        * 

        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Expression getOrArgument(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Expression getOrArgument(int index) {
         return orArgument_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -25392,7 +25392,7 @@ public final class ProtoBuf {
        * 

        */
       public Builder setOrArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Expression value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Expression value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -25402,7 +25402,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -25411,14 +25411,14 @@ public final class ProtoBuf {
        * 

        */
       public Builder setOrArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Expression.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Expression.Builder builderForValue) {
         ensureOrArgumentIsMutable();
         orArgument_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -25426,7 +25426,7 @@ public final class ProtoBuf {
        * it is optimized and embedded straight into this message.
        * 

        */
-      public Builder addOrArgument(org.jetbrains.kotlin.serialization.ProtoBuf.Expression value) {
+      public Builder addOrArgument(org.jetbrains.kotlin.metadata.ProtoBuf.Expression value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -25436,7 +25436,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -25445,7 +25445,7 @@ public final class ProtoBuf {
        * 

        */
       public Builder addOrArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Expression value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Expression value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -25455,7 +25455,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -25464,14 +25464,14 @@ public final class ProtoBuf {
        * 

        */
       public Builder addOrArgument(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Expression.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Expression.Builder builderForValue) {
         ensureOrArgumentIsMutable();
         orArgument_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -25480,14 +25480,14 @@ public final class ProtoBuf {
        * 

        */
       public Builder addOrArgument(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Expression.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Expression.Builder builderForValue) {
         ensureOrArgumentIsMutable();
         orArgument_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -25496,7 +25496,7 @@ public final class ProtoBuf {
        * 

        */
       public Builder addAllOrArgument(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureOrArgumentIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, orArgument_);
@@ -25504,7 +25504,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -25519,7 +25519,7 @@ public final class ProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Expression or_argument = 7;
+       * repeated .org.jetbrains.kotlin.metadata.Expression or_argument = 7;
        *
        * 
        * non-empty => this expression is boolean formula of form 'orArguments[0] || andArguments[1] || ...'
@@ -25534,7 +25534,7 @@ public final class ProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.Expression)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.Expression)
     }
 
     static {
@@ -25542,7 +25542,7 @@ public final class ProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.Expression)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.Expression)
   }
 
 
diff --git a/core/metadata/src/org/jetbrains/kotlin/metadata/builtins/BuiltInsProtoBuf.java b/core/metadata/src/org/jetbrains/kotlin/metadata/builtins/BuiltInsProtoBuf.java
new file mode 100644
index 00000000000..bc29fb4e88f
--- /dev/null
+++ b/core/metadata/src/org/jetbrains/kotlin/metadata/builtins/BuiltInsProtoBuf.java
@@ -0,0 +1,186 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: core/metadata/src/builtins.proto
+
+package org.jetbrains.kotlin.metadata.builtins;
+
+public final class BuiltInsProtoBuf {
+  private BuiltInsProtoBuf() {}
+  public static void registerAllExtensions(
+      org.jetbrains.kotlin.protobuf.ExtensionRegistryLite registry) {
+    registry.add(org.jetbrains.kotlin.metadata.builtins.BuiltInsProtoBuf.packageFqName);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.BuiltInsProtoBuf.classAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.BuiltInsProtoBuf.constructorAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.BuiltInsProtoBuf.functionAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.BuiltInsProtoBuf.propertyAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.BuiltInsProtoBuf.compileTimeValue);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.BuiltInsProtoBuf.enumEntryAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.BuiltInsProtoBuf.parameterAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.BuiltInsProtoBuf.typeAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.builtins.BuiltInsProtoBuf.typeParameterAnnotation);
+  }
+  public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 151;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.Package { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.ProtoBuf.Package,
+      java.lang.Integer> packageFqName = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+          .newSingularGeneratedExtension(
+        org.jetbrains.kotlin.metadata.ProtoBuf.Package.getDefaultInstance(),
+        0,
+        null,
+        null,
+        151,
+        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.INT32,
+        java.lang.Integer.class);
+  public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.Class { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.ProtoBuf.Class,
+      java.util.List> classAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.ProtoBuf.Class.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
+        false,
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
+  public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.Constructor { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.ProtoBuf.Constructor,
+      java.util.List> constructorAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.ProtoBuf.Constructor.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
+        false,
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
+  public static final int FUNCTION_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.Function { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.ProtoBuf.Function,
+      java.util.List> functionAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.ProtoBuf.Function.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
+        false,
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
+  public static final int PROPERTY_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.Property { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.ProtoBuf.Property,
+      java.util.List> propertyAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
+        false,
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
+  public static final int COMPILE_TIME_VALUE_FIELD_NUMBER = 151;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.Property { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.ProtoBuf.Property,
+      org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value> compileTimeValue = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+          .newSingularGeneratedExtension(
+        org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
+        null,
+        151,
+        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.class);
+  public static final int ENUM_ENTRY_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.EnumEntry { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry,
+      java.util.List> enumEntryAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
+        false,
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
+  public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.ValueParameter { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter,
+      java.util.List> parameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
+        false,
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
+  public static final int TYPE_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.Type { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.ProtoBuf.Type,
+      java.util.List> typeAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
+        false,
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
+  public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
+  /**
+   * extend .org.jetbrains.kotlin.metadata.TypeParameter { ... }
+   */
+  public static final
+    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
+      org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter,
+      java.util.List> typeParameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+          .newRepeatedGeneratedExtension(
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
+        null,
+        150,
+        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
+        false,
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
+
+  static {
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
\ No newline at end of file
diff --git a/core/metadata/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java b/core/metadata/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
deleted file mode 100644
index 4d9e52d6703..00000000000
--- a/core/metadata/src/org/jetbrains/kotlin/serialization/builtins/BuiltInsProtoBuf.java
+++ /dev/null
@@ -1,186 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: core/metadata/src/builtins.proto
-
-package org.jetbrains.kotlin.serialization.builtins;
-
-public final class BuiltInsProtoBuf {
-  private BuiltInsProtoBuf() {}
-  public static void registerAllExtensions(
-      org.jetbrains.kotlin.protobuf.ExtensionRegistryLite registry) {
-    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.packageFqName);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.classAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.constructorAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.functionAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.propertyAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.compileTimeValue);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.enumEntryAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.parameterAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.typeAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf.typeParameterAnnotation);
-  }
-  public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 151;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.Package { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Package,
-      java.lang.Integer> packageFqName = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-          .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance(),
-        0,
-        null,
-        null,
-        151,
-        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.INT32,
-        java.lang.Integer.class);
-  public static final int CLASS_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.Class { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Class,
-      java.util.List> classAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
-  public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.Constructor { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Constructor,
-      java.util.List> constructorAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
-  public static final int FUNCTION_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.Function { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Function,
-      java.util.List> functionAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Function.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
-  public static final int PROPERTY_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.Property { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Property,
-      java.util.List> propertyAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Property.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
-  public static final int COMPILE_TIME_VALUE_FIELD_NUMBER = 151;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.Property { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Property,
-      org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value> compileTimeValue = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-          .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Property.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
-        null,
-        151,
-        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.class);
-  public static final int ENUM_ENTRY_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.EnumEntry { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry,
-      java.util.List> enumEntryAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
-  public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter,
-      java.util.List> parameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
-  public static final int TYPE_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.Type { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Type,
-      java.util.List> typeAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
-  public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 150;
-  /**
-   * extend .org.jetbrains.kotlin.serialization.TypeParameter { ... }
-   */
-  public static final
-    org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter,
-      java.util.List> typeParameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
-          .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
-        null,
-        150,
-        org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
-
-  static {
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
\ No newline at end of file
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
index fedda666106..69a36d999fc 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KClassImpl.kt
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.DescriptorUtils
@@ -29,7 +30,6 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.serialization.deserialization.MemberDeserializer
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.utils.compact
 import kotlin.jvm.internal.TypeIntrinsics
 import kotlin.reflect.*
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt
index 05cdc4f230a..652e1422276 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/KPackageImpl.kt
@@ -20,13 +20,13 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaPackageFragment
 import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryPackageSourceElement
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.serialization.PackageData
 import org.jetbrains.kotlin.serialization.deserialization.MemberDeserializer
 import org.jetbrains.kotlin.serialization.deserialization.TypeTable
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import kotlin.reflect.KCallable
 import kotlin.reflect.jvm.internal.KDeclarationContainerImpl.MemberBelonginess.DECLARED
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt
index 5174b0b1285..3b10dd64002 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/RuntimeTypeMapper.kt
@@ -28,20 +28,20 @@ import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor
 import org.jetbrains.kotlin.load.java.descriptors.JavaPropertyDescriptor
 import org.jetbrains.kotlin.load.java.sources.JavaSourceElement
 import org.jetbrains.kotlin.load.kotlin.JvmPackagePartSource
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.NameUtils
 import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.kotlin.serialization.deserialization.TypeTable
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor
 import org.jetbrains.kotlin.serialization.deserialization.getExtensionOrNull
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import java.lang.reflect.Constructor
 import java.lang.reflect.Field
diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt
index 64e33617fa0..14ad170e0bf 100644
--- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt
+++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/util.kt
@@ -22,15 +22,15 @@ import org.jetbrains.kotlin.descriptors.annotations.isEffectivelyInlineOnly
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinarySourceElement
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
 import org.jetbrains.kotlin.protobuf.MessageLite
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.descriptorUtil.classId
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.*
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.VersionRequirementTable
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import kotlin.jvm.internal.FunctionReference
 import kotlin.jvm.internal.PropertyReference
diff --git a/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt b/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
index b44a8a048eb..43c39d3bd89 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBufCompare.kt
@@ -17,13 +17,13 @@
 package org.jetbrains.kotlin.generators.protobuf
 
 import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil
+import org.jetbrains.kotlin.metadata.DebugExtOptionsProtoBuf
+import org.jetbrains.kotlin.metadata.DebugProtoBuf
+import org.jetbrains.kotlin.metadata.builtins.DebugBuiltInsProtoBuf
+import org.jetbrains.kotlin.metadata.java.DebugJavaClassProtoBuf
+import org.jetbrains.kotlin.metadata.js.DebugJsProtoBuf
+import org.jetbrains.kotlin.metadata.jvm.DebugJvmProtoBuf
 import org.jetbrains.kotlin.protobuf.Descriptors
-import org.jetbrains.kotlin.serialization.DebugExtOptionsProtoBuf
-import org.jetbrains.kotlin.serialization.DebugProtoBuf
-import org.jetbrains.kotlin.serialization.builtins.DebugBuiltInsProtoBuf
-import org.jetbrains.kotlin.serialization.java.DebugJavaClassProtoBuf
-import org.jetbrains.kotlin.serialization.js.DebugJsProtoBuf
-import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf
 import org.jetbrains.kotlin.utils.Printer
 import java.io.File
 import java.util.*
@@ -80,13 +80,13 @@ class GenerateProtoBufCompare {
         p.println("package org.jetbrains.kotlin.incremental")
         p.println()
 
+        p.println("import org.jetbrains.kotlin.metadata.ProtoBuf")
+        p.println("import org.jetbrains.kotlin.metadata.builtins.BuiltInsProtoBuf")
+        p.println("import org.jetbrains.kotlin.metadata.java.JavaClassProtoBuf")
+        p.println("import org.jetbrains.kotlin.metadata.js.JsProtoBuf")
+        p.println("import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf")
         p.println("import org.jetbrains.kotlin.name.ClassId")
-        p.println("import org.jetbrains.kotlin.serialization.ProtoBuf")
         p.println("import org.jetbrains.kotlin.serialization.deserialization.NameResolver")
-        p.println("import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf")
-        p.println("import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf")
-        p.println("import org.jetbrains.kotlin.serialization.js.JsProtoBuf")
-        p.println("import org.jetbrains.kotlin.serialization.java.JavaClassProtoBuf")
         p.println("import org.jetbrains.kotlin.utils.Interner")
         p.println("import java.util.*")
         p.println()
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/LightMemberOriginForCompiledElement.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/LightMemberOriginForCompiledElement.kt
index 025b61f6591..6020d0ffefe 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/LightMemberOriginForCompiledElement.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/lightClasses/LightMemberOriginForCompiledElement.kt
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledTextIndexer
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.load.kotlin.MemberSignature
+import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtDeclaration
@@ -38,7 +39,6 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor
 import org.jetbrains.kotlin.serialization.deserialization.getExtensionOrNull
-import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 
 interface LightMemberOriginForCompiledElement : LightMemberOrigin {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt
index 4b7755fe049..dc8c1354747 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/builtIns/KotlinBuiltInDecompiler.kt
@@ -23,10 +23,10 @@ import org.jetbrains.kotlin.builtins.BuiltInSerializerProtocol
 import org.jetbrains.kotlin.builtins.BuiltInsBinaryVersion
 import org.jetbrains.kotlin.idea.decompiler.common.FileWithMetadata
 import org.jetbrains.kotlin.idea.decompiler.common.KotlinMetadataDecompiler
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.psi.stubs.KotlinStubVersions
 import org.jetbrains.kotlin.resolve.TargetPlatform
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeDeserializer
 import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragment
 import java.io.ByteArrayInputStream
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt
index 346d481b90e..7eef563ec19 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/classFile/KotlinClsStubBuilder.kt
@@ -28,11 +28,11 @@ import org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache
 import org.jetbrains.kotlin.idea.decompiler.stubBuilder.*
 import org.jetbrains.kotlin.load.kotlin.*
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.stubs.KotlinStubVersions
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.kotlin.serialization.deserialization.TypeTable
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/AnnotationLoaderForStubBuilderImpl.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/AnnotationLoaderForStubBuilderImpl.kt
index 7ad80c532ce..ce38b8d40c9 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/AnnotationLoaderForStubBuilderImpl.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/AnnotationLoaderForStubBuilderImpl.kt
@@ -17,9 +17,9 @@
 package org.jetbrains.kotlin.idea.decompiler.common
 
 import org.jetbrains.kotlin.idea.decompiler.stubBuilder.ClassIdWithTarget
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.protobuf.MessageLite
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
 import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
 import org.jetbrains.kotlin.serialization.deserialization.AnnotationAndConstantLoader
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDecompiler.kt
index 04e2428c62d..8fea70ab041 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDecompiler.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDecompiler.kt
@@ -27,9 +27,9 @@ import org.jetbrains.kotlin.idea.decompiler.KtDecompiledFile
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledText
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledText
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.defaultDecompilerRendererOptions
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.resolve.TargetPlatform
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
 import org.jetbrains.kotlin.serialization.deserialization.BinaryVersion
 import org.jetbrains.kotlin.serialization.deserialization.ClassDeserializer
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDeserializerForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDeserializerForDecompiler.kt
index b78a29e3ac4..9ab53414796 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDeserializerForDecompiler.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/common/KotlinMetadataDeserializerForDecompiler.kt
@@ -25,9 +25,9 @@ import org.jetbrains.kotlin.idea.decompiler.textBuilder.DeserializerForDecompile
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.LoggingErrorReporter
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.ResolveEverythingToKotlinAnyLocalClassifierResolver
 import org.jetbrains.kotlin.incremental.components.LookupTracker
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.TargetPlatform
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
 import org.jetbrains.kotlin.serialization.deserialization.*
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt
index f848aac46b1..3ebb5cd040d 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt
@@ -20,10 +20,10 @@ import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.kotlin.idea.decompiler.common.FileWithMetadata
 import org.jetbrains.kotlin.idea.decompiler.common.KotlinMetadataDecompiler
 import org.jetbrains.kotlin.js.resolve.JsPlatform
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.js.JsProtoBuf
 import org.jetbrains.kotlin.psi.stubs.KotlinStubVersions
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.js.DynamicTypeDeserializer
-import org.jetbrains.kotlin.serialization.js.JsProtoBuf
 import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol
 import org.jetbrains.kotlin.utils.JsMetadataVersion
 import java.io.ByteArrayInputStream
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt
index 52c46f4a4ac..c142528d2d2 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt
@@ -20,6 +20,9 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.stubs.StubElement
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
 import org.jetbrains.kotlin.idea.decompiler.stubBuilder.flags.*
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.ProtoBuf.MemberKind
+import org.jetbrains.kotlin.metadata.ProtoBuf.Modality
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes
 import org.jetbrains.kotlin.psi.stubs.impl.KotlinFunctionStubImpl
@@ -27,9 +30,6 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl
 import org.jetbrains.kotlin.psi.stubs.impl.KotlinPropertyStubImpl
 import org.jetbrains.kotlin.resolve.DataClassDescriptorResolver
 import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.ProtoBuf.MemberKind
-import org.jetbrains.kotlin.serialization.ProtoBuf.Modality
 import org.jetbrains.kotlin.serialization.deserialization.*
 
 fun createDeclarationsStubs(
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
index 4e8841e15c2..0d6b38c2c22 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.idea.decompiler.stubBuilder.flags.*
 import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
 import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.psi.KtClassBody
 import org.jetbrains.kotlin.psi.KtSuperTypeEntry
@@ -36,7 +37,6 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl
 import org.jetbrains.kotlin.psi.stubs.impl.KotlinObjectStubImpl
 import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl
 import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.kotlin.serialization.deserialization.TypeTable
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt
index 488d9678632..5a039c69833 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt
@@ -18,10 +18,10 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder
 
 import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.*
 
 data class ClassIdWithTarget(val classId: ClassId, val target: AnnotationUseSiteTarget?)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
index 6ec8f50b88c..29b2edb516c 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
@@ -22,6 +22,10 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.builtins.isBuiltinFunctionClass
 import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
 import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.ProtoBuf.Type
+import org.jetbrains.kotlin.metadata.ProtoBuf.Type.Argument.Projection
+import org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.Variance
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -32,10 +36,6 @@ import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes
 import org.jetbrains.kotlin.psi.stubs.impl.*
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.ProtoBuf
-import org.jetbrains.kotlin.serialization.ProtoBuf.Type
-import org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection
-import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance
 import org.jetbrains.kotlin.serialization.deserialization.*
 import org.jetbrains.kotlin.serialization.js.DynamicTypeDeserializer
 import java.util.*
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
index 2817b57c4d2..f64a07773ed 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
 import org.jetbrains.kotlin.load.kotlin.JvmPackagePartSource
 import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
 import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
@@ -36,7 +37,6 @@ import org.jetbrains.kotlin.psi.stubs.KotlinUserTypeStub
 import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes
 import org.jetbrains.kotlin.psi.stubs.impl.*
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
 import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 import org.jetbrains.kotlin.serialization.deserialization.TypeTable
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/flags/flags.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/flags/flags.kt
index fbbf8fc92db..f79277d461b 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/flags/flags.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/flags/flags.kt
@@ -18,8 +18,8 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder.flags
 
 import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
 import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.ProtoBuf
 
 abstract class FlagsToModifiers {
     abstract fun getModifiers(flags: Int): KtModifierKeywordToken?
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/typeAliasClsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/typeAliasClsStubBuilding.kt
index 6af9a7d69ee..396bfa5898f 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/typeAliasClsStubBuilding.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/typeAliasClsStubBuilding.kt
@@ -19,10 +19,10 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder
 import com.intellij.psi.PsiElement
 import com.intellij.psi.stubs.StubElement
 import org.jetbrains.kotlin.idea.decompiler.stubBuilder.flags.VISIBILITY
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeAliasStubImpl
 import org.jetbrains.kotlin.serialization.Flags
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
 
 fun createTypeAliasStub(
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt
index 33428253b20..16d26cdc52c 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileIndexes.kt
@@ -26,11 +26,11 @@ import org.jetbrains.kotlin.idea.caches.IDEKotlinBinaryClassCache
 import org.jetbrains.kotlin.idea.decompiler.builtIns.BuiltInDefinitionFile
 import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType
 import org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptMetaFileType
+import org.jetbrains.kotlin.metadata.js.JsProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragment
-import org.jetbrains.kotlin.serialization.js.JsProtoBuf
 import org.jetbrains.kotlin.utils.JsMetadataVersion
 import java.io.ByteArrayInputStream
 import java.io.DataInput
diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt
index 59cac8df124..6625df52eaa 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractJsProtoComparisonTest.kt
@@ -26,13 +26,13 @@ import org.jetbrains.kotlin.incremental.ProtoData
 import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumer
 import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumerImpl
 import org.jetbrains.kotlin.incremental.utils.TestMessageCollector
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.js.JsProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl
 import org.jetbrains.kotlin.serialization.deserialization.getExtensionOrNull
-import org.jetbrains.kotlin.serialization.js.JsProtoBuf
 import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol
 import org.junit.Assert
 import java.io.File
diff --git a/js/js.serializer/src/js.proto b/js/js.serializer/src/js.proto
index e1e691d5e3c..f751ce49741 100644
--- a/js/js.serializer/src/js.proto
+++ b/js/js.serializer/src/js.proto
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.serialization.js;
+package org.jetbrains.kotlin.metadata.js;
 
 import "core/metadata/src/metadata.proto";
 
diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java b/js/js.serializer/src/org/jetbrains/kotlin/metadata/js/JsProtoBuf.java
similarity index 70%
rename from js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
rename to js/js.serializer/src/org/jetbrains/kotlin/metadata/js/JsProtoBuf.java
index ba7401933e1..5dcfccf862d 100644
--- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/JsProtoBuf.java
+++ b/js/js.serializer/src/org/jetbrains/kotlin/metadata/js/JsProtoBuf.java
@@ -1,29 +1,29 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: js/js.serializer/src/js.proto
 
-package org.jetbrains.kotlin.serialization.js;
+package org.jetbrains.kotlin.metadata.js;
 
 public final class JsProtoBuf {
   private JsProtoBuf() {}
   public static void registerAllExtensions(
       org.jetbrains.kotlin.protobuf.ExtensionRegistryLite registry) {
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.packageFqName);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.classAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.classContainingFileId);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.constructorAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.functionAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.functionContainingFileId);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.propertyAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.compileTimeValue);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.propertyContainingFileId);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.enumEntryAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.parameterAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.typeAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.typeParameterAnnotation);
-    registry.add(org.jetbrains.kotlin.serialization.js.JsProtoBuf.packageFragmentFiles);
+    registry.add(org.jetbrains.kotlin.metadata.js.JsProtoBuf.packageFqName);
+    registry.add(org.jetbrains.kotlin.metadata.js.JsProtoBuf.classAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.JsProtoBuf.classContainingFileId);
+    registry.add(org.jetbrains.kotlin.metadata.js.JsProtoBuf.constructorAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.JsProtoBuf.functionAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.JsProtoBuf.functionContainingFileId);
+    registry.add(org.jetbrains.kotlin.metadata.js.JsProtoBuf.propertyAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.JsProtoBuf.compileTimeValue);
+    registry.add(org.jetbrains.kotlin.metadata.js.JsProtoBuf.propertyContainingFileId);
+    registry.add(org.jetbrains.kotlin.metadata.js.JsProtoBuf.enumEntryAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.JsProtoBuf.parameterAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.JsProtoBuf.typeAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.JsProtoBuf.typeParameterAnnotation);
+    registry.add(org.jetbrains.kotlin.metadata.js.JsProtoBuf.packageFragmentFiles);
   }
   public interface HeaderOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Header)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.js.Header)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
@@ -75,42 +75,42 @@ public final class JsProtoBuf {
         getPackageFqNameBytes();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
      */
     boolean hasStrings();
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStrings();
+    org.jetbrains.kotlin.metadata.ProtoBuf.StringTable getStrings();
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
      */
     boolean hasQualifiedNames();
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNames();
+    org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable getQualifiedNames();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    java.util.List 
+    java.util.List 
         getAnnotationList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
@@ -119,11 +119,11 @@ public final class JsProtoBuf {
     int getAnnotationCount();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Header}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Header}
    */
   public static final class Header extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Header)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.js.Header)
       HeaderOrBuilder {
     // Use Header.newBuilder() to construct.
     private Header(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -185,11 +185,11 @@ public final class JsProtoBuf {
               break;
             }
             case 34: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000008) == 0x00000008)) {
                 subBuilder = strings_.toBuilder();
               }
-              strings_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.PARSER, extensionRegistry);
+              strings_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(strings_);
                 strings_ = subBuilder.buildPartial();
@@ -198,11 +198,11 @@ public final class JsProtoBuf {
               break;
             }
             case 42: {
-              org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.Builder subBuilder = null;
+              org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.Builder subBuilder = null;
               if (((bitField0_ & 0x00000010) == 0x00000010)) {
                 subBuilder = qualifiedNames_.toBuilder();
               }
-              qualifiedNames_ = input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.PARSER, extensionRegistry);
+              qualifiedNames_ = input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.PARSER, extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(qualifiedNames_);
                 qualifiedNames_ = subBuilder.buildPartial();
@@ -212,10 +212,10 @@ public final class JsProtoBuf {
             }
             case 50: {
               if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-                annotation_ = new java.util.ArrayList();
+                annotation_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              annotation_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.PARSER, extensionRegistry));
+              annotation_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.PARSER, extensionRegistry));
               break;
             }
           }
@@ -344,60 +344,60 @@ public final class JsProtoBuf {
     }
 
     public static final int STRINGS_FIELD_NUMBER = 4;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.StringTable strings_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.StringTable strings_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
      */
     public boolean hasStrings() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+     * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStrings() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.StringTable getStrings() {
       return strings_;
     }
 
     public static final int QUALIFIED_NAMES_FIELD_NUMBER = 5;
-    private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable qualifiedNames_;
+    private org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable qualifiedNames_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
      */
     public boolean hasQualifiedNames() {
       return ((bitField0_ & 0x00000010) == 0x00000010);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+     * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNames() {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable getQualifiedNames() {
       return qualifiedNames_;
     }
 
     public static final int ANNOTATION_FIELD_NUMBER = 6;
-    private java.util.List annotation_;
+    private java.util.List annotation_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public java.util.List getAnnotationList() {
+    public java.util.List getAnnotationList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public java.util.List 
+    public java.util.List 
         getAnnotationOrBuilderList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
@@ -407,23 +407,23 @@ public final class JsProtoBuf {
       return annotation_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation(int index) {
       return annotation_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
      *
      * 
      * Annotations on the whole module
      * 

      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
         int index) {
       return annotation_.get(index);
     }
@@ -432,8 +432,8 @@ public final class JsProtoBuf {
       flags_ = 0;
       jsCodeBinaryVersion_ = 1;
       packageFqName_ = "";
-      strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
-      qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
+      strings_ = org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance();
+      qualifiedNames_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance();
       annotation_ = java.util.Collections.emptyList();
     }
     private byte memoizedIsInitialized = -1;
@@ -524,53 +524,53 @@ public final class JsProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -579,21 +579,21 @@ public final class JsProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Header}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Header}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header, Builder>
+          org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Header)
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.HeaderOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.js.Header)
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.HeaderOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -612,9 +612,9 @@ public final class JsProtoBuf {
         bitField0_ = (bitField0_ & ~0x00000002);
         packageFqName_ = "";
         bitField0_ = (bitField0_ & ~0x00000004);
-        strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
+        strings_ = org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000008);
-        qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
+        qualifiedNames_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance();
         bitField0_ = (bitField0_ & ~0x00000010);
         annotation_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000020);
@@ -625,20 +625,20 @@ public final class JsProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header build() {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header result = buildPartial();
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header build() {
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header buildPartial() {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header result = new org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header(this);
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header buildPartial() {
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header result = new org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -670,8 +670,8 @@ public final class JsProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header other) {
-        if (other == org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header other) {
+        if (other == org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header.getDefaultInstance()) return this;
         if (other.hasFlags()) {
           setFlags(other.getFlags());
         }
@@ -724,11 +724,11 @@ public final class JsProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header parsedMessage = null;
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.js.JsProtoBuf.Header) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.js.JsProtoBuf.Header) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -911,23 +911,23 @@ public final class JsProtoBuf {
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.StringTable strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.StringTable strings_ = org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
       public boolean hasStrings() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.StringTable getStrings() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.StringTable getStrings() {
         return strings_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
-      public Builder setStrings(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable value) {
+      public Builder setStrings(org.jetbrains.kotlin.metadata.ProtoBuf.StringTable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -937,23 +937,23 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
       public Builder setStrings(
-          org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.Builder builderForValue) {
         strings_ = builderForValue.build();
 
         bitField0_ |= 0x00000008;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
-      public Builder mergeStrings(org.jetbrains.kotlin.serialization.ProtoBuf.StringTable value) {
+      public Builder mergeStrings(org.jetbrains.kotlin.metadata.ProtoBuf.StringTable value) {
         if (((bitField0_ & 0x00000008) == 0x00000008) &&
-            strings_ != org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance()) {
+            strings_ != org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance()) {
           strings_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.newBuilder(strings_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.newBuilder(strings_).mergeFrom(value).buildPartial();
         } else {
           strings_ = value;
         }
@@ -962,32 +962,32 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.StringTable strings = 4;
+       * optional .org.jetbrains.kotlin.metadata.StringTable strings = 4;
        */
       public Builder clearStrings() {
-        strings_ = org.jetbrains.kotlin.serialization.ProtoBuf.StringTable.getDefaultInstance();
+        strings_ = org.jetbrains.kotlin.metadata.ProtoBuf.StringTable.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
 
-      private org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
+      private org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable qualifiedNames_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance();
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
       public boolean hasQualifiedNames() {
         return ((bitField0_ & 0x00000010) == 0x00000010);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable getQualifiedNames() {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable getQualifiedNames() {
         return qualifiedNames_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
-      public Builder setQualifiedNames(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable value) {
+      public Builder setQualifiedNames(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -997,23 +997,23 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
       public Builder setQualifiedNames(
-          org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.Builder builderForValue) {
         qualifiedNames_ = builderForValue.build();
 
         bitField0_ |= 0x00000010;
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
-      public Builder mergeQualifiedNames(org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable value) {
+      public Builder mergeQualifiedNames(org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable value) {
         if (((bitField0_ & 0x00000010) == 0x00000010) &&
-            qualifiedNames_ != org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance()) {
+            qualifiedNames_ != org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance()) {
           qualifiedNames_ =
-            org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.newBuilder(qualifiedNames_).mergeFrom(value).buildPartial();
+            org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.newBuilder(qualifiedNames_).mergeFrom(value).buildPartial();
         } else {
           qualifiedNames_ = value;
         }
@@ -1022,36 +1022,36 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.QualifiedNameTable qualified_names = 5;
+       * optional .org.jetbrains.kotlin.metadata.QualifiedNameTable qualified_names = 5;
        */
       public Builder clearQualifiedNames() {
-        qualifiedNames_ = org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.getDefaultInstance();
+        qualifiedNames_ = org.jetbrains.kotlin.metadata.ProtoBuf.QualifiedNameTable.getDefaultInstance();
 
         bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
-      private java.util.List annotation_ =
+      private java.util.List annotation_ =
         java.util.Collections.emptyList();
       private void ensureAnnotationIsMutable() {
         if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-          annotation_ = new java.util.ArrayList(annotation_);
+          annotation_ = new java.util.ArrayList(annotation_);
           bitField0_ |= 0x00000020;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public java.util.List getAnnotationList() {
+      public java.util.List getAnnotationList() {
         return java.util.Collections.unmodifiableList(annotation_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
@@ -1061,24 +1061,24 @@ public final class JsProtoBuf {
         return annotation_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation(int index) {
         return annotation_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1088,27 +1088,27 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Builder builderForValue) {
         ensureAnnotationIsMutable();
         annotation_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
-      public Builder addAnnotation(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
+      public Builder addAnnotation(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1118,14 +1118,14 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1135,42 +1135,42 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAnnotation(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Builder builderForValue) {
         ensureAnnotationIsMutable();
         annotation_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Builder builderForValue) {
         ensureAnnotationIsMutable();
         annotation_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
        * 

        */
       public Builder addAllAnnotation(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureAnnotationIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, annotation_);
@@ -1178,7 +1178,7 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
@@ -1191,7 +1191,7 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 6;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 6;
        *
        * 
        * Annotations on the whole module
@@ -1204,7 +1204,7 @@ public final class JsProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.Header)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.js.Header)
     }
 
     static {
@@ -1212,11 +1212,11 @@ public final class JsProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Header)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.js.Header)
   }
 
   public interface FileOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.File)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.js.File)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
@@ -1237,25 +1237,25 @@ public final class JsProtoBuf {
     int getId();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
-    java.util.List 
+    java.util.List 
         getAnnotationList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
     int getAnnotationCount();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.js.File}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.js.File}
    */
   public static final class File extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.File)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.js.File)
       FileOrBuilder {
     // Use File.newBuilder() to construct.
     private File(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -1307,10 +1307,10 @@ public final class JsProtoBuf {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                annotation_ = new java.util.ArrayList();
+                annotation_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              annotation_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.PARSER, extensionRegistry));
+              annotation_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.PARSER, extensionRegistry));
               break;
             }
           }
@@ -1374,36 +1374,36 @@ public final class JsProtoBuf {
     }
 
     public static final int ANNOTATION_FIELD_NUMBER = 2;
-    private java.util.List annotation_;
+    private java.util.List annotation_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
-    public java.util.List getAnnotationList() {
+    public java.util.List getAnnotationList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getAnnotationOrBuilderList() {
       return annotation_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
     public int getAnnotationCount() {
       return annotation_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation(int index) {
       return annotation_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+     * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.AnnotationOrBuilder getAnnotationOrBuilder(
         int index) {
       return annotation_.get(index);
     }
@@ -1466,53 +1466,53 @@ public final class JsProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.File parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.File parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.File parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.File parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.File parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.File parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.File parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.File parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.File parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.File parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.File parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.File parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.File parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.File parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.File parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.File parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.File parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.File parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.File parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.File parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1521,21 +1521,21 @@ public final class JsProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.JsProtoBuf.File prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.js.JsProtoBuf.File prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.js.File}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.js.File}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.js.JsProtoBuf.File, Builder>
+          org.jetbrains.kotlin.metadata.js.JsProtoBuf.File, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.File)
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.FileOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.js.JsProtoBuf.File.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.js.File)
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.FileOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.js.JsProtoBuf.File.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1559,20 +1559,20 @@ public final class JsProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.File getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.js.JsProtoBuf.File.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.File getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.js.JsProtoBuf.File.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.File build() {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.File result = buildPartial();
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.File build() {
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.File result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.File buildPartial() {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.File result = new org.jetbrains.kotlin.serialization.js.JsProtoBuf.File(this);
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.File buildPartial() {
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.File result = new org.jetbrains.kotlin.metadata.js.JsProtoBuf.File(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1588,8 +1588,8 @@ public final class JsProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.JsProtoBuf.File other) {
-        if (other == org.jetbrains.kotlin.serialization.js.JsProtoBuf.File.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.js.JsProtoBuf.File other) {
+        if (other == org.jetbrains.kotlin.metadata.js.JsProtoBuf.File.getDefaultInstance()) return this;
         if (other.hasId()) {
           setId(other.getId());
         }
@@ -1622,11 +1622,11 @@ public final class JsProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.File parsedMessage = null;
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.File parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.js.JsProtoBuf.File) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.js.JsProtoBuf.File) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -1685,38 +1685,38 @@ public final class JsProtoBuf {
         return this;
       }
 
-      private java.util.List annotation_ =
+      private java.util.List annotation_ =
         java.util.Collections.emptyList();
       private void ensureAnnotationIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          annotation_ = new java.util.ArrayList(annotation_);
+          annotation_ = new java.util.ArrayList(annotation_);
           bitField0_ |= 0x00000002;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
-      public java.util.List getAnnotationList() {
+      public java.util.List getAnnotationList() {
         return java.util.Collections.unmodifiableList(annotation_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public int getAnnotationCount() {
         return annotation_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.Annotation getAnnotation(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.Annotation getAnnotation(int index) {
         return annotation_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1726,19 +1726,19 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder setAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Builder builderForValue) {
         ensureAnnotationIsMutable();
         annotation_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
-      public Builder addAnnotation(org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
+      public Builder addAnnotation(org.jetbrains.kotlin.metadata.ProtoBuf.Annotation value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1748,10 +1748,10 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1761,30 +1761,30 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder addAnnotation(
-          org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Builder builderForValue) {
         ensureAnnotationIsMutable();
         annotation_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder addAnnotation(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Builder builderForValue) {
         ensureAnnotationIsMutable();
         annotation_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder addAllAnnotation(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureAnnotationIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, annotation_);
@@ -1792,7 +1792,7 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder clearAnnotation() {
         annotation_ = java.util.Collections.emptyList();
@@ -1801,7 +1801,7 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.Annotation annotation = 2;
+       * repeated .org.jetbrains.kotlin.metadata.Annotation annotation = 2;
        */
       public Builder removeAnnotation(int index) {
         ensureAnnotationIsMutable();
@@ -1810,7 +1810,7 @@ public final class JsProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.File)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.js.File)
     }
 
     static {
@@ -1818,33 +1818,33 @@ public final class JsProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.File)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.js.File)
   }
 
   public interface FilesOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Files)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.js.Files)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
-    java.util.List 
+    java.util.List 
         getFileList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
-    org.jetbrains.kotlin.serialization.js.JsProtoBuf.File getFile(int index);
+    org.jetbrains.kotlin.metadata.js.JsProtoBuf.File getFile(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
     int getFileCount();
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Files}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Files}
    */
   public static final class Files extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Files)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.js.Files)
       FilesOrBuilder {
     // Use Files.newBuilder() to construct.
     private Files(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -1891,10 +1891,10 @@ public final class JsProtoBuf {
             }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
-                file_ = new java.util.ArrayList();
+                file_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              file_.add(input.readMessage(org.jetbrains.kotlin.serialization.js.JsProtoBuf.File.PARSER, extensionRegistry));
+              file_.add(input.readMessage(org.jetbrains.kotlin.metadata.js.JsProtoBuf.File.PARSER, extensionRegistry));
               break;
             }
           }
@@ -1934,36 +1934,36 @@ public final class JsProtoBuf {
     }
 
     public static final int FILE_FIELD_NUMBER = 1;
-    private java.util.List file_;
+    private java.util.List file_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
-    public java.util.List getFileList() {
+    public java.util.List getFileList() {
       return file_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
-    public java.util.List 
+    public java.util.List 
         getFileOrBuilderList() {
       return file_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
     public int getFileCount() {
       return file_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
-    public org.jetbrains.kotlin.serialization.js.JsProtoBuf.File getFile(int index) {
+    public org.jetbrains.kotlin.metadata.js.JsProtoBuf.File getFile(int index) {
       return file_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+     * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
      */
-    public org.jetbrains.kotlin.serialization.js.JsProtoBuf.FileOrBuilder getFileOrBuilder(
+    public org.jetbrains.kotlin.metadata.js.JsProtoBuf.FileOrBuilder getFileOrBuilder(
         int index) {
       return file_.get(index);
     }
@@ -2018,53 +2018,53 @@ public final class JsProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2073,21 +2073,21 @@ public final class JsProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Files}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Files}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files, Builder>
+          org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Files)
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.FilesOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.js.Files)
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.FilesOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2109,20 +2109,20 @@ public final class JsProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files build() {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files result = buildPartial();
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files build() {
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files buildPartial() {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files result = new org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files(this);
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files buildPartial() {
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files result = new org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           file_ = java.util.Collections.unmodifiableList(file_);
@@ -2132,8 +2132,8 @@ public final class JsProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files other) {
-        if (other == org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files other) {
+        if (other == org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files.getDefaultInstance()) return this;
         if (!other.file_.isEmpty()) {
           if (file_.isEmpty()) {
             file_ = other.file_;
@@ -2163,11 +2163,11 @@ public final class JsProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files parsedMessage = null;
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2178,38 +2178,38 @@ public final class JsProtoBuf {
       }
       private int bitField0_;
 
-      private java.util.List file_ =
+      private java.util.List file_ =
         java.util.Collections.emptyList();
       private void ensureFileIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          file_ = new java.util.ArrayList(file_);
+          file_ = new java.util.ArrayList(file_);
           bitField0_ |= 0x00000001;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
-      public java.util.List getFileList() {
+      public java.util.List getFileList() {
         return java.util.Collections.unmodifiableList(file_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public int getFileCount() {
         return file_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.File getFile(int index) {
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.File getFile(int index) {
         return file_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder setFile(
-          int index, org.jetbrains.kotlin.serialization.js.JsProtoBuf.File value) {
+          int index, org.jetbrains.kotlin.metadata.js.JsProtoBuf.File value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2219,19 +2219,19 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder setFile(
-          int index, org.jetbrains.kotlin.serialization.js.JsProtoBuf.File.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.js.JsProtoBuf.File.Builder builderForValue) {
         ensureFileIsMutable();
         file_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
-      public Builder addFile(org.jetbrains.kotlin.serialization.js.JsProtoBuf.File value) {
+      public Builder addFile(org.jetbrains.kotlin.metadata.js.JsProtoBuf.File value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2241,10 +2241,10 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder addFile(
-          int index, org.jetbrains.kotlin.serialization.js.JsProtoBuf.File value) {
+          int index, org.jetbrains.kotlin.metadata.js.JsProtoBuf.File value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -2254,30 +2254,30 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder addFile(
-          org.jetbrains.kotlin.serialization.js.JsProtoBuf.File.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.js.JsProtoBuf.File.Builder builderForValue) {
         ensureFileIsMutable();
         file_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder addFile(
-          int index, org.jetbrains.kotlin.serialization.js.JsProtoBuf.File.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.js.JsProtoBuf.File.Builder builderForValue) {
         ensureFileIsMutable();
         file_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder addAllFile(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensureFileIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, file_);
@@ -2285,7 +2285,7 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder clearFile() {
         file_ = java.util.Collections.emptyList();
@@ -2294,7 +2294,7 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.js.File file = 1;
+       * repeated .org.jetbrains.kotlin.metadata.js.File file = 1;
        */
       public Builder removeFile(int index) {
         ensureFileIsMutable();
@@ -2303,7 +2303,7 @@ public final class JsProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.Files)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.js.Files)
     }
 
     static {
@@ -2311,11 +2311,11 @@ public final class JsProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Files)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.js.Files)
   }
 
   public interface ClassesOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Classes)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.js.Classes)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
@@ -2344,11 +2344,11 @@ public final class JsProtoBuf {
     int getClassName(int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Classes}
    */
   public static final class Classes extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Classes)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.js.Classes)
       ClassesOrBuilder {
     // Use Classes.newBuilder() to construct.
     private Classes(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -2543,53 +2543,53 @@ public final class JsProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2598,21 +2598,21 @@ public final class JsProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Classes}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Classes}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes, Builder>
+          org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Classes)
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.ClassesOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.js.Classes)
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.ClassesOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2634,20 +2634,20 @@ public final class JsProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes build() {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes result = buildPartial();
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes build() {
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes buildPartial() {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes result = new org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes(this);
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes buildPartial() {
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes result = new org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) == 0x00000001)) {
           className_ = java.util.Collections.unmodifiableList(className_);
@@ -2657,8 +2657,8 @@ public final class JsProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes other) {
-        if (other == org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes other) {
+        if (other == org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes.getDefaultInstance()) return this;
         if (!other.className_.isEmpty()) {
           if (className_.isEmpty()) {
             className_ = other.className_;
@@ -2682,11 +2682,11 @@ public final class JsProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes parsedMessage = null;
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.js.JsProtoBuf.Classes) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.js.JsProtoBuf.Classes) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -2791,7 +2791,7 @@ public final class JsProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.Classes)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.js.Classes)
     }
 
     static {
@@ -2799,33 +2799,33 @@ public final class JsProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Classes)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.js.Classes)
   }
 
   public interface LibraryOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.Library)
+      // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.metadata.js.Library)
       org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
     /**
-     * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+     * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
      */
     boolean hasKind();
     /**
-     * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+     * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
      */
-    org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind getKind();
+    org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.Kind getKind();
 
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
-    java.util.List 
+    java.util.List 
         getPackageFragmentList();
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
-    org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment getPackageFragment(int index);
+    org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment getPackageFragment(int index);
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
     int getPackageFragmentCount();
 
@@ -2849,11 +2849,11 @@ public final class JsProtoBuf {
         getImportedModuleBytes(int index);
   }
   /**
-   * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library}
+   * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Library}
    */
   public static final class Library extends
       org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
-      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.Library)
+      // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.metadata.js.Library)
       LibraryOrBuilder {
     // Use Library.newBuilder() to construct.
     private Library(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
@@ -2900,7 +2900,7 @@ public final class JsProtoBuf {
             }
             case 8: {
               int rawValue = input.readEnum();
-              org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind value = org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind.valueOf(rawValue);
+              org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.Kind value = org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.Kind.valueOf(rawValue);
               if (value == null) {
                 unknownFieldsCodedOutput.writeRawVarint32(tag);
                 unknownFieldsCodedOutput.writeRawVarint32(rawValue);
@@ -2912,10 +2912,10 @@ public final class JsProtoBuf {
             }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-                packageFragment_ = new java.util.ArrayList();
+                packageFragment_ = new java.util.ArrayList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              packageFragment_.add(input.readMessage(org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment.PARSER, extensionRegistry));
+              packageFragment_.add(input.readMessage(org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment.PARSER, extensionRegistry));
               break;
             }
             case 26: {
@@ -2967,7 +2967,7 @@ public final class JsProtoBuf {
     }
 
     /**
-     * Protobuf enum {@code org.jetbrains.kotlin.serialization.js.Library.Kind}
+     * Protobuf enum {@code org.jetbrains.kotlin.metadata.js.Library.Kind}
      */
     public enum Kind
         implements org.jetbrains.kotlin.protobuf.Internal.EnumLite {
@@ -3037,56 +3037,56 @@ public final class JsProtoBuf {
         this.value = value;
       }
 
-      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.serialization.js.Library.Kind)
+      // @@protoc_insertion_point(enum_scope:org.jetbrains.kotlin.metadata.js.Library.Kind)
     }
 
     private int bitField0_;
     public static final int KIND_FIELD_NUMBER = 1;
-    private org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind kind_;
+    private org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.Kind kind_;
     /**
-     * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+     * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
      */
     public boolean hasKind() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+     * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
      */
-    public org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind getKind() {
+    public org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.Kind getKind() {
       return kind_;
     }
 
     public static final int PACKAGE_FRAGMENT_FIELD_NUMBER = 2;
-    private java.util.List packageFragment_;
+    private java.util.List packageFragment_;
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
-    public java.util.List getPackageFragmentList() {
+    public java.util.List getPackageFragmentList() {
       return packageFragment_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
-    public java.util.List 
+    public java.util.List 
         getPackageFragmentOrBuilderList() {
       return packageFragment_;
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
     public int getPackageFragmentCount() {
       return packageFragment_.size();
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment getPackageFragment(int index) {
+    public org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment getPackageFragment(int index) {
       return packageFragment_.get(index);
     }
     /**
-     * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+     * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
      */
-    public org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragmentOrBuilder getPackageFragmentOrBuilder(
+    public org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragmentOrBuilder getPackageFragmentOrBuilder(
         int index) {
       return packageFragment_.get(index);
     }
@@ -3121,7 +3121,7 @@ public final class JsProtoBuf {
     }
 
     private void initFields() {
-      kind_ = org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind.PLAIN;
+      kind_ = org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.Kind.PLAIN;
       packageFragment_ = java.util.Collections.emptyList();
       importedModule_ = org.jetbrains.kotlin.protobuf.LazyStringArrayList.EMPTY;
     }
@@ -3191,53 +3191,53 @@ public final class JsProtoBuf {
       return super.writeReplace();
     }
 
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library parseFrom(
         org.jetbrains.kotlin.protobuf.ByteString data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library parseFrom(byte[] data)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library parseFrom(byte[] data)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library parseFrom(
         byte[] data,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
       return PARSER.parseFrom(data, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library parseFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library parseFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library parseDelimitedFrom(java.io.InputStream input)
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library parseDelimitedFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library parseDelimitedFrom(
         java.io.InputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return PARSER.parseDelimitedFrom(input, extensionRegistry);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return PARSER.parseFrom(input);
     }
-    public static org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library parseFrom(
+    public static org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library parseFrom(
         org.jetbrains.kotlin.protobuf.CodedInputStream input,
         org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -3246,21 +3246,21 @@ public final class JsProtoBuf {
 
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library prototype) {
+    public static Builder newBuilder(org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
 
     /**
-     * Protobuf type {@code org.jetbrains.kotlin.serialization.js.Library}
+     * Protobuf type {@code org.jetbrains.kotlin.metadata.js.Library}
      */
     public static final class Builder extends
         org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
-          org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library, Builder>
+          org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library, Builder>
         implements
-        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.Library)
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.LibraryOrBuilder {
-      // Construct using org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.newBuilder()
+        // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.metadata.js.Library)
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.LibraryOrBuilder {
+      // Construct using org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -3273,7 +3273,7 @@ public final class JsProtoBuf {
 
       public Builder clear() {
         super.clear();
-        kind_ = org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind.PLAIN;
+        kind_ = org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.Kind.PLAIN;
         bitField0_ = (bitField0_ & ~0x00000001);
         packageFragment_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -3286,20 +3286,20 @@ public final class JsProtoBuf {
         return create().mergeFrom(buildPartial());
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library getDefaultInstanceForType() {
-        return org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.getDefaultInstance();
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library getDefaultInstanceForType() {
+        return org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.getDefaultInstance();
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library build() {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library result = buildPartial();
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library build() {
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
 
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library buildPartial() {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library result = new org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library(this);
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library buildPartial() {
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library result = new org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -3320,8 +3320,8 @@ public final class JsProtoBuf {
         return result;
       }
 
-      public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library other) {
-        if (other == org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.getDefaultInstance()) return this;
+      public Builder mergeFrom(org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library other) {
+        if (other == org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.getDefaultInstance()) return this;
         if (other.hasKind()) {
           setKind(other.getKind());
         }
@@ -3364,11 +3364,11 @@ public final class JsProtoBuf {
           org.jetbrains.kotlin.protobuf.CodedInputStream input,
           org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library parsedMessage = null;
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library parsedMessage = null;
         try {
           parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
         } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
-          parsedMessage = (org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library) e.getUnfinishedMessage();
+          parsedMessage = (org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library) e.getUnfinishedMessage();
           throw e;
         } finally {
           if (parsedMessage != null) {
@@ -3379,23 +3379,23 @@ public final class JsProtoBuf {
       }
       private int bitField0_;
 
-      private org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind kind_ = org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind.PLAIN;
+      private org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.Kind kind_ = org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.Kind.PLAIN;
       /**
-       * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+       * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
        */
       public boolean hasKind() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+       * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
        */
-      public org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind getKind() {
+      public org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.Kind getKind() {
         return kind_;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+       * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
        */
-      public Builder setKind(org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind value) {
+      public Builder setKind(org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.Kind value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -3405,47 +3405,47 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * optional .org.jetbrains.kotlin.serialization.js.Library.Kind kind = 1 [default = PLAIN];
+       * optional .org.jetbrains.kotlin.metadata.js.Library.Kind kind = 1 [default = PLAIN];
        */
       public Builder clearKind() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        kind_ = org.jetbrains.kotlin.serialization.js.JsProtoBuf.Library.Kind.PLAIN;
+        kind_ = org.jetbrains.kotlin.metadata.js.JsProtoBuf.Library.Kind.PLAIN;
         
         return this;
       }
 
-      private java.util.List packageFragment_ =
+      private java.util.List packageFragment_ =
         java.util.Collections.emptyList();
       private void ensurePackageFragmentIsMutable() {
         if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-          packageFragment_ = new java.util.ArrayList(packageFragment_);
+          packageFragment_ = new java.util.ArrayList(packageFragment_);
           bitField0_ |= 0x00000002;
          }
       }
 
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
-      public java.util.List getPackageFragmentList() {
+      public java.util.List getPackageFragmentList() {
         return java.util.Collections.unmodifiableList(packageFragment_);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public int getPackageFragmentCount() {
         return packageFragment_.size();
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
-      public org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment getPackageFragment(int index) {
+      public org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment getPackageFragment(int index) {
         return packageFragment_.get(index);
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder setPackageFragment(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -3455,19 +3455,19 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder setPackageFragment(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment.Builder builderForValue) {
         ensurePackageFragmentIsMutable();
         packageFragment_.set(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
-      public Builder addPackageFragment(org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment value) {
+      public Builder addPackageFragment(org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -3477,10 +3477,10 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder addPackageFragment(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment value) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -3490,30 +3490,30 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder addPackageFragment(
-          org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment.Builder builderForValue) {
+          org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment.Builder builderForValue) {
         ensurePackageFragmentIsMutable();
         packageFragment_.add(builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder addPackageFragment(
-          int index, org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment.Builder builderForValue) {
+          int index, org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment.Builder builderForValue) {
         ensurePackageFragmentIsMutable();
         packageFragment_.add(index, builderForValue.build());
 
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder addAllPackageFragment(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         ensurePackageFragmentIsMutable();
         org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
             values, packageFragment_);
@@ -3521,7 +3521,7 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder clearPackageFragment() {
         packageFragment_ = java.util.Collections.emptyList();
@@ -3530,7 +3530,7 @@ public final class JsProtoBuf {
         return this;
       }
       /**
-       * repeated .org.jetbrains.kotlin.serialization.PackageFragment package_fragment = 2;
+       * repeated .org.jetbrains.kotlin.metadata.PackageFragment package_fragment = 2;
        */
       public Builder removePackageFragment(int index) {
         ensurePackageFragmentIsMutable();
@@ -3632,7 +3632,7 @@ public final class JsProtoBuf {
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.Library)
+      // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.metadata.js.Library)
     }
 
     static {
@@ -3640,19 +3640,19 @@ public final class JsProtoBuf {
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.Library)
+    // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.metadata.js.Library)
   }
 
   public static final int PACKAGE_FQ_NAME_FIELD_NUMBER = 131;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Package { ... }
+   * extend .org.jetbrains.kotlin.metadata.Package { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Package,
+      org.jetbrains.kotlin.metadata.ProtoBuf.Package,
       java.lang.Integer> packageFqName = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Package.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Package.getDefaultInstance(),
         0,
         null,
         null,
@@ -3661,30 +3661,30 @@ public final class JsProtoBuf {
         java.lang.Integer.class);
   public static final int CLASS_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Class { ... }
+   * extend .org.jetbrains.kotlin.metadata.Class { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Class,
-      java.util.List> classAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.Class,
+      java.util.List> classAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Class.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
         false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
   public static final int CLASS_CONTAINING_FILE_ID_FIELD_NUMBER = 135;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Class { ... }
+   * extend .org.jetbrains.kotlin.metadata.Class { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Class,
+      org.jetbrains.kotlin.metadata.ProtoBuf.Class,
       java.lang.Integer> classContainingFileId = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Class.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Class.getDefaultInstance(),
         0,
         null,
         null,
@@ -3693,46 +3693,46 @@ public final class JsProtoBuf {
         java.lang.Integer.class);
   public static final int CONSTRUCTOR_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Constructor { ... }
+   * extend .org.jetbrains.kotlin.metadata.Constructor { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Constructor,
-      java.util.List> constructorAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.Constructor,
+      java.util.List> constructorAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Constructor.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Constructor.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
         false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
   public static final int FUNCTION_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Function { ... }
+   * extend .org.jetbrains.kotlin.metadata.Function { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Function,
-      java.util.List> functionAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.Function,
+      java.util.List> functionAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Function.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Function.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
         false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
   public static final int FUNCTION_CONTAINING_FILE_ID_FIELD_NUMBER = 135;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Function { ... }
+   * extend .org.jetbrains.kotlin.metadata.Function { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Function,
+      org.jetbrains.kotlin.metadata.ProtoBuf.Function,
       java.lang.Integer> functionContainingFileId = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Function.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Function.getDefaultInstance(),
         0,
         null,
         null,
@@ -3741,46 +3741,46 @@ public final class JsProtoBuf {
         java.lang.Integer.class);
   public static final int PROPERTY_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Property { ... }
+   * extend .org.jetbrains.kotlin.metadata.Property { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Property,
-      java.util.List> propertyAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.Property,
+      java.util.List> propertyAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Property.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
         false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
   public static final int COMPILE_TIME_VALUE_FIELD_NUMBER = 131;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Property { ... }
+   * extend .org.jetbrains.kotlin.metadata.Property { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Property,
-      org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value> compileTimeValue = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.Property,
+      org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value> compileTimeValue = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Property.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.getDefaultInstance(),
         null,
         131,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.class);
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.Argument.Value.class);
   public static final int PROPERTY_CONTAINING_FILE_ID_FIELD_NUMBER = 135;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Property { ... }
+   * extend .org.jetbrains.kotlin.metadata.Property { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Property,
+      org.jetbrains.kotlin.metadata.ProtoBuf.Property,
       java.lang.Integer> propertyContainingFileId = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Property.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Property.getDefaultInstance(),
         0,
         null,
         null,
@@ -3789,84 +3789,84 @@ public final class JsProtoBuf {
         java.lang.Integer.class);
   public static final int ENUM_ENTRY_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.EnumEntry { ... }
+   * extend .org.jetbrains.kotlin.metadata.EnumEntry { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry,
-      java.util.List> enumEntryAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry,
+      java.util.List> enumEntryAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.EnumEntry.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.EnumEntry.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
         false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
   public static final int PARAMETER_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.ValueParameter { ... }
+   * extend .org.jetbrains.kotlin.metadata.ValueParameter { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter,
-      java.util.List> parameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter,
+      java.util.List> parameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.ValueParameter.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.ValueParameter.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
         false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
   public static final int TYPE_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.Type { ... }
+   * extend .org.jetbrains.kotlin.metadata.Type { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.Type,
-      java.util.List> typeAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.Type,
+      java.util.List> typeAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.Type.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Type.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
         false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
   public static final int TYPE_PARAMETER_ANNOTATION_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.TypeParameter { ... }
+   * extend .org.jetbrains.kotlin.metadata.TypeParameter { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter,
-      java.util.List> typeParameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter,
+      java.util.List> typeParameterAnnotation = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newRepeatedGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.getDefaultInstance(),
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
         false,
-        org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.class);
+        org.jetbrains.kotlin.metadata.ProtoBuf.Annotation.class);
   public static final int PACKAGE_FRAGMENT_FILES_FIELD_NUMBER = 130;
   /**
-   * extend .org.jetbrains.kotlin.serialization.PackageFragment { ... }
+   * extend .org.jetbrains.kotlin.metadata.PackageFragment { ... }
    */
   public static final
     org.jetbrains.kotlin.protobuf.GeneratedMessageLite.GeneratedExtension<
-      org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment,
-      org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files> packageFragmentFiles = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
+      org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment,
+      org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files> packageFragmentFiles = org.jetbrains.kotlin.protobuf.GeneratedMessageLite
           .newSingularGeneratedExtension(
-        org.jetbrains.kotlin.serialization.ProtoBuf.PackageFragment.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files.getDefaultInstance(),
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.ProtoBuf.PackageFragment.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files.getDefaultInstance(),
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files.getDefaultInstance(),
         null,
         130,
         org.jetbrains.kotlin.protobuf.WireFormat.FieldType.MESSAGE,
-        org.jetbrains.kotlin.serialization.js.JsProtoBuf.Files.class);
+        org.jetbrains.kotlin.metadata.js.JsProtoBuf.Files.class);
 
   static {
   }
diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/DynamicTypeDeserializer.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/DynamicTypeDeserializer.kt
index 47d54263f5b..629abbded10 100644
--- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/DynamicTypeDeserializer.kt
+++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/DynamicTypeDeserializer.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.serialization.js
 
-import org.jetbrains.kotlin.serialization.ProtoBuf
+import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeDeserializer
 import org.jetbrains.kotlin.types.ErrorUtils
 import org.jetbrains.kotlin.types.KotlinType
diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt
index de563aec59c..820cb020c78 100644
--- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt
+++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptPackageFragment.kt
@@ -21,10 +21,11 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.descriptors.SourceFile
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.js.JsProtoBuf
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.DescriptorUtils
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.*
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedContainerSource
 import org.jetbrains.kotlin.storage.StorageManager
diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
index 0b969698d5d..82843ce8b24 100644
--- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
+++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt
@@ -22,6 +22,8 @@ import org.jetbrains.kotlin.config.isPreRelease
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.js.JsProtoBuf
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.protobuf.CodedInputStream
 import org.jetbrains.kotlin.resolve.BindingContext
@@ -30,7 +32,6 @@ import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.serialization.AnnotationSerializer
 import org.jetbrains.kotlin.serialization.DescriptorSerializer
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.StringTableImpl
 import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor
diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerExtension.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerExtension.kt
index 452282931d9..42f0989c132 100644
--- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerExtension.kt
+++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerExtension.kt
@@ -17,6 +17,8 @@
 package org.jetbrains.kotlin.serialization.js
 
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.js.JsProtoBuf
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite
@@ -24,7 +26,6 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.source.PsiSourceFile
 import org.jetbrains.kotlin.serialization.KotlinSerializerExtensionBase
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.SerializerExtensionProtocol
 import org.jetbrains.kotlin.types.FlexibleType
 
diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/kotlinJavascriptPackageFragmentProvider.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/kotlinJavascriptPackageFragmentProvider.kt
index 85514ef33ca..85db7f92bd9 100644
--- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/kotlinJavascriptPackageFragmentProvider.kt
+++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/kotlinJavascriptPackageFragmentProvider.kt
@@ -21,9 +21,10 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.deserialization.PlatformDependentDeclarationFilter
 import org.jetbrains.kotlin.descriptors.impl.EmptyPackageFragmentDescriptor
 import org.jetbrains.kotlin.incremental.components.LookupTracker
+import org.jetbrains.kotlin.metadata.ProtoBuf
+import org.jetbrains.kotlin.metadata.js.JsProtoBuf
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.parentOrNull
-import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.*
 import org.jetbrains.kotlin.storage.StorageManager
 
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
index 5c87a06162e..459a15fd390 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
@@ -58,10 +58,10 @@ import org.jetbrains.kotlin.js.sourceMap.SourceFilePathResolver
 import org.jetbrains.kotlin.js.sourceMap.SourceMap3Builder
 import org.jetbrains.kotlin.js.test.utils.*
 import org.jetbrains.kotlin.js.util.TextOutputImpl
+import org.jetbrains.kotlin.metadata.DebugProtoBuf
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.KtPsiFactory
-import org.jetbrains.kotlin.serialization.DebugProtoBuf
 import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol
 import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil
 import org.jetbrains.kotlin.serialization.js.ModuleKind
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java
index 93e41e67651..cc06701ef92 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java
@@ -41,11 +41,11 @@ import org.jetbrains.kotlin.js.sourceMap.SourceFilePathResolver;
 import org.jetbrains.kotlin.js.translate.general.AstGenerationResult;
 import org.jetbrains.kotlin.js.translate.general.Translation;
 import org.jetbrains.kotlin.js.translate.utils.ExpandIsCallsKt;
+import org.jetbrains.kotlin.metadata.ProtoBuf;
 import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus;
 import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.resolve.BindingTrace;
 import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics;
-import org.jetbrains.kotlin.serialization.ProtoBuf;
 import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil;
 import org.jetbrains.kotlin.serialization.js.ast.JsAstSerializer;