diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/build.gradle b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/build.gradle
similarity index 83%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/build.gradle
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/build.gradle
index 2f489b8cea8..81bd69c22cd 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/build.gradle
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/build.gradle
@@ -13,6 +13,7 @@ buildscript {
 apply plugin: 'java'
 apply plugin: 'kotlin'
 apply plugin: 'idea'
+
 repositories {
     mavenCentral()
 }
@@ -22,12 +23,11 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     // https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java
     compile group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0'
+    compile "org.jetbrains.kotlin:kotlin-js-library:$kotlin_version"
     compile files ('../../../../../../../build/protokot-runtime.jar')
-    // https://mvnrepository.com/artifact/org.apache.commons/commons-io
-//    compile group: 'org.apache.commons', name: 'commons-io', version: '1.3.2'
-
 
 }
+
 sourceSets {
     main.java.srcDirs += 'src'
 }
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/gradle/wrapper/gradle-wrapper.jar b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/gradle/wrapper/gradle-wrapper.jar
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/gradle/wrapper/gradle-wrapper.jar
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/gradle/wrapper/gradle-wrapper.properties b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/gradle/wrapper/gradle-wrapper.properties
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/gradle/wrapper/gradle-wrapper.properties
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/gradlew b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/gradlew
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/gradlew
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/gradlew
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/gradlew.bat b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/gradlew.bat
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/gradlew.bat
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/gradlew.bat
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/protoc-test-project.iml b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/protoc-test-project.iml
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/protoc-test-project.iml
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/protoc-test-project.iml
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/protoc-test-project.ipr b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/protoc-test-project.ipr
similarity index 94%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/protoc-test-project.ipr
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/protoc-test-project.ipr
index 4136be8637e..d138d9b25a3 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/protoc-test-project.ipr
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/protoc-test-project.ipr
@@ -175,6 +175,15 @@
         <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.protobuf/protobuf-java/3.0.0/ec34cadf001ccb864192e0441800f0b3bbf7ffcf/protobuf-java-3.0.0-sources.jar!/" />
       </SOURCES>
     </library>
+    <library name="Gradle: org.jetbrains.kotlin:kotlin-js-library:1.0.3">
+      <CLASSES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-js-library/1.0.3/75ef9c9aec2494050ad97183a99bf7009f49dbf0/kotlin-js-library-1.0.3.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES>
+        <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-js-library/1.0.3/4aabfa50f76458d6cc844bd68dc3d3dda7aca972/kotlin-js-library-1.0.3-sources.jar!/" />
+      </SOURCES>
+    </library>
     <library name="Gradle: org.jetbrains.kotlin:kotlin-runtime:1.0.3">
       <CLASSES>
         <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-runtime/1.0.3/10f40d016700cf4287e49fa1d51c2a8507e9b946/kotlin-runtime-1.0.3.jar!/" />
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/protoc-test-project.iws b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/protoc-test-project.iws
similarity index 92%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/protoc-test-project.iws
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/protoc-test-project.iws
index 3613dbdb2f7..2ea0a46fed9 100644
--- a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/protoc-test-project.iws
+++ b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/protoc-test-project.iws
@@ -80,21 +80,75 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="600">
-      <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
+      <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/build.gradle">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="756">
-              <caret line="21" column="64" selection-start-line="20" selection-start-column="5" selection-end-line="21" selection-end-column="64" />
+            <state relative-caret-position="852">
+              <caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="base.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/js_msg/base.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="BaseExtendedTest.kt" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/kt_js_tests/BaseExtendedTest.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="108">
+              <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Util.kt" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/kt_js_tests/Util.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="288">
+              <caret line="8" column="8" selection-start-line="8" selection-start-column="8" selection-end-line="8" selection-end-column="8" />
+              <folding>
+                <element signature="e#21#78#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="gradlew" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gradlew">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Util.kt" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/kt_java_tests/Util.kt">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="720">
+              <caret line="20" column="25" selection-start-line="0" selection-start-column="0" selection-end-line="56" selection-end-column="1" />
+              <folding>
+                <element signature="e#23#107#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="BaseExtendedTest.kt" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/kt_java_tests/BaseExtendedTest.kt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="72">
-              <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+            <state relative-caret-position="360">
+              <caret line="10" column="7" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
               <folding>
                 <element signature="e#23#171#0" expanded="true" />
               </folding>
@@ -102,16 +156,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="base_message.kt" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/kotlin/base_message.kt">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -185,6 +229,10 @@
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
                 <option name="name" value="javadoc" />
               </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="cleanTestSourceMap" />
+              </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="description" value="Assembles a jar archive containing the main classes." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
@@ -205,6 +253,11 @@
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
                 <option name="name" value="tasks" />
               </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Compiles the kotlin sources in source set 'main' to JavaScript." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="compileKotlin2Js" />
+              </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="description" value="Initializes a new Gradle build. [incubating]" />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
@@ -280,6 +333,15 @@
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
                 <option name="name" value="buildNeeded" />
               </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="cleanSourceMap" />
+              </ExternalTaskPojo>
+              <ExternalTaskPojo>
+                <option name="description" value="Compiles the kotlin sources in source set 'test' to JavaScript." />
+                <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
+                <option name="name" value="compileTestKotlin2Js" />
+              </ExternalTaskPojo>
               <ExternalTaskPojo>
                 <option name="description" value="Displays the properties of root project 'protoc-test-project'." />
                 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
@@ -292,7 +354,7 @@
     </option>
     <option name="modificationStamps">
       <map>
