diff --git a/.idea/runConfigurations/Ktor____Async__Jetty_.xml b/.idea/runConfigurations/Ktor____Async__Jetty_.xml
index c2fd4aeb23f..637244f7def 100644
--- a/.idea/runConfigurations/Ktor____Async__Jetty_.xml
+++ b/.idea/runConfigurations/Ktor____Async__Jetty_.xml
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktor :: Async (Jetty)" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="Ktor :: Async (Jetty)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-samples/ktor-samples-async" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=jetty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.ktor.jetty.DevelopmentHost" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="ktor-samples-async" />
-    <envs />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____Async__Netty_.xml b/.idea/runConfigurations/Ktor____Async__Netty_.xml
index 99fceba55ab..2676d7e4b92 100644
--- a/.idea/runConfigurations/Ktor____Async__Netty_.xml
+++ b/.idea/runConfigurations/Ktor____Async__Netty_.xml
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktor :: Async (Netty)" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="Ktor :: Async (Netty)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-samples/ktor-samples-async" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=netty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.ktor.netty.DevelopmentHost" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="ktor-samples-async" />
-    <envs />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____Chat__Jetty_.xml b/.idea/runConfigurations/Ktor____Chat__Jetty_.xml
index 4a5b8e0cd33..666057d5ef5 100644
--- a/.idea/runConfigurations/Ktor____Chat__Jetty_.xml
+++ b/.idea/runConfigurations/Ktor____Chat__Jetty_.xml
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktor :: Chat (Jetty)" type="Application" factoryName="Application">
+  <configuration default="false" name="Ktor :: Chat (Jetty)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-samples/ktor-samples-websocket" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=jetty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.ktor.jetty.DevelopmentHost" />
-    <option name="VM_PARAMETERS" value="-ea " />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="ktor-samples-websocket" />
-    <envs />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____Chat__Netty_.xml b/.idea/runConfigurations/Ktor____Chat__Netty_.xml
new file mode 100644
index 00000000000..f1a6ec0990c
--- /dev/null
+++ b/.idea/runConfigurations/Ktor____Chat__Netty_.xml
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Ktor :: Chat (Netty)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-samples/ktor-samples-websocket" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=netty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____Chat__Netty__.xml b/.idea/runConfigurations/Ktor____Chat__Netty__.xml
deleted file mode 100644
index 2c1833004a1..00000000000
--- a/.idea/runConfigurations/Ktor____Chat__Netty__.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktor :: Chat (Netty) " type="Application" factoryName="Application" singleton="true">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.ktor.netty.DevelopmentHost" />
-    <option name="VM_PARAMETERS" value="-ea " />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="ktor-samples-websocket" />
-    <envs />
-    <method />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____Hello__Jetty_.xml b/.idea/runConfigurations/Ktor____Hello__Jetty_.xml
index 6cef12d9b7f..c286972b8b1 100644
--- a/.idea/runConfigurations/Ktor____Hello__Jetty_.xml
+++ b/.idea/runConfigurations/Ktor____Hello__Jetty_.xml
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktor :: Hello (Jetty)" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="Ktor :: Hello (Jetty)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-samples/ktor-samples-hello" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=jetty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.ktor.jetty.DevelopmentHost" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="ktor-samples-hello_main" />
-    <envs />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____Hello__Netty_.xml b/.idea/runConfigurations/Ktor____Hello__Netty_.xml
index 70d566577d4..0363f1e8467 100644
--- a/.idea/runConfigurations/Ktor____Hello__Netty_.xml
+++ b/.idea/runConfigurations/Ktor____Hello__Netty_.xml
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktor :: Hello (Netty)" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="Ktor :: Hello (Netty)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-samples/ktor-samples-hello" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=netty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.ktor.netty.DevelopmentHost" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="ktor-samples-hello" />
-    <envs />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____HttpBin__Jetty_.xml b/.idea/runConfigurations/Ktor____HttpBin__Jetty_.xml
new file mode 100644
index 00000000000..8b8883c432c
--- /dev/null
+++ b/.idea/runConfigurations/Ktor____HttpBin__Jetty_.xml
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Ktor :: HttpBin (Jetty)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-samples/ktor-samples-httpbin" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=jetty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____HttpBin__Netty_.xml b/.idea/runConfigurations/Ktor____HttpBin__Netty_.xml
new file mode 100644
index 00000000000..0534f19ef24
--- /dev/null
+++ b/.idea/runConfigurations/Ktor____HttpBin__Netty_.xml
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Ktor :: HttpBin (Netty)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-samples/ktor-samples-httpbin" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=netty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____Json__Jetty_.xml b/.idea/runConfigurations/Ktor____Json__Jetty_.xml
index 594733c1e13..9a0102a3de6 100644
--- a/.idea/runConfigurations/Ktor____Json__Jetty_.xml
+++ b/.idea/runConfigurations/Ktor____Json__Jetty_.xml
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktor :: Json (Jetty)" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="Ktor :: Json (Jetty)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-samples/ktor-samples-json" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=jetty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.ktor.jetty.DevelopmentHost" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="ktor-samples-json" />
-    <envs />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____Json__Netty_.xml b/.idea/runConfigurations/Ktor____Json__Netty_.xml
index 00907f64b02..646a1317287 100644
--- a/.idea/runConfigurations/Ktor____Json__Netty_.xml
+++ b/.idea/runConfigurations/Ktor____Json__Netty_.xml
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktor :: Json (Netty)" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="Ktor :: Json (Netty)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-samples/ktor-samples-json" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=netty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.ktor.netty.DevelopmentHost" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="ktor-samples-json" />
-    <envs />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____Kweet.xml b/.idea/runConfigurations/Ktor____Kweet.xml
index 6a39c4c3fff..20883d43f15 100644
--- a/.idea/runConfigurations/Ktor____Kweet.xml
+++ b/.idea/runConfigurations/Ktor____Kweet.xml
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktor :: Kweet" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="Ktor :: Kweet" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-samples/kweet" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=jetty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.ktor.netty.DevelopmentHost" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="kweet" />
-    <envs />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____Locations__Jetty_.xml b/.idea/runConfigurations/Ktor____Locations__Jetty_.xml
index 8f1aec7b6c4..569fd400f39 100644
--- a/.idea/runConfigurations/Ktor____Locations__Jetty_.xml
+++ b/.idea/runConfigurations/Ktor____Locations__Jetty_.xml
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktor :: Locations (Jetty)" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="Ktor :: Locations (Jetty)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-features/ktor-locations" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=jetty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.ktor.jetty.DevelopmentHost" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="ktor-samples-locations" />
-    <envs />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____Locations__Netty_.xml b/.idea/runConfigurations/Ktor____Locations__Netty_.xml
index 9dd3a4787cd..2677b1736e8 100644
--- a/.idea/runConfigurations/Ktor____Locations__Netty_.xml
+++ b/.idea/runConfigurations/Ktor____Locations__Netty_.xml
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktor :: Locations (Netty)" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="Ktor :: Locations (Netty)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-features/ktor-locations" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=netty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.ktor.netty.DevelopmentHost" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="ktor-samples-locations" />
-    <envs />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____Post__Jetty_.xml b/.idea/runConfigurations/Ktor____Post__Jetty_.xml
index 678cc8cc0fe..9d46b1cce54 100644
--- a/.idea/runConfigurations/Ktor____Post__Jetty_.xml
+++ b/.idea/runConfigurations/Ktor____Post__Jetty_.xml
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktor :: Post (Jetty)" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="Ktor :: Post (Jetty)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-samples/ktor-samples-post" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=jetty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.ktor.jetty.DevelopmentHost" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="ktor-samples-post" />
-    <envs />
     <method />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____Post__Netty_.xml b/.idea/runConfigurations/Ktor____Post__Netty_.xml
new file mode 100644
index 00000000000..4f5bca37170
--- /dev/null
+++ b/.idea/runConfigurations/Ktor____Post__Netty_.xml
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Ktor :: Post (Netty)" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-samples/ktor-samples-post" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=netty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+    <method />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ktor____YouKube.xml b/.idea/runConfigurations/Ktor____YouKube.xml
index 60dd024dbe8..92a5adb8476 100644
--- a/.idea/runConfigurations/Ktor____YouKube.xml
+++ b/.idea/runConfigurations/Ktor____YouKube.xml
@@ -1,17 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Ktor :: YouKube" type="Application" factoryName="Application" singleton="true">
+  <configuration default="false" name="Ktor :: YouKube" type="GradleRunConfiguration" factoryName="Gradle" folderName="Samples" singleton="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/ktor-samples/you-kube" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="-PhostServer=jetty" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="io.ktor.netty.DevelopmentHost" />
-    <option name="VM_PARAMETERS" value="-ea" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="you-kube" />
-    <envs />
     <method />
   </configuration>
 </component>
\ No newline at end of file