-        <entry key="$PROJECT_DIR$" value="1471250913610" />
+        <entry key="$PROJECT_DIR$" value="1471256258013" />
       </map>
     </option>
     <option name="projectBuildClasspath">
@@ -354,8 +416,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/java/Direction.java" />
-        <option value="$PROJECT_DIR$/src/java/CrossBranchOuterClass.java" />
         <option value="$PROJECT_DIR$/src/java/Connect.java" />
         <option value="$PROJECT_DIR$/src/java/BaseMessage.java" />
         <option value="$PROJECT_DIR$/src/tests/CrossBranch.kt" />
@@ -402,9 +462,11 @@
         <option value="$PROJECT_DIR$/src/kt_java_tests/CrossBranchTest.kt" />
         <option value="$PROJECT_DIR$/src/kt_java_tests/ConnectTest.kt" />
         <option value="$PROJECT_DIR$/src/kt_java_tests/Util.kt" />
-        <option value="$PROJECT_DIR$/build.gradle" />
         <option value="$PROJECT_DIR$/src/kt_java_tests/BaseExtendedTest.kt" />
         <option value="$PROJECT_DIR$/src/kotlin/base_message.kt" />
+        <option value="$PROJECT_DIR$/src/kt_js_tests/Util.kt" />
+        <option value="$PROJECT_DIR$/src/kt_js_tests/BaseExtendedTest.kt" />
+        <option value="$PROJECT_DIR$/build.gradle" />
       </list>
     </option>
   </component>
@@ -523,24 +585,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="protoc-test-project" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="protoc-test-project" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider$GradleSourceSetDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="kotlin" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -1016,12 +1060,12 @@
       <workItem from="1470904528165" duration="51301000" />
       <workItem from="1471248559073" duration="28000" />
       <workItem from="1471248659432" duration="1881000" />
-      <workItem from="1471250698982" duration="2717000" />
+      <workItem from="1471250698982" duration="5865000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="4630000" />
+    <option name="totallyTimeSpent" value="7778000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="3840" y="-2112" width="3840" height="2112" extended-state="6" />
@@ -1029,13 +1073,13 @@
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -1111,15 +1155,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.0.3/efeac5a1b15300f742d2119667f90df44230b94a/kotlin-stdlib-1.0.3-sources.jar!/kotlin/util/AssertionsJVM.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/java_msg/ExtendedMessage.java" />
-    <entry file="file://$PROJECT_DIR$/src/kotlin/rc_session.kt" />
     <entry file="jar://$PROJECT_DIR$/../../../../../../../../build/protokot-runtime.jar!/main/kotlin/CodedOutputStream.class" />
     <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.protobuf/protobuf-java/3.0.0/ec34cadf001ccb864192e0441800f0b3bbf7ffcf/protobuf-java-3.0.0-sources.jar!/com/google/protobuf/CodedOutputStream.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -1181,14 +1216,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gradlew">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$PROJECT_DIR$/../../../../../../../build/protokot-runtime.jar!/CodedInputStream.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="108">
@@ -1389,36 +1416,72 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/kt_java_tests/Util.kt">
+    <entry file="file://$PROJECT_DIR$/src/kotlin/base_message.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/build.gradle">
+    <entry file="file://$PROJECT_DIR$/src/js_msg/base.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="756">
-          <caret line="21" column="64" selection-start-line="20" selection-start-column="5" selection-end-line="21" selection-end-column="64" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/kt_java_tests/Util.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="720">
+          <caret line="20" column="25" selection-start-line="0" selection-start-column="0" selection-end-line="56" selection-end-column="1" />
+          <folding>
+            <element signature="e#23#107#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/kt_js_tests/Util.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="288">
+          <caret line="8" column="8" selection-start-line="8" selection-start-column="8" selection-end-line="8" selection-end-column="8" />
+          <folding>
+            <element signature="e#21#78#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gradlew">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/kt_js_tests/BaseExtendedTest.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="108">
+          <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/kt_java_tests/BaseExtendedTest.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+        <state relative-caret-position="360">
+          <caret line="10" column="7" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
           <folding>
             <element signature="e#23#171#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/kotlin/base_message.kt">
+    <entry file="file://$PROJECT_DIR$/build.gradle">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="852">
+          <caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/BaseExtendedTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/BaseExtendedTest.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/BaseExtendedTest.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/BaseExtendedTest.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ConnectTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/ConnectTest.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ConnectTest.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/ConnectTest.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/CrossBranchTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/CrossBranchTest.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/CrossBranchTest.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/CrossBranchTest.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/DirectionTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/DirectionTest.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/DirectionTest.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/DirectionTest.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Location.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/Location.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Location.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/Location.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/MultipleMessagesTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/MultipleMessagesTest.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/MultipleMessagesTest.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/MultipleMessagesTest.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RandomGen.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/RandomGen.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RandomGen.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/RandomGen.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedVarintsTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/RepeatedVarintsTest.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedVarintsTest.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/RepeatedVarintsTest.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedZigZag.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/RepeatedZigZag.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/RepeatedZigZag.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/RepeatedZigZag.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/TagOrderTests.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/TagOrderTests.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/TagOrderTests.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/TagOrderTests.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Util.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/Util.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/Util.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/Util.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/VarintsTest.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/VarintsTest.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/VarintsTest.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/VarintsTest.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ZigZagTests.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/ZigZagTests.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/ZigZagTests.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/ZigZagTests.kt
diff --git a/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/main.kt b/proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/main.kt
similarity index 100%
rename from proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-test-project/src/kt_java_tests/main.kt
rename to proto/compiler/google/src/google/protobuf/compiler/kotlin/protoc-tests/kt_java_tests/src/kt_java_tests/main.kt