diff --git a/README.md b/README.md
index f7e4bb8..cbc1cbe 100644
--- a/README.md
+++ b/README.md
@@ -14,16 +14,22 @@ Structure of the stack is following
 ├── bin
 │   └── knotx                     // shell script used to resolve and run knotx instance
 ├── conf                          // contains application and logger configuration files
-│   ├── application.conf          // defines all modules that Knot.x instance is running, provides configuration for Knot.x Core and global variables for other config files
+│   ├── application.conf          // defines / includes all modules that Knot.x instance is running
 │   ├── bootstrap.json            // config retriever options, defines application configuration stores (e.g. points to `application.conf` - the main configuration)
 │   ├── default-cluster.xml       // basic configuration of Knot.x instance cluster
-│   ├── includes                  // additional modules configuration which are included in `application.conf`
-│   │   ├── actionKnot.conf
-│   │   ├── hbsKnot.conf
-│   │   ├── httpRepo.conf
-│   │   ├── server.conf
-│   │   ├── serviceAdapter.conf
-│   │   └── serviceKnot.conf
+│   ├── openapi.yaml              // Open API 3.0 configuration that is loaded via Knot.x HTTP Server
+│   ├── server.conf               // Knot.x HTTP server configuration which is included in `application.conf`
+│   ├── routes                    // server routes configurations 
+│   │   ├── operation-get.conf
+│   │   └── handlers              // handlers used in API operations definitions
+|   │   │   ├── knotEngineHandler.conf
+|   │   │   └── httpRepoConnectorHandler.conf
+│   ├── knots                     // Knot modules configurations which are included in `application.conf`
+│   │   ├── dataBridgeStack.conf
+│   │   ├── dataBridgeKnot.conf
+│   │   ├── dataBridgeSourceHttp.conf
+│   │   ├── templateEngineStack.conf
+│   │   └── templateEngineKnot.conf
 │   └── logback.xml          // logger configuration
 ├── knotx-stack.json         // stack descriptor, defines instance libraries and dependencies
 ├── lib                      // contains instance libraries and dependencies, instance classpath
diff --git a/knotx-it-tests/pom.xml b/knotx-it-tests/pom.xml
index ada9ac8..4ff36a0 100644
--- a/knotx-it-tests/pom.xml
+++ b/knotx-it-tests/pom.xml
@@ -29,35 +29,48 @@
   <name>Knot.x - Integration Tests</name>
 
   <dependencies>
-    <!-- Knot.x core -->
+    <!-- Knot.x Launcher -->
     <dependency>
       <groupId>io.knotx</groupId>
-      <artifactId>knotx-core</artifactId>
+      <artifactId>knotx-launcher</artifactId>
     </dependency>
+    <!-- Knot.x Server -->
     <dependency>
       <groupId>io.knotx</groupId>
-      <artifactId>knotx-databridge-api</artifactId>
+      <artifactId>knotx-server-http-core</artifactId>
     </dependency>
     <dependency>
       <groupId>io.knotx</groupId>
-      <artifactId>knotx-databridge-core</artifactId>
+      <artifactId>knotx-splitter-html</artifactId>
     </dependency>
     <dependency>
       <groupId>io.knotx</groupId>
-      <artifactId>knotx-databridge-adapter-http</artifactId>
+      <artifactId>knotx-assembler</artifactId>
+    </dependency>
+    <!-- Knot.x Repositories -->
+    <dependency>
+      <groupId>io.knotx</groupId>
+      <artifactId>knotx-repository-connector-http</artifactId>
     </dependency>
     <dependency>
       <groupId>io.knotx</groupId>
-      <artifactId>knotx-forms-api</artifactId>
+      <artifactId>knotx-repository-connector-fs</artifactId>
     </dependency>
+    <!-- Knot.x Knot Engine -->
     <dependency>
       <groupId>io.knotx</groupId>
-      <artifactId>knotx-forms-core</artifactId>
+      <artifactId>knotx-knot-engine-handler</artifactId>
     </dependency>
+    <!-- Knot.x Data Bridge -->
     <dependency>
       <groupId>io.knotx</groupId>
-      <artifactId>knotx-template-engine-api</artifactId>
+      <artifactId>knotx-databridge-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.knotx</groupId>
+      <artifactId>knotx-databridge-adapter-http</artifactId>
+    </dependency>
+    <!-- Knot.x Template Engine -->
     <dependency>
       <groupId>io.knotx</groupId>
       <artifactId>knotx-template-engine-core</artifactId>
@@ -66,6 +79,8 @@
       <groupId>io.knotx</groupId>
       <artifactId>knotx-template-engine-handlebars</artifactId>
     </dependency>
+
+    <!-- Vert.x -->
     <dependency>
       <groupId>io.vertx</groupId>
       <artifactId>vertx-core</artifactId>
@@ -122,12 +137,6 @@
       <artifactId>vertx-config</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.knotx</groupId>
-      <artifactId>knotx-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
@@ -144,6 +153,11 @@
         <configuration>
           <source>8</source>
           <target>8</target>
+          <compilerArgs>
+            <arg>-verbose</arg>
+            <arg>-Xlint:all</arg>
+            <arg>-parameters</arg>
+          </compilerArgs>
         </configuration>
       </plugin>
     </plugins>
diff --git a/knotx-it-tests/src/test/java/io/knotx/stack/it/KnotxServerTester.java b/knotx-it-tests/src/test/java/io/knotx/stack/it/KnotxServerTester.java
index a8a1786..99e2b24 100644
--- a/knotx-it-tests/src/test/java/io/knotx/stack/it/KnotxServerTester.java
+++ b/knotx-it-tests/src/test/java/io/knotx/stack/it/KnotxServerTester.java
@@ -29,9 +29,12 @@ final class KnotxServerTester {
     this.serverPort = serverPort;
   }
 
-  static KnotxServerTester defatultInstance() {
-    return new KnotxServerTester(KNOTX_TESTS_SERVER_ADDRESS_DEFAULT,
-        KNOTX_TESTS_SERVER_PORT_DEFAULT);
+  static KnotxServerTester defaultInstance() {
+    return defaultInstance(KNOTX_TESTS_SERVER_PORT_DEFAULT);
+  }
+
+  static KnotxServerTester defaultInstance(int port) {
+    return new KnotxServerTester(KNOTX_TESTS_SERVER_ADDRESS_DEFAULT, port);
   }
 
   void testPostRequest(VertxTestContext context, Vertx vertx, String url,
diff --git a/knotx-it-tests/src/test/java/io/knotx/stack/it/SampleApplicationFallbackSupportIntegrationTest.java b/knotx-it-tests/src/test/java/io/knotx/stack/it/SampleApplicationFallbackSupportIntegrationTest.java
index afecc65..2466b35 100644
--- a/knotx-it-tests/src/test/java/io/knotx/stack/it/SampleApplicationFallbackSupportIntegrationTest.java
+++ b/knotx-it-tests/src/test/java/io/knotx/stack/it/SampleApplicationFallbackSupportIntegrationTest.java
@@ -8,7 +8,7 @@
 import com.github.tomakehurst.wiremock.WireMockServer;
 import io.knotx.junit5.KnotxApplyConfiguration;
 import io.knotx.junit5.KnotxExtension;
-import io.knotx.junit5.wiremock.KnotxWiremock;
+import io.knotx.junit5.wiremock.ClasspathResourcesMockServer;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.vertx.junit5.VertxTestContext;
 import io.vertx.reactivex.core.Vertx;
@@ -19,14 +19,15 @@
 import org.junit.jupiter.api.TestInstance.Lifecycle;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+@Disabled("Fallbacks need to be reimplemented.")
 @ExtendWith(KnotxExtension.class)
 @TestInstance(Lifecycle.PER_CLASS)
-public class SampleApplicationFallbackSupportIntegrationTest {
+class SampleApplicationFallbackSupportIntegrationTest {
 
-  @KnotxWiremock
+  @ClasspathResourcesMockServer
   private WireMockServer mockService;
 
-  @KnotxWiremock
+  @ClasspathResourcesMockServer
   private WireMockServer mockRepository;
 
   private KnotxServerTester knotxServerTester;
@@ -51,12 +52,12 @@ void initMocks() {
                     .withHeader("X-Server", "Knot.x")
             ));
 
-    knotxServerTester = KnotxServerTester.defatultInstance();
+    knotxServerTester = KnotxServerTester.defaultInstance();
   }
 
   @Test
-  @KnotxApplyConfiguration("conf/integrationTestsStack.conf")
-  public void requestPageWhenFormsProcessingFails_expectServerError(
+  @KnotxApplyConfiguration("conf/application.conf")
+  void requestPageWhenFormsProcessingFails_expectServerError(
       VertxTestContext context, Vertx vertx) {
     knotxServerTester
         .testGetServerError(context, vertx, "/content/local/notExistingFormsAdapter.html",
@@ -64,9 +65,9 @@ public void requestPageWhenFormsProcessingFails_expectServerError(
   }
 
   @Test
-  @KnotxApplyConfiguration("conf/integrationTestsStack.conf")
+  @KnotxApplyConfiguration("conf/application.conf")
   @Disabled("Bug in forms - when using undefined data adapter fallback is not applied")
-  public void requestPageWhenFormsProcessingFailsAndFallbackDefined(
+  void requestPageWhenFormsProcessingFailsAndFallbackDefined(
       VertxTestContext context, Vertx vertx) {
     knotxServerTester
         .testGetRequest(context, vertx, "/content/local/notExistingFormsAdapterWithFallback.html",
@@ -74,10 +75,10 @@ public void requestPageWhenFormsProcessingFailsAndFallbackDefined(
   }
 
   @Test
-  @KnotxApplyConfiguration({"conf/integrationTestsStack.conf",
-      "conf/overrides/defaultFallback.conf"})
+  @KnotxApplyConfiguration({"conf/application.conf",
+      "conf/overrides/defaultFallback.conf" })
   @Disabled("Bug in forms - when using undefined data adapter fallback is not applied")
-  public void requestPageWhenFormsProcessingFailsAndGlobalFallbackDefined(
+  void requestPageWhenFormsProcessingFailsAndGlobalFallbackDefined(
       VertxTestContext context, Vertx vertx) {
     knotxServerTester
         .testGetRequest(context, vertx, "/content/local/notExistingFormsAdapter.html",
@@ -85,8 +86,8 @@ public void requestPageWhenFormsProcessingFailsAndGlobalFallbackDefined(
   }
 
   @Test
-  @KnotxApplyConfiguration("conf/integrationTestsStack.conf")
-  public void requestPageWhenDatabridgeProcessingFails_expectServerError(
+  @KnotxApplyConfiguration("conf/application.conf")
+  void requestPageWhenDatabridgeProcessingFails_expectServerError(
       VertxTestContext context, Vertx vertx) {
     knotxServerTester
         .testGetServerError(context, vertx, "/content/local/notExistingDataDefinition.html",
@@ -94,8 +95,8 @@ public void requestPageWhenDatabridgeProcessingFails_expectServerError(
   }
 
   @Test
-  @KnotxApplyConfiguration("conf/integrationTestsStack.conf")
-  public void requestPageWhenDatabridgeProcessingFailsAndFallbackDefined(
+  @KnotxApplyConfiguration("conf/application.conf")
+  void requestPageWhenDatabridgeProcessingFailsAndFallbackDefined(
       VertxTestContext context, Vertx vertx) {
     knotxServerTester
         .testGetRequest(context, vertx, "/content/local/notExistingDataDefinitionWithFallback.html",
@@ -103,9 +104,9 @@ public void requestPageWhenDatabridgeProcessingFailsAndFallbackDefined(
   }
 
   @Test
-  @KnotxApplyConfiguration({"conf/integrationTestsStack.conf",
-      "conf/overrides/defaultFallback.conf"})
-  public void requestPageWhenDatabridgeProcessingFailsAndGlobalFallbackDefined(
+  @KnotxApplyConfiguration({"conf/application.conf",
+      "conf/overrides/defaultFallback.conf" })
+  void requestPageWhenDatabridgeProcessingFailsAndGlobalFallbackDefined(
       VertxTestContext context, Vertx vertx) {
     knotxServerTester
         .testGetRequest(context, vertx, "/content/local/notExistingDataDefinition.html",
@@ -113,8 +114,8 @@ public void requestPageWhenDatabridgeProcessingFailsAndGlobalFallbackDefined(
   }
 
   @Test
-  @KnotxApplyConfiguration("conf/integrationTestsStack.conf")
-  public void requestPageWhenTemplateEngineProcessingFails_expectServerError(
+  @KnotxApplyConfiguration("conf/application.conf")
+  void requestPageWhenTemplateEngineProcessingFails_expectServerError(
       VertxTestContext context, Vertx vertx) {
     knotxServerTester
         .testGetServerError(context, vertx, "/content/local/notExistingTemplateEngine.html",
@@ -122,8 +123,8 @@ public void requestPageWhenTemplateEngineProcessingFails_expectServerError(
   }
 
   @Test
-  @KnotxApplyConfiguration("conf/integrationTestsStack.conf")
-  public void requestPageWhenTemplateEngineProcessingFailsAndFallbackDefined(
+  @KnotxApplyConfiguration("conf/application.conf")
+  void requestPageWhenTemplateEngineProcessingFailsAndFallbackDefined(
       VertxTestContext context, Vertx vertx) {
     knotxServerTester
         .testGetRequest(context, vertx, "/content/local/notExistingTemplateEngineWithFallback.html",
@@ -131,9 +132,9 @@ public void requestPageWhenTemplateEngineProcessingFailsAndFallbackDefined(
   }
 
   @Test
-  @KnotxApplyConfiguration({"conf/integrationTestsStack.conf",
-      "conf/overrides/defaultFallback.conf"})
-  public void requestPageWhenTemplateEngineProcessingFailsAndGlobalFallbackDefined(
+  @KnotxApplyConfiguration({"conf/application.conf",
+      "conf/overrides/defaultFallback.conf" })
+  void requestPageWhenTemplateEngineProcessingFailsAndGlobalFallbackDefined(
       VertxTestContext context, Vertx vertx) {
     knotxServerTester
         .testGetRequest(context, vertx, "/content/local/notExistingTemplateEngine.html",
diff --git a/knotx-it-tests/src/test/java/io/knotx/stack/it/SampleApplicationHeadersIntegrationTest.java b/knotx-it-tests/src/test/java/io/knotx/stack/it/SampleApplicationHeadersIntegrationTest.java
index 1af7ec1..f8da2e1 100644
--- a/knotx-it-tests/src/test/java/io/knotx/stack/it/SampleApplicationHeadersIntegrationTest.java
+++ b/knotx-it-tests/src/test/java/io/knotx/stack/it/SampleApplicationHeadersIntegrationTest.java
@@ -25,7 +25,8 @@
 import com.github.tomakehurst.wiremock.WireMockServer;
 import io.knotx.junit5.KnotxApplyConfiguration;
 import io.knotx.junit5.KnotxExtension;
-import io.knotx.junit5.wiremock.KnotxWiremock;
+import io.knotx.junit5.RandomPort;
+import io.knotx.junit5.wiremock.ClasspathResourcesMockServer;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.vertx.junit5.VertxTestContext;
 import io.vertx.reactivex.core.MultiMap;
@@ -35,20 +36,18 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 
 @ExtendWith(KnotxExtension.class)
-public class SampleApplicationHeadersIntegrationTest {
+class SampleApplicationHeadersIntegrationTest {
 
   private MultiMap expectedHeaders = MultiMap.caseInsensitiveMultiMap();
 
-  @KnotxWiremock
-  protected WireMockServer mockService;
+  @ClasspathResourcesMockServer
+  private WireMockServer mockService;
 
-  @KnotxWiremock
-  protected WireMockServer mockRepository;
-
-  private KnotxServerTester knotxServerTester;
+  @ClasspathResourcesMockServer
+  private WireMockServer mockRepository;
 
   @BeforeEach
-  public void before() {
+  void before() {
     stubForServer(mockService,
         get(urlMatching("/service/mock/.*"))
             .willReturn(
@@ -64,21 +63,20 @@ public void before() {
                 aResponse()
                     .withHeader("Cache-control", "no-cache, no-store, must-revalidate")
                     .withHeader("Content-Type", "text/html; charset=UTF-8")
-                    .withHeader("X-Server", "Knot.x")
+                    .withHeader("X-Server", "Knot.x-Custom-Header")
             ));
 
     expectedHeaders.clear();
     expectedHeaders.add("Content-Type", "text/html; charset=UTF-8");
     expectedHeaders.add("X-Server", "Knot.x-Custom-Header");
-
-    knotxServerTester = KnotxServerTester.defatultInstance();
   }
 
   @Test
-  @KnotxApplyConfiguration("conf/integrationTestsStack.conf")
-  public void whenRequestingRemoteRepository_expectOnlyAllowedResponseHeaders(
-      VertxTestContext context, Vertx vertx) {
-    knotxServerTester.testGet(context, vertx, "/content/remote/fullPage.html", resp -> {
+  @KnotxApplyConfiguration("conf/application.conf")
+  void whenRequestingRemoteRepository_expectOnlyAllowedResponseHeaders(VertxTestContext context,
+      Vertx vertx, @RandomPort Integer globalServerPort) {
+    KnotxServerTester serverTester = KnotxServerTester.defaultInstance(globalServerPort);
+    serverTester.testGet(context, vertx, "/content/remote/fullPage.html", resp -> {
       MultiMap headers = resp.headers();
       expectedHeaders.names().forEach(name -> {
         assertTrue(headers.contains(name), "Header " + name + " is expected to be present.");
diff --git a/knotx-it-tests/src/test/java/io/knotx/stack/it/SampleApplicationIntegrationTest.java b/knotx-it-tests/src/test/java/io/knotx/stack/it/SampleApplicationIntegrationTest.java
index e54d636..9fc72ab 100644
--- a/knotx-it-tests/src/test/java/io/knotx/stack/it/SampleApplicationIntegrationTest.java
+++ b/knotx-it-tests/src/test/java/io/knotx/stack/it/SampleApplicationIntegrationTest.java
@@ -21,20 +21,16 @@
 import static io.knotx.junit5.wiremock.KnotxWiremockExtension.stubForServer;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
-import io.knotx.dataobjects.ClientResponse;
-import io.knotx.forms.api.FormsAdapterProxy;
-import io.knotx.forms.api.FormsAdapterResponse;
 import io.knotx.junit5.KnotxApplyConfiguration;
 import io.knotx.junit5.KnotxExtension;
-import io.knotx.junit5.wiremock.KnotxWiremock;
+import io.knotx.junit5.RandomPort;
+import io.knotx.junit5.wiremock.ClasspathResourcesMockServer;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import io.vertx.core.Future;
 import io.vertx.core.json.JsonObject;
 import io.vertx.junit5.VertxTestContext;
 import io.vertx.reactivex.core.Vertx;
-import io.vertx.serviceproxy.ServiceBinder;
-import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.TestInstance.Lifecycle;
@@ -42,19 +38,17 @@
 
 @ExtendWith(KnotxExtension.class)
 @TestInstance(Lifecycle.PER_CLASS)
-public class SampleApplicationIntegrationTest {
+class SampleApplicationIntegrationTest {
 
-  @KnotxWiremock
+  @ClasspathResourcesMockServer
   private WireMockServer mockService;
 
-  @KnotxWiremock
+  @ClasspathResourcesMockServer
   private WireMockServer mockBrokenService;
 
-  @KnotxWiremock
+  @ClasspathResourcesMockServer
   private WireMockServer mockRepository;
 
-  private KnotxServerTester knotxServerTester;
-
   @BeforeAll
   void initMocks() {
     stubForServer(mockService,
@@ -81,63 +75,61 @@ void initMocks() {
                     .withHeader("Content-Type", "text/html; charset=UTF-8")
                     .withHeader("X-Server", "Knot.x")
             ));
-
-    knotxServerTester = KnotxServerTester.defatultInstance();
   }
 
   @Test
-  @KnotxApplyConfiguration("conf/integrationTestsStack.conf")
-  public void requestFsRepoSimplePage(
-      VertxTestContext context, Vertx vertx) {
-    knotxServerTester.testGetRequest(context, vertx, "/content/local/fullPage.html",
+  @KnotxApplyConfiguration("conf/application.conf")
+  void requestFsRepoSimplePage(VertxTestContext context, Vertx vertx,
+      @RandomPort Integer globalServerPort) {
+    KnotxServerTester serverTester = KnotxServerTester.defaultInstance(globalServerPort);
+    serverTester.testGetRequest(context, vertx, "/content/local/fullPage.html",
         "results/local-fullPage.html");
   }
 
   @Test
-  @KnotxApplyConfiguration("conf/integrationTestsStack.conf")
-  public void requestHttpRepoSimplePage(
-      VertxTestContext context, Vertx vertx) {
-    knotxServerTester.testGetRequest(context, vertx, "/content/remote/fullPage.html",
+  @KnotxApplyConfiguration("conf/application.conf")
+  void requestHttpRepoSimplePage(VertxTestContext context, Vertx vertx,
+      @RandomPort Integer globalServerPort) {
+    KnotxServerTester serverTester = KnotxServerTester.defaultInstance(globalServerPort);
+    serverTester.testGetRequest(context, vertx, "/content/remote/fullPage.html",
         "results/remote-fullPage.html");
   }
 
   @Test
-  @KnotxApplyConfiguration("conf/integrationTestsStack.conf")
-  public void requestPageWithRequestParameters(
-      VertxTestContext context, Vertx vertx) {
-    knotxServerTester.testGetRequest(context, vertx,
+  @KnotxApplyConfiguration("conf/application.conf")
+  void requestPageWithRequestParameters(VertxTestContext context, Vertx vertx,
+      @RandomPort Integer globalServerPort) {
+    KnotxServerTester serverTester = KnotxServerTester.defaultInstance(globalServerPort);
+    serverTester.testGetRequest(context, vertx,
         "/content/remote/fullPage.html?parameter%20with%20space=value&q=knotx",
         "results/remote-fullPage.html");
   }
 
   @Test
-  @KnotxApplyConfiguration("conf/integrationTestsStack.conf")
-  public void requestPageWithServiceThatReturns500(
-      VertxTestContext context, Vertx vertx) {
-    knotxServerTester.testGetRequest(context, vertx, "/content/local/brokenService.html",
+  @KnotxApplyConfiguration("conf/application.conf")
+  void requestPageWithServiceThatReturns500(VertxTestContext context, Vertx vertx,
+      @RandomPort Integer globalServerPort) {
+    KnotxServerTester serverTester = KnotxServerTester.defaultInstance(globalServerPort);
+    serverTester.testGetRequest(context, vertx, "/content/local/brokenService.html",
         "results/brokenService.html");
   }
 
   @Test
-  @KnotxApplyConfiguration({"conf/integrationTestsStack.conf",
-      "conf/overrides/customTagAndPrefix.conf"})
-  public void requestPageWithCustomTagAndParamPrefix(
-      VertxTestContext context, Vertx vertx) {
-    knotxServerTester.testGetRequest(context, vertx, "/content/local/customSnippetTag.html",
-        "results/customSnippetTag.html");
-  }
-
-  @Test
-  @KnotxApplyConfiguration("conf/integrationTestsStack.conf")
-  public void requestPageThatUseFormsDatabridgeAndTe(
-      VertxTestContext context, Vertx vertx) {
-    knotxServerTester.testGetRequest(context, vertx, "/content/local/formsBridgeTe.html",
+  @Disabled
+  @KnotxApplyConfiguration("conf/application.conf")
+  void requestPageThatUseFormsDatabridgeAndTe(VertxTestContext context, Vertx vertx,
+      @RandomPort Integer globalServerPort) {
+    KnotxServerTester serverTester = KnotxServerTester.defaultInstance(globalServerPort);
+    serverTester.testGetRequest(context, vertx, "/content/local/formsBridgeTe.html",
         "results/formsBridgeTe.html");
   }
 
   @Test
-  @KnotxApplyConfiguration("conf/integrationTestsStack.conf")
-  public void submitOneFormAfterAnother(VertxTestContext context, Vertx vertx) {
+  @Disabled
+  @KnotxApplyConfiguration("conf/application.conf")
+  void submitOneFormAfterAnother(VertxTestContext context, Vertx vertx,
+      @RandomPort Integer globalServerPort) {
+    KnotxServerTester serverTester = KnotxServerTester.defaultInstance(globalServerPort);
     final JsonObject competitionFormData = new JsonObject()
         .put("name", "test")
         .put("email", "email-1@example.com")
@@ -148,33 +140,33 @@ public void submitOneFormAfterAnother(VertxTestContext context, Vertx vertx) {
         .put("_frmId", "newsletter");
 
     mockFormsAdapter(vertx, competitionFormData, newsletterFormData);
-    knotxServerTester.testPostRequest(context, vertx, "/content/local/formsBridgeTe.html",
+    serverTester.testPostRequest(context, vertx, "/content/local/formsBridgeTe.html",
         competitionFormData.getMap(),
         "results/submitCompetitionForm.html");
-    knotxServerTester.testPostRequest(context, vertx, "/content/local/formsBridgeTe.html",
+    serverTester.testPostRequest(context, vertx, "/content/local/formsBridgeTe.html",
         newsletterFormData.getMap(),
         "results/submitNewsletterForm.html");
   }
 
   private void mockFormsAdapter(Vertx vertx, JsonObject competitionData,
       JsonObject newsletterData) {
-    ClientResponse clientResponse = new ClientResponse().setStatusCode(404);
-    FormsAdapterResponse resp = new FormsAdapterResponse().setResponse(clientResponse);
-
-    new ServiceBinder(vertx.getDelegate())
-        .setAddress("knotx.forms.mock.adapter")
-        .register(FormsAdapterProxy.class, (request, result) -> {
-          String path = request.getParams().getString("testedFormId");
-          if (StringUtils.isNotBlank(path)) {
-            if (path.equals("competitionForm")) {
-              clientResponse.setStatusCode(200)
-                  .setBody(new JsonObject().put("form", competitionData).toBuffer());
-            } else if (path.equals("newsletterForm")) {
-              clientResponse.setStatusCode(200)
-                  .setBody(new JsonObject().put("form", newsletterData).toBuffer());
-            }
-          }
-          result.handle(Future.succeededFuture(resp));
-        });
+//    ClientResponse clientResponse = new ClientResponse().setStatusCode(404);
+//    FormsAdapterResponse resp = new FormsAdapterResponse().setResponse(clientResponse);
+//
+//    new ServiceBinder(vertx.getDelegate())
+//        .setAddress("knotx.forms.mock.adapter")
+//        .register(FormsAdapterProxy.class, (request, result) -> {
+//          String path = request.getParams().getString("testedFormId");
+//          if (StringUtils.isNotBlank(path)) {
+//            if (path.equals("competitionForm")) {
+//              clientResponse.setStatusCode(200)
+//                  .setBody(new JsonObject().put("form", competitionData).toBuffer());
+//            } else if (path.equals("newsletterForm")) {
+//              clientResponse.setStatusCode(200)
+//                  .setBody(new JsonObject().put("form", newsletterData).toBuffer());
+//            }
+//          }
+//          result.handle(Future.succeededFuture(resp));
+//        });
   }
 }
diff --git a/knotx-it-tests/src/test/resources/conf/application.conf b/knotx-it-tests/src/test/resources/conf/application.conf
new file mode 100644
index 0000000..bc31cba
--- /dev/null
+++ b/knotx-it-tests/src/test/resources/conf/application.conf
@@ -0,0 +1,12 @@
+########### Modules to start ###########
+# Modules array specify a list of verticles to be started by Knot.x.
+# Each line should have a form of <alias>=<verticle-class-name>
+# where alias is just a name that you can use later in order to define configuration for the module
+# verticle-class-name is a fully qualified class name of the verticle.
+#
+# This array is filled in included files.
+modules = []
+
+include required(classpath("conf/server.conf"))
+include required(classpath("conf/knots/dataBridgeStack.conf"))
+include required(classpath("conf/knots/templateEngineStack.conf"))
diff --git a/knotx-it-tests/src/test/resources/conf/includes/forms.conf b/knotx-it-tests/src/test/resources/conf/includes/forms.conf
deleted file mode 100644
index ecafefb..0000000
--- a/knotx-it-tests/src/test/resources/conf/includes/forms.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-# Event bus address of the Forms Knot
-address = ${global.forms.address}
-
-# Array of adapters that will be responsible for communicating with external services in order to
-# process client requests (form submisions).
-adapters = [
-  {
-    name = subscribe-competition
-    address = ${global.forms.adapter.address}
-    params.testedFormId = competitionForm
-    allowedRequestHeaders = [
-      "Cookie"
-    ]
-    allowedResponseHeaders = [
-      "Set-Cookie",
-      "Location"
-    ]
-  }
-  {
-    name = subscribe-newsletter
-    address = ${global.forms.adapter.address}
-    params.testedFormId = newsletterForm
-    allowedRequestHeaders = [
-      "Cookie"
-    ]
-    allowedResponseHeaders = [
-      "Set-Cookie",
-      "Location"
-    ]
-  }
-]
-
-# Name of the hidden input tag which is added by Action Knot.
-formIdentifierName = _frmId
-
-# Vert.x event bus delivery options used when communicating with other verticles
-# see http://vertx.io/docs/vertx-core/dataobjects.html#DeliveryOptions for the details what can be configured
-#
-# deliveryOptions {}
diff --git a/knotx-it-tests/src/test/resources/conf/includes/fsRepo.conf b/knotx-it-tests/src/test/resources/conf/includes/fsRepo.conf
deleted file mode 100644
index a091424..0000000
--- a/knotx-it-tests/src/test/resources/conf/includes/fsRepo.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Event bus address on which the HTTP repository connector listens on. Default is 'knotx.core.repository.filesystem'
-#
-address = ${global.repositories.fsRepo.address}
-
-# Set the root folder of the repository on file system.
-# If catalogue equals empty string a verticle will look for the files in classpath
-#
-catalogue = ""
diff --git a/knotx-it-tests/src/test/resources/conf/includes/server.conf b/knotx-it-tests/src/test/resources/conf/includes/server.conf
deleted file mode 100644
index 4d696ed..0000000
--- a/knotx-it-tests/src/test/resources/conf/includes/server.conf
+++ /dev/null
@@ -1,110 +0,0 @@
-# Configuraiton of HTTP server
-serverOptions {
-  # Knot.x server HTTP port
-  port = ${global.server.port}
-
-  # If you want a server to serve SSL connections you can configure it here
-  #
-  # Enable SSL
-  # ssl = true
-  #
-  # Path on the server the keystore.jks file is located
-  # keyStoreOptions.path =
-  #
-  # Keystore password
-  # keyStoreOptions.password =
-}
-
-routingSpecificationLocation = /openapi.yaml
-routingOperations = [
-  {
-    operationId = te-local-get
-    handlers = ${global.server.routingOperations.handlers.request} [
-      {
-        name = repositoryHandler
-        config.proxyAddress = ${global.repositories.fsRepo.address}
-      },
-      {
-        name = splitterHandler
-        config.proxyAddress = ${global.splitter.address}
-      },
-      {
-        name = knotEngineHandler
-        config.routing = {
-          proxyAddress = ${global.forms.address},
-          onTransition.next {
-            address = ${global.bridge.address},
-            onTransition.next {
-              address = ${global.templateEngine.address}
-            }
-          }
-        }
-      },
-      {
-        name = assemblerHandler
-        config.proxyAddress = ${global.assembler.address}
-      }
-    ] ${global.server.routingOperations.handlers.response}
-  },
-  {
-    operationId = te-local-post
-    handlers = ${global.server.routingOperations.handlers.request} [
-      {
-        name = repositoryHandler
-        config.proxyAddress = ${global.repositories.fsRepo.address}
-      },
-      {
-        name = splitterHandler
-        config.proxyAddress = ${global.splitter.address}
-      },
-      {
-        name = knotEngineHandler
-        config.routing = {
-          proxyAddress = ${global.forms.address},
-          onTransition.next {
-            address = ${global.bridge.address},
-            onTransition.next {
-              address = ${global.templateEngine.address}
-            }
-          }
-        }
-      },
-      {
-        name = assemblerHandler
-        config.proxyAddress = ${global.assembler.address}
-      }
-    ] ${global.server.routingOperations.handlers.response}
-  },
-  {
-    operationId = te-remote-get
-    handlers = ${global.server.routingOperations.handlers.request} [
-      {
-        name = repositoryHandler
-        config.proxyAddress = ${global.repositories.httpRepo.address}
-      },
-      {
-        name = splitterHandler
-        config.proxyAddress = ${global.splitter.address}
-      },
-      {
-        name = knotEngineHandler
-        config.routing = {
-          proxyAddress = ${global.forms.address}
-          onTransition.next {
-            address = ${global.bridge.address}
-            onTransition.next {
-              address = ${global.templateEngine.address}
-            }
-          }
-        }
-      },
-      {
-        name = assemblerHandler
-        config.proxyAddress = ${global.assembler.address}
-      }
-    ] ${global.server.routingOperations.handlers.response}
-  }
-]
-
-displayExceptionDetails = true
-dropRequests = false
diff --git a/knotx-it-tests/src/test/resources/conf/integrationTestsStack.conf b/knotx-it-tests/src/test/resources/conf/integrationTestsStack.conf
deleted file mode 100644
index 6a8d6ab..0000000
--- a/knotx-it-tests/src/test/resources/conf/integrationTestsStack.conf
+++ /dev/null
@@ -1,179 +0,0 @@
-########### Modules to start ###########
-# You need to specify a list of verticle to be started by Knot.x
-# Each line should have a form of <alias>=<verticle-class-name>
-# where alias is just a name that you can use later in order to define configuration for the module
-# verticle-class-name is a fully qualified class name of the verticle
-#
-# If you want to test the configuration you can simply comment out or remove unnecessary modules
-modules = [
-  ########### Core ###########
-  "server=io.knotx.server.KnotxServerVerticle"
-  "httpRepo=io.knotx.repository.http.HttpRepositoryConnectorVerticle"
-  "fsRepo=io.knotx.repository.fs.FilesystemRepositoryConnectorVerticle"
-  "splitter=io.knotx.splitter.FragmentSplitterVerticle"
-  "assembler=io.knotx.assembler.FragmentAssemblerVerticle"
-  ########### Data Bridge ###########
-  "dataBridge=io.knotx.databridge.core.DataBridgeKnot"
-  "dataSourceHttp=io.knotx.databridge.http.HttpDataSourceAdapter"
-  ########### Forms ###########
-  "forms=io.knotx.forms.core.FormsKnot"
-  # forms adapter is set as mock programmatically in the test
-  ########### Template Engine ###########
-  "templateEngine=io.knotx.te.core.TemplateEngineKnot"
-]
-
-########### Globals ###########
-global {
-  server {
-    port = 9092
-    routingOperations.handlers {
-      request = [
-        {
-          name = cookieHandler
-        },
-        {
-          name = bodyHandler
-        },
-        {
-          name = knotContextHandler
-        }
-      ],
-      response = [
-        {
-          name = headerHandler
-          # Statically defined HTTP response header returned to the client in every HTTP response
-          config {
-            name = X-Server
-            value = Knot.x-Custom-Header
-          }
-        },
-        {
-          name = writerHandler
-          # List of HTTP response headers Knot.x can return to the client
-          config.allowedResponseHeaders = [
-            "Access-Control-Allow-Origin",
-            "Content-Type",
-            "Content-Length"
-          ]
-        }
-      ]
-    }
-  }
-  snippetOptions {
-    # Knot.x snippet HTML tag name. Default is 'script'.
-    # Change here if you want to use different tag name, e.g. 'knotx:snippet'
-    tagName = "knotx:snippet"
-
-    # This prefix will start every snippet parameter in the snippet tag.
-    # You may set it to 'data-xxxx-' when snippet tag name is an HTML tag to keep HTML5 data naming
-    # compliance, e.g. when you set it to 'data-knotx-', snippet params will look like:
-    # <script data-knotx-knotx="someKnot, handlebars"
-    #         data-knotx-someKnot-param-name="XYZ" >
-    paramsPrefix = ""
-  }
-
-  assembler.address = knotx.core.assembler
-  splitter.address = knotx.core.splitter
-
-  repositories {
-    httpRepo.address = knotx.core.repository.http
-    fsRepo.address = knotx.core.repository.filesystem
-  }
-
-  # Knot.x Forms
-  forms {
-    address = knotx.knot.forms
-    # this module is set as mock in the test
-    adapter.address = knotx.forms.mock.adapter
-  }
-
-  # Data Bridge globals
-  bridge {
-    address = knotx.knot.databridge
-    dataSource {
-      http.address = knotx.bridge.datasource.http
-    }
-  }
-
-  # Knot.x Template Engine
-  templateEngine.address = knotx.knot.te
-
-}
-
-########### WireMock config ###########
-test.wiremock {
-  mockService.port = 4000
-  mockBrokenService.port = 5000
-  mockRepository.port = 4001
-}
-
-########### Modules configurations ###########
-config.server {
-  options.config {
-    include required("conf/includes/server.conf")
-  }
-
-  # The options object carries-on configuration called DeploymentOptions for a given verticle.
-  # It allows you to control the verticle behaviour, such as how many instances, classpath isolation, workers, etc.
-  # See available options http://vertx.io/docs/vertx-core/dataobjects.html#DeploymentOptions
-  #
-  # options {}
-}
-
-config.httpRepo {
-  options.config {
-    include required("conf/includes/httpRepo.conf")
-  }
-}
-
-config.fsRepo {
-  options.config {
-    include required("conf/includes/fsRepo.conf")
-  }
-}
-
-config.splitter.options.config {
-  # Event bus address on which splitter is listening on. Default is 'knotx.core.splitter'
-  address = ${global.splitter.address} # Do not change
-
-  # Knot.x snippet options. Configures e.g. HTML tag name (default is 'script') and snippet
-  # params prefix (default is "data-knotx-")
-  snippetOptions = ${global.snippetOptions} # Do not change
-}
-
-config.assembler.options.config {
-  # Event bus address on which splitter is listening on. Default is 'knotx.core.assembler'
-  address = ${global.assembler.address} # Do not change
-
-  # Knot.x snippet options. Configures e.g. HTML tag name (default is 'script') and snippet
-  # params prefix (default is "data-knotx-")
-  snippetOptions = ${global.snippetOptions} # Do not change
-
-  # Strategy how to assembly markup with snippets that were not processed by any Knot. Default is UNWRAP
-  # Allowed values are: AS_IS, IGNORE, UNWRAP
-  # unprocessedStrategy =
-}
-
-config.forms {
-  options.config {
-    include required("conf/includes/forms.conf")
-  }
-}
-
-config.dataBridge {
-  options.config {
-    include required("conf/includes/dataBridge.conf")
-  }
-}
-
-config.dataSourceHttp {
-  options.config {
-    include required("conf/includes/dataSourceHttp.conf")
-  }
-}
-
-config.templateEngine {
-  options.config {
-    include required(classpath("conf/includes/templateEngine.conf"))
-  }
-}
diff --git a/knotx-it-tests/src/test/resources/conf/includes/dataBridge.conf b/knotx-it-tests/src/test/resources/conf/knots/dataBridgeKnot.conf
similarity index 60%
rename from knotx-it-tests/src/test/resources/conf/includes/dataBridge.conf
rename to knotx-it-tests/src/test/resources/conf/knots/dataBridgeKnot.conf
index 5b07b11..6c88b86 100644
--- a/knotx-it-tests/src/test/resources/conf/includes/dataBridge.conf
+++ b/knotx-it-tests/src/test/resources/conf/knots/dataBridgeKnot.conf
@@ -1,27 +1,24 @@
-# Event bus settings
-address = ${global.bridge.address}
-
 # List of mappings between service aliases and datasources.
 # You can define here as many service definitions as required for your project.
 dataDefinitions = [
   {
     name = books
-    adapter = ${global.bridge.dataSource.http.address}
+    adapter = ${global.dataBridge.dataSource.http.address}
     params.path = /service/mock/book.json
     cacheKey = first
   }
   {
     name = authors
-    adapter = ${global.bridge.dataSource.http.address}
+    adapter = ${global.dataBridge.dataSource.http.address}
     params.path = /service/mock/author.json
   }
   {
     name = labelsRepository
-    adapter = ${global.bridge.dataSource.http.address}
+    adapter = ${global.dataBridge.dataSource.http.address}
   }
   {
     name = broken
-    adapter = ${global.bridge.dataSource.http.address}
+    adapter = ${global.dataBridge.dataSource.http.address}
     params.path = /service/broken/500.json
   }
 ]
diff --git a/knotx-it-tests/src/test/resources/conf/includes/dataSourceHttp.conf b/knotx-it-tests/src/test/resources/conf/knots/dataBridgeSourceHttp.conf
similarity index 96%
rename from knotx-it-tests/src/test/resources/conf/includes/dataSourceHttp.conf
rename to knotx-it-tests/src/test/resources/conf/knots/dataBridgeSourceHttp.conf
index c65f496..534b163 100644
--- a/knotx-it-tests/src/test/resources/conf/includes/dataSourceHttp.conf
+++ b/knotx-it-tests/src/test/resources/conf/knots/dataBridgeSourceHttp.conf
@@ -1,5 +1,5 @@
 # Event bus address of the Basic HTTP Datasource
-address = ${global.bridge.dataSource.http.address}
+address = ${global.dataBridge.dataSource.http.address}
 
 clientOptions {
   maxPoolSize = 1000
diff --git a/knotx-it-tests/src/test/resources/conf/knots/dataBridgeStack.conf b/knotx-it-tests/src/test/resources/conf/knots/dataBridgeStack.conf
new file mode 100644
index 0000000..fe29571
--- /dev/null
+++ b/knotx-it-tests/src/test/resources/conf/knots/dataBridgeStack.conf
@@ -0,0 +1,40 @@
+########### Knot.x JUnit5 config ###########
+test.wiremock {
+  # random port
+  mockService {
+    port = 0
+    httpMethods = ""
+  }
+  mockBrokenService {
+    port = 0
+    httpMethods = ""
+  }
+}
+
+########### Globals ###########
+global {
+  # Data Bridge globals
+  dataBridge {
+    dataSource {
+      http.address = datasource.http
+    }
+  }
+}
+
+########### Data Bridge Stack ###########
+modules = ${modules} [
+  "dataBridge=io.knotx.databridge.core.DataBridgeKnot"
+  "dataSourceHttp=io.knotx.databridge.http.HttpDataSourceAdapter"
+]
+
+########### Modules configurations ###########
+config.dataBridge {
+  options.config {
+    include required(classpath("conf/knots/dataBridgeKnot.conf"))
+  }
+}
+config.dataSourceHttp {
+  options.config {
+    include required(classpath("conf/knots/dataBridgeSourceHttp.conf"))
+  }
+}
diff --git a/knotx-it-tests/src/test/resources/conf/includes/templateEngine.conf b/knotx-it-tests/src/test/resources/conf/knots/templateEngineKnot.conf
similarity index 94%
rename from knotx-it-tests/src/test/resources/conf/includes/templateEngine.conf
rename to knotx-it-tests/src/test/resources/conf/knots/templateEngineKnot.conf
index 575ac0f..a6e713e 100644
--- a/knotx-it-tests/src/test/resources/conf/includes/templateEngine.conf
+++ b/knotx-it-tests/src/test/resources/conf/knots/templateEngineKnot.conf
@@ -1,5 +1,3 @@
-# Event bus settings
-address = ${global.templateEngine.address}
 # Vert.x event bus delivery options used when communicating with other verticles
 # see http://vertx.io/docs/vertx-core/dataobjects.html#DeliveryOptions for the details what can be configured
 # deliveryOptions {}
diff --git a/knotx-it-tests/src/test/resources/conf/knots/templateEngineStack.conf b/knotx-it-tests/src/test/resources/conf/knots/templateEngineStack.conf
new file mode 100644
index 0000000..117f100
--- /dev/null
+++ b/knotx-it-tests/src/test/resources/conf/knots/templateEngineStack.conf
@@ -0,0 +1,11 @@
+########### Template Engine Stack ###########
+modules = ${modules} [
+  "templateEngine=io.knotx.te.core.TemplateEngineKnot"
+]
+
+########### Modules configurations ###########
+config.templateEngine {
+  options.config {
+    include required(classpath("conf/knots/templateEngineKnot.conf"))
+  }
+}
diff --git a/knotx-it-tests/src/test/resources/conf/overrides/customTagAndPrefix.conf b/knotx-it-tests/src/test/resources/conf/overrides/customTagAndPrefix.conf
deleted file mode 100644
index 48259f0..0000000
--- a/knotx-it-tests/src/test/resources/conf/overrides/customTagAndPrefix.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-global.snippetOptions = {
-  tagName = "custom:snippet"
-  paramsPrefix = "it-test-"
-}
diff --git a/knotx-it-tests/src/test/resources/conf/overrides/defaultFallback.conf b/knotx-it-tests/src/test/resources/conf/overrides/defaultFallback.conf
deleted file mode 100644
index f4facb6..0000000
--- a/knotx-it-tests/src/test/resources/conf/overrides/defaultFallback.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-global.snippetOptions {
-  defaultFallback = MY_GLOBAL_ID
-  fallbacks = [
-    {
-      id = MY_GLOBAL_ID
-      markup = "<p class='error'>global fallback</p>"
-    }
-  ]
-}
diff --git a/knotx-it-tests/src/test/resources/conf/includes/httpRepo.conf b/knotx-it-tests/src/test/resources/conf/routes/handlers/httpRepoConnectorHandler.conf
similarity index 91%
rename from knotx-it-tests/src/test/resources/conf/includes/httpRepo.conf
rename to knotx-it-tests/src/test/resources/conf/routes/handlers/httpRepoConnectorHandler.conf
index 7bf0aff..768f9ce 100644
--- a/knotx-it-tests/src/test/resources/conf/includes/httpRepo.conf
+++ b/knotx-it-tests/src/test/resources/conf/routes/handlers/httpRepoConnectorHandler.conf
@@ -1,7 +1,3 @@
-# Event bus address on which the HTTP repository connector listens on. Default is 'knotx.core.repository.http'
-#
-address = ${global.repositories.httpRepo.address}
-
 # Vert.x event bus delivery options used when communicating with other verticles
 # see http://vertx.io/docs/vertx-core/dataobjects.html#HttpClientOptions for the details what can be configured
 #
@@ -48,7 +44,6 @@ allowedRequestHeaders = [
   Cookie
   Date
   "Edge.*"
-  Host
   "If.*"
   Origin
   Pragma
diff --git a/knotx-it-tests/src/test/resources/conf/routes/handlers/knotEngineHandler.conf b/knotx-it-tests/src/test/resources/conf/routes/handlers/knotEngineHandler.conf
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/knotx-it-tests/src/test/resources/conf/routes/handlers/knotEngineHandler.conf
@@ -0,0 +1 @@
+
diff --git a/knotx-it-tests/src/test/resources/conf/routes/te-local-get.conf b/knotx-it-tests/src/test/resources/conf/routes/te-local-get.conf
new file mode 100644
index 0000000..55d647d
--- /dev/null
+++ b/knotx-it-tests/src/test/resources/conf/routes/te-local-get.conf
@@ -0,0 +1,26 @@
+routingOperations = ${routingOperations} [
+  {
+    operationId = te-local-get
+    handlers = ${config.server.handlers.common.request} [
+      {
+        name = fsRepoConnectorHandler
+        config {
+          # Set the root folder of the repository on file system.
+          # If catalogue equals empty string a verticle will look for the files in classpath
+          #
+          catalogue = ""
+        }
+      },
+      {
+        name = splitterHandler
+      },
+      {
+        name = knotEngineHandler
+        config = { include required(classpath("conf/routes/handlers/knotEngineHandler.conf")) }
+      },
+      {
+        name = assemblerHandler
+      }
+    ] ${config.server.handlers.common.response}
+  }
+]
diff --git a/knotx-it-tests/src/test/resources/conf/routes/te-local-post.conf b/knotx-it-tests/src/test/resources/conf/routes/te-local-post.conf
new file mode 100644
index 0000000..8fad0c6
--- /dev/null
+++ b/knotx-it-tests/src/test/resources/conf/routes/te-local-post.conf
@@ -0,0 +1,21 @@
+routingOperations = ${routingOperations} [
+  {
+    operationId = te-local-post
+    handlers = ${config.server.handlers.common.request} [
+      {
+        name = httpRepoConnectorHandler
+        config = ${global.handler.httpRepoConnectorHandler.config}
+      },
+      {
+        name = splitterHandler
+      },
+      {
+        name = knotEngineHandler
+        config = { include required(classpath("conf/routes/handlers/knotEngineHandler.conf")) }
+      },
+      {
+        name = assemblerHandler
+      }
+    ] ${config.server.handlers.common.response}
+  }
+]
diff --git a/knotx-it-tests/src/test/resources/conf/routes/te-remote-get.conf b/knotx-it-tests/src/test/resources/conf/routes/te-remote-get.conf
new file mode 100644
index 0000000..f972a9e
--- /dev/null
+++ b/knotx-it-tests/src/test/resources/conf/routes/te-remote-get.conf
@@ -0,0 +1,21 @@
+routingOperations = ${routingOperations} [
+  {
+    operationId = te-remote-get
+    handlers = ${config.server.handlers.common.request} [
+      {
+        name = httpRepoConnectorHandler
+        config = ${global.handler.httpRepoConnectorHandler.config}
+      },
+      {
+        name = splitterHandler
+      },
+      {
+        name = knotEngineHandler
+        config = { include required(classpath("conf/routes/handlers/knotEngineHandler.conf")) }
+      },
+      {
+        name = assemblerHandler
+      }
+    ] ${config.server.handlers.common.response}
+  }
+]
diff --git a/knotx-it-tests/src/test/resources/conf/server.conf b/knotx-it-tests/src/test/resources/conf/server.conf
new file mode 100644
index 0000000..bb22899
--- /dev/null
+++ b/knotx-it-tests/src/test/resources/conf/server.conf
@@ -0,0 +1,98 @@
+########### Knot.x JUnit5 config ###########
+test {
+  wiremock {
+    # random port
+    mockRepository {
+      port = 0
+      httpMethods = ""
+    }
+  }
+  random {
+    // random port
+    globalServer.port = 0
+  }
+}
+
+########### Knot.x Server ###########
+modules = ${modules} [
+  "server=io.knotx.server.KnotxServerVerticle"
+]
+
+########### Modules configurations ###########
+config.server {
+  handlers.common {
+    request = [
+      {
+        name = cookieHandler
+      },
+      {
+        name = bodyHandler
+      },
+      {
+        name = requestContextHandler
+      }
+    ],
+    response = [
+      {
+        name = headerHandler
+        # Statically defined HTTP response header returned to the client in every HTTP response
+        config {
+          name = X-Server
+          value = Knot.x-Custom-Header
+        }
+      },
+      {
+        name = writerHandler
+        # List of HTTP response headers Knot.x can return to the client
+        config.allowedResponseHeaders = [
+          Access-Control-Allow-Origin
+          Content-Type
+          Content-Length
+          X-Server
+        ]
+      }
+    ]
+  }
+  options.config {
+    # Configuraiton of HTTP server
+    serverOptions {
+      # Knot.x server HTTP port
+      port = ${test.random.globalServer.port}
+
+      # If you want a server to serve SSL connections you can configure it here
+      #
+      # Enable SSL
+      # ssl = true
+      #
+      # Path on the server the keystore.jks file is located
+      # keyStoreOptions.path =
+      #
+      # Keystore password
+      # keyStoreOptions.password =
+    }
+
+    # Location of your Open API spec. It can be an absolute path, a local path or remote url (with HTTP protocol).
+    routingSpecificationLocation = /openapi.yaml
+
+    displayExceptionDetails = true
+    dropRequests = false
+
+    routingOperations = []
+    include required(classpath("conf/routes/te-local-get.conf"))
+    include required(classpath("conf/routes/te-local-post.conf"))
+    include required(classpath("conf/routes/te-remote-get.conf"))
+  }
+
+  # The options object carries-on configuration called DeploymentOptions for a given verticle.
+  # It allows you to control the verticle behaviour, such as how many instances, classpath isolation, workers, etc.
+  # See available options http://vertx.io/docs/vertx-core/dataobjects.html#DeploymentOptions
+  #
+  # options {}
+}
+
+########### Globals ###########
+global {
+  handler {
+    httpRepoConnectorHandler.config = {include required(classpath("conf/routes/handlers/httpRepoConnectorHandler.conf"))}
+  }
+}
diff --git a/knotx-it-tests/src/test/resources/content/local/brokenService.html b/knotx-it-tests/src/test/resources/content/local/brokenService.html
index 7517ca4..b96335f 100644
--- a/knotx-it-tests/src/test/resources/content/local/brokenService.html
+++ b/knotx-it-tests/src/test/resources/content/local/brokenService.html
@@ -21,9 +21,8 @@
 </head>
 <body>
   <div>
-  <knotx:snippet knots="databridge,te"
-                 databridge-name="broken"
-                 type="text/knotx-snippet">
+  <knotx:snippet flow="knotx.knot.databridge,knotx.knot.te"
+                 databridge-name="broken">
     <h2>I'm still working!</h2>
     <p>Status code: {{_response.statusCode}}</p>
   </knotx:snippet>
diff --git a/knotx-it-tests/src/test/resources/content/local/customSnippetTag.html b/knotx-it-tests/src/test/resources/content/local/customSnippetTag.html
deleted file mode 100644
index d9cd0cb..0000000
--- a/knotx-it-tests/src/test/resources/content/local/customSnippetTag.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-  Copyright (C) 2018 Knot.x Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>Custom snippet tag and prefix</title>
-</head>
-<body>
-  <div>
-    <custom:snippet it-test-knots="databridge,te"
-                    it-test-databridge-name="books"
-                    type="text/knotx-snippet">
-      <div>
-        <h2>{{_result.title}}</h2>
-        <div>Authors: {{_result.info.authors}}</div>
-      </div>
-    </custom:snippet>
-  </div>
-  <div>
-    <custom:snippet it-test-knots="databridge,te"
-                    it-test-databridge-name="authors"
-                    type="text/knotx-snippet">
-      <h2>{{_result.name}}</h2>
-      <p>Bio: {{_result.info.bio}}</p>
-    </custom:snippet>
-  </div>
-  <div>
-    <knotx:snippet knots="databridge,te"
-                   databridge-name="authors"
-                   type="text/knotx-snippet">
-      <h2>This will be not processed!</h2>
-      <h2>{{_result.name}}</h2>
-      <p>Bio: {{_result.info.bio}}</p>
-    </knotx:snippet>
-  </div>
-</body>
-</html>
diff --git a/knotx-it-tests/src/test/resources/content/local/formsBridgeTe.html b/knotx-it-tests/src/test/resources/content/local/formsBridgeTe.html
index ec83295..4b38f6c 100644
--- a/knotx-it-tests/src/test/resources/content/local/formsBridgeTe.html
+++ b/knotx-it-tests/src/test/resources/content/local/formsBridgeTe.html
@@ -23,8 +23,7 @@
   <div>
     <knotx:snippet knots="form-competition,databridge,te"
                    databridge-name-labelsrepository="labelsRepository"
-                   databridge-params-labelsrepository='{"path":"/service/mock/labelsRepository.json"}'
-                   type="text/knotx-snippet">
+                   databridge-params-labelsrepository='{"path":"/service/mock/labelsRepository.json"}'>
       <h1>{{labelsrepository._result.welcomeInCompetition}}</h1>
       {{#if form._result}}
       <p>{{labelsrepository._result.thankYouForSubscribingToCompetition}}</p>
@@ -52,8 +51,7 @@ <h1>{{labelsrepository._result.welcomeInCompetition}}</h1>
   <div>
     <knotx:snippet knots="form-newsletter,databridge,te"
                    databridge-name-labelsrepository="labelsRepository"
-                   databridge-params-labelsrepository='{"path":"/service/mock/labelsRepository.json"}'
-                   type="text/knotx-snippet">
+                   databridge-params-labelsrepository='{"path":"/service/mock/labelsRepository.json"}'>
       <div id="newsletter-form-wrapper">
         <h1>{{labelsrepository._result.subscribeToNewsletter}}</h1>
         {{#if form._result}}
diff --git a/knotx-it-tests/src/test/resources/content/local/fullPage.html b/knotx-it-tests/src/test/resources/content/local/fullPage.html
index 5006556..c683096 100644
--- a/knotx-it-tests/src/test/resources/content/local/fullPage.html
+++ b/knotx-it-tests/src/test/resources/content/local/fullPage.html
@@ -24,68 +24,65 @@
   <link href="https://bootswatch.com/4/simplex/bootstrap.min.css" rel="stylesheet"/>
 </head>
 <body>
-  <div class="container-fluid">
-    <div class="row">
-      <div class="col-md-12">
-        <div class="jumbotron">
-          <h2>
-            Hello Knot.x - reactive micro-service assembler world!
-          </h2>
-          <p>
-            This template is served from the <strong>local</strong> repository.
-          </p>
-          <p>
-            <a class="btn btn-primary btn-large"
-               href="https://github.com/Cognifide/knotx">Learn more</a>
-          </p>
-        </div>
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-12">
+      <div class="jumbotron">
+        <h2>
+          Hello Knot.x - reactive micro-service assembler world!
+        </h2>
+        <p>
+          This template is served from the <strong>local</strong> repository.
+        </p>
+        <p>
+          <a class="btn btn-primary btn-large"
+             href="https://github.com/Cognifide/knotx">Learn more</a>
+        </p>
       </div>
     </div>
-    <div class="row">
-      <knotx:snippet knots="databridge,te"
-                     it-test-databridge-name-author="authors"
-                     it-test-databridge-name-book="books"
-              type="text/knotx-snippet">
-        <div class="col-md-4">
-          <h2>Book</h2>
-          <p>{{book._result.title}}</p>
-          <p>Authors: {{book._result.info.authors}}</p>
-          <div>Success! Status code : {{book._response.statusCode}}</div>
-        </div>
-        <div class="col-md-4">
-          <h2>Author</h2>
-          <p>{{author._result.name}}</p>
-          <p>Bio: {{author._result.info.bio}}</p>
-          <div>Success! Status code : {{author._response.statusCode}}</div>
-        </div>
-      </knotx:snippet>
-    </div>
-    <div class="row">
+  </div>
+  <div class="row">
+    <knotx:snippet flow="knotx.knot.databridge,knotx.knot.te"
+                   databridge-name-author="authors"
+                   databridge-name-book="books">
       <div class="col-md-4">
-        <knotx:snippet knots="databridge,te"
-                       databridge-name="authors"
-                type="text/knotx-snippet">
-          <h2>Portfolio: </h2>
-          <ul>
-            {{#each _result.info.portfolio}}
-            <li>{{this}}</li>
-            {{/each}}
-          </ul>
-        </knotx:snippet>
+        <h2>Book</h2>
+        <p>{{book._result.title}}</p>
+        <p>Authors: {{book._result.info.authors}}</p>
+        <div>Success! Status code : {{book._response.statusCode}}</div>
       </div>
       <div class="col-md-4">
-        <knotx:snippet knots="databridge,te"
-                       databridge-name="books"
-                       type="text/knotx-snippet">
-          <h2>Tags: </h2>
-          <ul>
-            {{#each _result.info.tags}}
-            <li>{{this}}</li>
-            {{/each}}
-          </ul>
-        </knotx:snippet>
+        <h2>Author</h2>
+        <p>{{author._result.name}}</p>
+        <p>Bio: {{author._result.info.bio}}</p>
+        <div>Success! Status code : {{author._response.statusCode}}</div>
       </div>
+    </knotx:snippet>
+  </div>
+  <div class="row">
+    <div class="col-md-4">
+      <knotx:snippet flow="knotx.knot.databridge,knotx.knot.te"
+                     databridge-name="authors">
+        <h2>Portfolio: </h2>
+        <ul>
+          {{#each _result.info.portfolio}}
+          <li>{{this}}</li>
+          {{/each}}
+        </ul>
+      </knotx:snippet>
+    </div>
+    <div class="col-md-4">
+      <knotx:snippet flow="knotx.knot.databridge,knotx.knot.te"
+                     databridge-name="books">
+        <h2>Tags: </h2>
+        <ul>
+          {{#each _result.info.tags}}
+          <li>{{this}}</li>
+          {{/each}}
+        </ul>
+      </knotx:snippet>
     </div>
   </div>
+</div>
 </body>
 </html>
diff --git a/knotx-it-tests/src/test/resources/content/remote/fullPage.html b/knotx-it-tests/src/test/resources/content/remote/fullPage.html
index 2733f34..1686389 100644
--- a/knotx-it-tests/src/test/resources/content/remote/fullPage.html
+++ b/knotx-it-tests/src/test/resources/content/remote/fullPage.html
@@ -21,71 +21,71 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="shortcut icon" href="http://cognifide.com/favicon.ico?v=2"/>
   <title>Knot.x</title>
-  <link href="https://bootswatch.com/4/superhero/bootstrap.min.css" rel="stylesheet"/>
+  <link href="https://bootswatch.com/4/simplex/bootstrap.min.css" rel="stylesheet"/>
 </head>
 <body>
-  <div class="container-fluid">
-    <div class="row">
-      <div class="col-md-12">
-        <div class="jumbotron">
-          <h2>
-            Hello Knot.x - reactive micro-service assembler world!
-          </h2>
-          <p>
-            This template is served from the <strong>local</strong> repository.
-          </p>
-          <p>
-            <a class="btn btn-primary btn-large"
-               href="https://github.com/Cognifide/knotx">Learn more</a>
-          </p>
-        </div>
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-12">
+      <div class="jumbotron">
+        <h2>
+          Hello Knot.x - reactive micro-service assembler world!
+        </h2>
+        <p>
+          This template is served from the <strong>local</strong> repository.
+        </p>
+        <p>
+          <a class="btn btn-primary btn-large"
+             href="https://github.com/Cognifide/knotx">Learn more</a>
+        </p>
       </div>
     </div>
-    <div class="row">
-      <knotx:snippet knots="databridge,te"
-                     it-test-databridge-name-author="authors"
-                     it-test-databridge-name-book="books"
-                     type="text/knotx-snippet">
-        <div class="col-md-4">
-          <h2>Book</h2>
-          <p>{{book._result.title}}</p>
-          <p>Authors: {{book._result.info.authors}}</p>
-          <div>Success! Status code : {{book._response.statusCode}}</div>
-        </div>
-        <div class="col-md-4">
-          <h2>Author</h2>
-          <p>{{author._result.name}}</p>
-          <p>Bio: {{author._result.info.bio}}</p>
-          <div>Success! Status code : {{author._response.statusCode}}</div>
-        </div>
-      </knotx:snippet>
-    </div>
-    <div class="row">
+  </div>
+  <div class="row">
+    <knotx:snippet flow="knotx.knot.databridge,knotx.knot.te"
+                   databridge-name-author="authors"
+                   databridge-name-book="books"
+                   type="text/knotx-snippet">
       <div class="col-md-4">
-        <knotx:snippet knots="databridge,te"
-                       databridge-name="authors"
-                       type="text/knotx-snippet">
-          <h2>Portfolio: </h2>
-          <ul>
-            {{#each _result.info.portfolio}}
-            <li>{{this}}</li>
-            {{/each}}
-          </ul>
-        </knotx:snippet>
+        <h2>Book</h2>
+        <p>{{book._result.title}}</p>
+        <p>Authors: {{book._result.info.authors}}</p>
+        <div>Success! Status code : {{book._response.statusCode}}</div>
       </div>
       <div class="col-md-4">
-        <knotx:snippet knots="databridge,te"
-                       databridge-name="books"
-                       type="text/knotx-snippet">
-          <h2>Tags: </h2>
-          <ul>
-            {{#each _result.info.tags}}
-            <li>{{this}}</li>
-            {{/each}}
-          </ul>
-        </knotx:snippet>
+        <h2>Author</h2>
+        <p>{{author._result.name}}</p>
+        <p>Bio: {{author._result.info.bio}}</p>
+        <div>Success! Status code : {{author._response.statusCode}}</div>
       </div>
+    </knotx:snippet>
+  </div>
+  <div class="row">
+    <div class="col-md-4">
+      <knotx:snippet flow="knotx.knot.databridge,knotx.knot.te"
+                     databridge-name="authors"
+                     type="text/knotx-snippet">
+        <h2>Portfolio: </h2>
+        <ul>
+          {{#each _result.info.portfolio}}
+          <li>{{this}}</li>
+          {{/each}}
+        </ul>
+      </knotx:snippet>
+    </div>
+    <div class="col-md-4">
+      <knotx:snippet flow="knotx.knot.databridge,knotx.knot.te"
+                     databridge-name="books"
+                     type="text/knotx-snippet">
+        <h2>Tags: </h2>
+        <ul>
+          {{#each _result.info.tags}}
+          <li>{{this}}</li>
+          {{/each}}
+        </ul>
+      </knotx:snippet>
     </div>
   </div>
+</div>
 </body>
 </html>
diff --git a/knotx-it-tests/src/test/resources/results/brokenService.html b/knotx-it-tests/src/test/resources/results/brokenService.html
index bc420c9..72f8cc1 100644
--- a/knotx-it-tests/src/test/resources/results/brokenService.html
+++ b/knotx-it-tests/src/test/resources/results/brokenService.html
@@ -22,7 +22,7 @@
 <body>
   <div>
     <h2>I'm still working!</h2>
-    <p>Status code: 500</p>
+    <p>Status code: {{_response.statusCode}}</p>
   </div>
 </body>
 </html>
diff --git a/knotx-it-tests/src/test/resources/service/broken/500.json b/knotx-it-tests/src/test/resources/service/broken/500.json
new file mode 100644
index 0000000..2b452eb
--- /dev/null
+++ b/knotx-it-tests/src/test/resources/service/broken/500.json
@@ -0,0 +1 @@
+Internal Server Error
diff --git a/knotx-stack-manager/pom.xml b/knotx-stack-manager/pom.xml
index 3517112..5364dd4 100644
--- a/knotx-stack-manager/pom.xml
+++ b/knotx-stack-manager/pom.xml
@@ -32,7 +32,7 @@
   <properties>
     <aether.version>1.1.0</aether.version>
     <knotx.version>${project.version}</knotx.version>
-    <vertx.version>3.6.2</vertx.version> <!-- used in configurations, do not remove -->
+    <vertx.version>3.6.3</vertx.version> <!-- used in configurations, do not remove -->
 
     <finalName>knotx-${project.version}</finalName>
     <asciidoc.dir>${project.basedir}/src/main/asciidoc</asciidoc.dir>
diff --git a/knotx-stack-manager/src/main/descriptor/knotx-stack.json b/knotx-stack-manager/src/main/descriptor/knotx-stack.json
index 3b7710b..53e9999 100644
--- a/knotx-stack-manager/src/main/descriptor/knotx-stack.json
+++ b/knotx-stack-manager/src/main/descriptor/knotx-stack.json
@@ -19,51 +19,53 @@
     "knotx.version": "${knotx.version}"
   },
   "dependencies": [
-    // Knot.x dependencies
+    // Knot.x Launcher
     {
       "groupId": "io.knotx",
-      "artifactId": "knotx-core",
+      "artifactId": "knotx-launcher",
       "version": "\${knotx.version}",
       "included": true
     },
+    // Knot.x Server
     {
       "groupId": "io.knotx",
-      "artifactId": "knotx-knot-action",
+      "artifactId": "knotx-server-http-core",
       "version": "\${knotx.version}",
       "included": true
     },
     {
       "groupId": "io.knotx",
-      "artifactId": "knotx-adapter-common",
+      "artifactId": "knotx-splitter-html",
       "version": "\${knotx.version}",
       "included": true
     },
-    // Knot.x Template Engine
     {
       "groupId": "io.knotx",
-      "artifactId": "knotx-template-engine-api",
+      "artifactId": "knotx-assembler",
       "version": "\${knotx.version}",
       "included": true
     },
+    // Knot.x Repositories
     {
       "groupId": "io.knotx",
-      "artifactId": "knotx-template-engine-core",
+      "artifactId": "knotx-repository-connector-http",
       "version": "\${knotx.version}",
       "included": true
     },
+    // Knot.x Knot Engine
     {
       "groupId": "io.knotx",
-      "artifactId": "knotx-template-engine-handlebars",
+      "artifactId": "knotx-knot-engine-core",
       "version": "\${knotx.version}",
       "included": true
     },
-    // Knot.x Data Bridge
     {
       "groupId": "io.knotx",
-      "artifactId": "knotx-databridge-api",
+      "artifactId": "knotx-knot-engine-handler",
       "version": "\${knotx.version}",
       "included": true
     },
+    // Knot.x Data Bridge
     {
       "groupId": "io.knotx",
       "artifactId": "knotx-databridge-core",
@@ -76,16 +78,16 @@
       "version": "\${knotx.version}",
       "included": true
     },
-    // Knot.x Forms
+    // Knot.x Template Engine
     {
       "groupId": "io.knotx",
-      "artifactId": "knotx-forms-api",
+      "artifactId": "knotx-template-engine-core",
       "version": "\${knotx.version}",
       "included": true
     },
     {
       "groupId": "io.knotx",
-      "artifactId": "knotx-forms-core",
+      "artifactId": "knotx-template-engine-handlebars",
       "version": "\${knotx.version}",
       "included": true
     },
diff --git a/knotx-stack-manager/src/main/packaging/conf/application.conf b/knotx-stack-manager/src/main/packaging/conf/application.conf
index ec79341..bc31cba 100644
--- a/knotx-stack-manager/src/main/packaging/conf/application.conf
+++ b/knotx-stack-manager/src/main/packaging/conf/application.conf
@@ -1,141 +1,12 @@
 ########### Modules to start ###########
-# You need to specify a list of verticle to be started by Knot.x
+# Modules array specify a list of verticles to be started by Knot.x.
 # Each line should have a form of <alias>=<verticle-class-name>
 # where alias is just a name that you can use later in order to define configuration for the module
-# verticle-class-name is a fully qualified class name of the verticle
+# verticle-class-name is a fully qualified class name of the verticle.
 #
-# If you want to test the configuration you can simply comment out or remove unnecessary modules
-modules = [
-  "server=io.knotx.server.KnotxServerVerticle"
-  "httpRepo=io.knotx.repository.http.HttpRepositoryConnectorVerticle"
-  "splitter=io.knotx.splitter.FragmentSplitterVerticle"
-  "assembler=io.knotx.assembler.FragmentAssemblerVerticle"
-  "dataBridge=io.knotx.databridge.core.DataBridgeKnot"
-  "dataSourceHttp=io.knotx.databridge.http.HttpDataSourceAdapter"
-  "templateEngine=io.knotx.te.core.TemplateEngineKnot"
-  # If you're using form submission uncomment here and configure includes/forms.conf
-  #
-  # "formsKnot=io.knotx.forms.core.FormsKnot"
+# This array is filled in included files.
+modules = []
 
-  # And you can put here any custom modules/verticles with the configurations in below sections
-]
-
-########### Globals ###########
-global {
-  serverPort = 8092
-
-  snippetOptions {
-    # Knot.x snippet HTML tag name. Default is 'script'.
-    # Change here if you want to use different tag name, e.g. 'knotx:snippet'
-    tagName = script
-
-    # This prefix will start every snippet parameter in the snippet tag.
-    # You may set it to 'data-xxxx-' when snippet tag name is an HTML tag to keep HTML5 data naming
-    # compliance, e.g. when you set it to 'data-knotx-', snippet params will look like:
-    # <script data-knotx-knotx="someKnot, handlebars"
-    #         data-knotx-someKnot-param-name="XYZ" >
-    paramsPrefix = data-knotx-
-
-
-    # You can configure default fallback configuration. This alters the way snippet processing errors are handled.
-    # Default behavior is to terminate the rendering process and return a 500 error.
-    # With fallback enabled alternative markup will be rendered by default for any failing snippet.
-    # It should allow the rendering process to complete and render the page with a 200 OK status - even if
-    # some snippet processing errors occurred.
-    #
-    # defaultFallback = MY_GLOBAL_ID
-    # fallbacks = [
-    #   {
-    #     id = MY_GLOBAL_ID
-    #     markup = "<p class='error'>error</p>"
-    #   }
-    # ]
-  }
-
-  assembler.address = knotx.core.assembler
-  splitter.address = knotx.core.splitter
-
-  repositories {
-    httpRepo.address = knotx.core.repository.http
-    # fileSystemRepo.address = knotx.core.repository.filesystem
-  }
-
-  # Knot.x Forms
-  forms.address = knotx.knot.forms
-
-  # Data Bridge globals
-  bridge {
-    address = knotx.knot.databridge
-    dataSource {
-      http.address = knotx.bridge.datasource.http
-    }
-  }
-
-  # Knot.x Template Engine
-  templateEngine.address = knotx.knot.te
-}
-
-########### Modules configurations ###########
-config.server {
-  options.config {
-    include required("includes/server.conf")
-  }
-
-  # The options object carries-on configuration called DeploymentOptions for a given verticle.
-  # It allows you to control the verticle behaviour, such as how many instances, classpath isolation, workers, etc.
-  # See available options http://vertx.io/docs/vertx-core/dataobjects.html#DeploymentOptions
-  #
-  # options {}
-}
-
-config.httpRepo {
-  options.config {
-    include required("includes/httpRepo.conf")
-  }
-}
-
-config.splitter.options.config {
-  # Event bus address on which splitter is listening on. Default is 'knotx.core.splitter'
-  address = ${global.splitter.address} # Do not change
-
-  # Knot.x snippet options. Configures e.g. HTML tag name (default is 'script') and snippet
-  # params prefix (default is "data-knotx-")
-  snippetOptions = ${global.snippetOptions} # Do not change
-}
-
-config.assembler.options.config {
-  # Event bus address on which splitter is listening on. Default is 'knotx.core.assembler'
-  address = ${global.assembler.address} # Do not change
-
-  # Knot.x snippet options. Configures e.g. HTML tag name (default is 'script') and snippet
-  # params prefix (default is "data-knotx-")
-  snippetOptions = ${global.snippetOptions} # Do not change
-
-  # Strategy how to assembly markup with snippets that were not processed by any Knot. Default is UNWRAP
-  # Allowed values are: AS_IS, IGNORE, UNWRAP
-  # unprocessedStrategy =
-}
-
-config.templateEngine {
-  options.config {
-    include required(classpath("includes/templateEngine.conf"))
-  }
-}
-
-config.formsKnot {
-  options.config {
-    include required("includes/forms.conf")
-  }
-}
-
-config.dataBridge {
-  options.config {
-    include required("includes/dataBridge.conf")
-  }
-}
-
-config.dataSourceHttp {
-  options.config {
-    include required("includes/dataSourceHttp.conf")
-  }
-}
+include required(classpath("conf/server.conf"))
+include required(classpath("conf/knots/dataBridgeStack.conf"))
+include required(classpath("conf/knots/templateEngineStack.conf"))
diff --git a/knotx-stack-manager/src/main/packaging/conf/includes/dataBridge.conf b/knotx-stack-manager/src/main/packaging/conf/includes/dataBridge.conf
deleted file mode 100644
index f6e2c1b..0000000
--- a/knotx-stack-manager/src/main/packaging/conf/includes/dataBridge.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# Event bus settings
-address = ${global.bridge.address}
-
-# List of mappings between service aliases and datasources.
-# You can define here as many service definitions as required for your project.
-dataDefinitions = [
-  # Definition of the single datasource to be used in the HTML snippets.
-  # You can define an array of such services here.
-  {
-    # Name of the service that will be used in HTML snippets
-    #
-    name = example-service
-
-    # Event bus address of the datasource that is responsible for handling physicall communication
-    # with a data source
-    # Remember that this addres should be exacly the same as one defined in datasource config
-    #
-    adapter = ${global.bridge.dataSource.http.address}
-
-    # Arbitrary parameters to be send to datasource.
-    # Keep in mind, the actuall parameters to be send are the params object from HTML snippet
-    # merged with values defined here.
-    #
-    params {}
-  }
-]
-
-# Vert.x event bus delivery options used when communicating with other verticles
-# see http://vertx.io/docs/vertx-core/dataobjects.html#DeliveryOptions for the details what can be configured
-#
-# deliveryOptions {}
diff --git a/knotx-stack-manager/src/main/packaging/conf/includes/forms.conf b/knotx-stack-manager/src/main/packaging/conf/includes/forms.conf
deleted file mode 100644
index 2ee5967..0000000
--- a/knotx-stack-manager/src/main/packaging/conf/includes/forms.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# Event bus address of the Forms Knot
-address = ${global.forms.address}
-
-# Array of adapters that will be responsible for communicating with external services in order to
-# process client requests (form submisions).
-adapters = [
-  {
-    # Name of the action service that will be used on html snippet level.
-    #
-    # name =
-
-    # Event bus address of the action adapter to be used for a given name
-    #
-    # address =
-
-    # Arbitrary parameters to be send to action adapter.
-    # Keep in mind, the actuall parameters to be send are the params object from HTML snippet
-    # merged with values defined here.
-    #
-    # params {}
-
-    # list of allowed request header names that are passed to the adapter
-    #
-    # allowedRequestHeaders = []
-
-    # List of the response headers that are send back to the Knot.x and finally to the client
-    #
-    # allowedResponseHeaders = []
-  }
-]
-
-# Name of the hidden input tag which is added by Action Knot.
-formIdentifierName = _frmId
-
-# Vert.x event bus delivery options used when communicating with other verticles
-# see http://vertx.io/docs/vertx-core/dataobjects.html#DeliveryOptions for the details what can be configured
-#
-# deliveryOptions {}
diff --git a/knotx-stack-manager/src/main/packaging/conf/includes/server.conf b/knotx-stack-manager/src/main/packaging/conf/includes/server.conf
deleted file mode 100644
index 687d516..0000000
--- a/knotx-stack-manager/src/main/packaging/conf/includes/server.conf
+++ /dev/null
@@ -1,232 +0,0 @@
-# Configuraiton of HTTP server
-serverOptions {
-  # Knot.x server HTTP port
-  port = ${global.serverPort}
-
-  # If you want a server to serve SSL connections you can configure it here
-  #
-  # Enable SSL
-  # ssl = true
-  #
-  # Path on the server the keystore.jks file is located
-  # keyStoreOptions.path =
-  #
-  # Keystore password
-  # keyStoreOptions.password =
-}
-
-# Open API Spec file location
-apiDefinitionFile = "/server-api.yaml"
-
-# List of HTTP operations defined in Open API Spec.
-operations = [
-  {
-    id = templating
-    handlers = [
-#      {
-#        # CSRF protection related global configuration
-#        name = csrfHandler
-#        config {
-#          # A CSRF cookie name. Default is XSRF-TOKEN
-#          # cookieName =
-#
-#          # CSRF Cookie path. Default is /
-#          # cookiePath =
-#
-#          # Expected CSRF header name. Default is X-XSRF-TOKEN
-#          #
-#          # headerName =
-#
-#          # A secret used to initialize CSRF value generation.
-#          # If not set a randomly generated 20 character long value will be used
-#          #
-#          # secret =
-#
-#          # THe CSRF token expiration time in milliseconds. Default is 30 minutes (1800000)
-#          #
-#          # timeout =
-#        }
-#      }
-      {
-        name = knotContextHandler
-      }
-      {
-        name = repositoryHandler
-        config.proxyAddress = ${global.repositories.httpRepo.address}
-        config.doProcessing = true
-        config.allowedResponseHeaders = ${config.server.options.config.allowedResponseHeaders}
-      }
-      {
-        name = splitterHandler
-        config.proxyAddress = ${global.splitter.address} # Do not change
-      }
-      {
-        # Here you can define set of routing rules for Knot processing.
-        name = knotEngineHandler
-        config.routing {
-          address = ${global.bridge.address}
-          onTransition.next {
-            address = ${global.templateEngine.address}
-          }
-          #  # Event bus address of the first Knot that should process the request and template got from the repository
-          #  address = my.eventbus.address or ${global.address.knot.something}
-          #
-          #  # Define a transition to next Knot in the processing chain.
-          #  onTransition {
-          #    # Previous Knot might generate multiple transition signals. Here you can define
-          #    # what will happen on this transition. By default all core Knots generates 'next' transition
-          #    # after successfull processing.
-          #    #
-          #    next {
-          #      # Define event bus address of Knot that should process the payload if transition will occur
-          #      # address =
-          #      #
-          #      # Define transition to next Knot if required
-          #      # onTransition {}
-          #    }
-          #  }
-        }
-        # config.deliveryOptions =
-      }
-      {
-        name = fallbackHandler
-        config {
-          defaultFallback = BLANK
-        }
-      }
-      {
-        name = assemblerHandler
-        config.proxyAddress = ${global.assembler.address} # Do not change
-        config.allowedResponseHeaders = ${config.server.options.config.allowedResponseHeaders}
-      }
-      # Statically defined HTTP response header returned to the client in every HTTP response
-      {
-        name = headerHandler
-        config.name = X-Server
-        config.value = Knot.x
-      }
-      {
-        name = writerHandler
-        # List of HTTP response headers Knot.x can return to the client
-        config.allowedResponseHeaders = [
-          Access-Control-Allow-Origin
-          Allow
-          Cache-Control
-          Content-Disposition
-          Content-Encoding
-          Content-Language
-          Content-Location
-          Content-MD5
-          Content-Range
-          Content-Type
-          Content-Length
-          Content-Security-Policy
-          Date
-          Edge-Control
-          ETag
-          Expires
-          Last-Modified
-          Location
-          Pragma
-          Proxy-Authenticate
-          Server
-          Set-Cookie
-          Status
-          Surrogate-Control
-          Vary
-          Via
-          X-Frame-Options
-          X-XSRF-TOKEN
-          X-XSS-Protection
-          X-Content-Type-Options
-          X-UA-Compatible
-          X-Request-ID
-          X-Server
-        ]
-      }
-    ]
-  }
-]
-
-# List of HTTP response headers Knot.x can return to the client for specific operation
-allowedResponseHeaders = [
-  Access-Control-Allow-Origin
-  Allow
-  Cache-Control
-  Content-Disposition
-  Content-Encoding
-  Content-Language
-  Content-Location
-  Content-MD5
-  Content-Range
-  Content-Type
-  Content-Length
-  Content-Security-Policy
-  Date
-  Edge-Control
-  ETag
-  Expires
-  Last-Modified
-  Location
-  Pragma
-  Proxy-Authenticate
-  Server
-  Set-Cookie
-  Status
-  Surrogate-Control
-  Vary
-  Via
-  X-Frame-Options
-  X-XSS-Protection
-  X-Content-Type-Options
-  X-UA-Compatible
-  X-Request-ID
-  X-Server
-]
-
-# Statically defined HTTP response header returned to the client in every HTTP response
-customResponseHeader {
-  name = X-Server
-  value = Knot.x
-}
-
-# Vert.x event bus delivery options used when communicating with other verticles
-# see http://vertx.io/docs/vertx-core/dataobjects.html#DeliveryOptions for the details what can be configured
-#
-# deliveryOptions {}
-
-# Configuraiton of the HTTP Server access log (templating and gatway modes shares the same access log)
-accessLog {
-  enabled = true # Enable/Disable access log
-
-  # Whether to log after request arrives (true), or after sending response (false). Default is false
-  # immediate =
-
-  # Access log format. Default is DEFAULT
-  # Available formats: DEFAULT, SHORT, TINY
-  # format =
-}
-
-# Enable/Disable stack traces on the error pages. Disable it on production
-displayExceptionDetails = true
-
-# Limit of uploaded file size in bytes. Default is -1 (unlimited).
-# fileUploadLimit =
-
-# Folder where uploaded files will be stored. Default is file-uploads folder in current working directory.
-# fileUploadDirectory =
-
-####### Server backpressure section ########
-
-# Enable/Disable request dropping feature (backpressure). Default is disabled
-dropRequests = false
-
-# If dropRequest is enabled, a dropped requests will got HTTP response with a status code defined here. Default is 429 (Too many requests)
-# dropRequestResponseCode =
-
-# Defines a backpressure capacity buffer used when dropRequests is enabled. Default is 1000 slots
-# backpressureBufferCapacity =
-
-# A strategy how the requests are dropped (if the backpressure buffer is full). Default is DROP_LATEST.
-# Available values: ERROR (terminate a sequence), DROP_LATEST, DROP_OLDEST
-# backpressureStrategy =
diff --git a/knotx-stack-manager/src/main/packaging/conf/knots/dataBridgeKnot.conf b/knotx-stack-manager/src/main/packaging/conf/knots/dataBridgeKnot.conf
new file mode 100644
index 0000000..e0c0ec2
--- /dev/null
+++ b/knotx-stack-manager/src/main/packaging/conf/knots/dataBridgeKnot.conf
@@ -0,0 +1,28 @@
+# List of mappings between service aliases and datasources.
+# You can define here as many service definitions as required for your project.
+dataDefinitions = [
+  # Definition of the single datasource to be used in the HTML snippets.
+  # You can define an array of such services here.
+  # {
+  #   # Name of the service that will be used in HTML snippets
+  #   #
+  #   name = example-service
+  #
+  #   # Event bus address of the datasource that is responsible for handling physicall communication
+  #   # with a data source
+  #   # Remember that this addres should be exacly the same as one defined in datasource config
+  #   #
+  #   adapter = ${global.bridge.dataSource.http.address}
+  #
+  #   # Arbitrary parameters to be send to datasource.
+  #   # Keep in mind, the actuall parameters to be send are the params object from HTML snippet
+  #   # merged with values defined here.
+  #   #
+  #   params {}
+  # }
+]
+
+# Vert.x event bus delivery options used when communicating with other verticles
+# see http://vertx.io/docs/vertx-core/dataobjects.html#DeliveryOptions for the details what can be configured
+#
+# deliveryOptions {}
diff --git a/knotx-stack-manager/src/main/packaging/conf/includes/dataSourceHttp.conf b/knotx-stack-manager/src/main/packaging/conf/knots/dataBridgeSourceHttp.conf
similarity index 97%
rename from knotx-stack-manager/src/main/packaging/conf/includes/dataSourceHttp.conf
rename to knotx-stack-manager/src/main/packaging/conf/knots/dataBridgeSourceHttp.conf
index 6e78d27..2a40063 100644
--- a/knotx-stack-manager/src/main/packaging/conf/includes/dataSourceHttp.conf
+++ b/knotx-stack-manager/src/main/packaging/conf/knots/dataBridgeSourceHttp.conf
@@ -1,5 +1,5 @@
 # Event bus address of the Basic HTTP Datasource
-address = ${global.bridge.dataSource.http.address}
+address = ${global.dataBridge.dataSource.http.address}
 
 clientOptions {
   maxPoolSize = 1000
diff --git a/knotx-stack-manager/src/main/packaging/conf/knots/dataBridgeStack.conf b/knotx-stack-manager/src/main/packaging/conf/knots/dataBridgeStack.conf
new file mode 100644
index 0000000..db28945
--- /dev/null
+++ b/knotx-stack-manager/src/main/packaging/conf/knots/dataBridgeStack.conf
@@ -0,0 +1,27 @@
+########### Globals ###########
+global {
+  # Data Bridge globals
+  dataBridge {
+    dataSource {
+      http.address = datasource.http
+    }
+  }
+}
+
+########### Data Bridge Stack ###########
+modules = ${modules} [
+  "dataBridge=io.knotx.databridge.core.DataBridgeKnot"
+  "dataSourceHttp=io.knotx.databridge.http.HttpDataSourceAdapter"
+]
+
+########### Modules configurations ###########
+config.dataBridge {
+  options.config {
+    include required(classpath("conf/knots/dataBridgeKnot.conf"))
+  }
+}
+config.dataSourceHttp {
+  options.config {
+    include required(classpath("conf/knots/dataBridgeSourceHttp.conf"))
+  }
+}
diff --git a/knotx-stack-manager/src/main/packaging/conf/includes/templateEngine.conf b/knotx-stack-manager/src/main/packaging/conf/knots/templateEngineKnot.conf
similarity index 94%
rename from knotx-stack-manager/src/main/packaging/conf/includes/templateEngine.conf
rename to knotx-stack-manager/src/main/packaging/conf/knots/templateEngineKnot.conf
index 575ac0f..a6e713e 100644
--- a/knotx-stack-manager/src/main/packaging/conf/includes/templateEngine.conf
+++ b/knotx-stack-manager/src/main/packaging/conf/knots/templateEngineKnot.conf
@@ -1,5 +1,3 @@
-# Event bus settings
-address = ${global.templateEngine.address}
 # Vert.x event bus delivery options used when communicating with other verticles
 # see http://vertx.io/docs/vertx-core/dataobjects.html#DeliveryOptions for the details what can be configured
 # deliveryOptions {}
diff --git a/knotx-stack-manager/src/main/packaging/conf/knots/templateEngineStack.conf b/knotx-stack-manager/src/main/packaging/conf/knots/templateEngineStack.conf
new file mode 100644
index 0000000..a5e6823
--- /dev/null
+++ b/knotx-stack-manager/src/main/packaging/conf/knots/templateEngineStack.conf
@@ -0,0 +1,11 @@
+########### Data Bridge Stack ###########
+modules = ${modules} [
+  "templateEngine=io.knotx.te.core.TemplateEngineKnot"
+]
+
+########### Modules configurations ###########
+config.templateEngine {
+  options.config {
+    include required(classpath("conf/knots/templateEngineKnot.conf"))
+  }
+}
diff --git a/knotx-stack-manager/src/main/packaging/conf/open-api.yaml b/knotx-stack-manager/src/main/packaging/conf/openapi.yaml
similarity index 94%
rename from knotx-stack-manager/src/main/packaging/conf/open-api.yaml
rename to knotx-stack-manager/src/main/packaging/conf/openapi.yaml
index 0287cbc..1793d6d 100644
--- a/knotx-stack-manager/src/main/packaging/conf/open-api.yaml
+++ b/knotx-stack-manager/src/main/packaging/conf/openapi.yaml
@@ -23,7 +23,7 @@ servers:
 paths:
   /content/*:
     get:
-      operationId: templating
+      operationId: operation-get
       responses:
         default:
           description: remote repository response with templating
diff --git a/knotx-stack-manager/src/main/packaging/conf/includes/httpRepo.conf b/knotx-stack-manager/src/main/packaging/conf/routes/handlers/httpRepoConnectorHandler.conf
similarity index 88%
rename from knotx-stack-manager/src/main/packaging/conf/includes/httpRepo.conf
rename to knotx-stack-manager/src/main/packaging/conf/routes/handlers/httpRepoConnectorHandler.conf
index cf9955c..0b23ca6 100644
--- a/knotx-stack-manager/src/main/packaging/conf/includes/httpRepo.conf
+++ b/knotx-stack-manager/src/main/packaging/conf/routes/handlers/httpRepoConnectorHandler.conf
@@ -1,7 +1,3 @@
-# Event bus address on which the HTTP repository connector listens on. Default is 'knotx.core.repository.http'
-#
-address = ${global.repositories.httpRepo.address}
-
 # Vert.x event bus delivery options used when communicating with other verticles
 # see http://vertx.io/docs/vertx-core/dataobjects.html#HttpClientOptions for the details what can be configured
 #
@@ -29,10 +25,10 @@ clientDestination {
   scheme = http
 
   # domain or the IP of the host: e.g. localhost, 10.0.11.2
-  domain = changeme
+  domain = localhost
 
   ## Port on which the host listens, e.g. 8080, 3001, etc.
-  port = 1234 #Changeme
+  port = 80
 
   # Host header override to be used with a communication to the repository. If it's set, it overrides any value in the 'Host' header, and sets the SNI SSL to the same value.
   # hostHeader =
@@ -48,7 +44,6 @@ allowedRequestHeaders = [
   Cookie
   Date
   "Edge.*"
-  Host
   "If.*"
   Origin
   Pragma
diff --git a/knotx-stack-manager/src/main/packaging/conf/routes/handlers/knotEngineHandler.conf b/knotx-stack-manager/src/main/packaging/conf/routes/handlers/knotEngineHandler.conf
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/knotx-stack-manager/src/main/packaging/conf/routes/handlers/knotEngineHandler.conf
@@ -0,0 +1 @@
+
diff --git a/knotx-stack-manager/src/main/packaging/conf/routes/operation-get.conf b/knotx-stack-manager/src/main/packaging/conf/routes/operation-get.conf
new file mode 100644
index 0000000..7129cb8
--- /dev/null
+++ b/knotx-stack-manager/src/main/packaging/conf/routes/operation-get.conf
@@ -0,0 +1,21 @@
+routingOperations = ${routingOperations} [
+  {
+    operationId = operation-get
+    handlers = ${config.server.handlers.common.request} [
+      {
+        name = httpRepoConnectorHandler
+        config = { include required(classpath("conf/routes/handlers/httpRepoConnectorHandler.conf")) }
+      },
+      {
+        name = splitterHandler
+      },
+      {
+        name = knotEngineHandler
+        config = { include required(classpath("conf/routes/handlers/knotEngineHandler.conf")) }
+      },
+      {
+        name = assemblerHandler
+      }
+    ] ${config.server.handlers.common.response}
+  }
+]
diff --git a/knotx-stack-manager/src/main/packaging/conf/server.conf b/knotx-stack-manager/src/main/packaging/conf/server.conf
new file mode 100644
index 0000000..83481fd
--- /dev/null
+++ b/knotx-stack-manager/src/main/packaging/conf/server.conf
@@ -0,0 +1,73 @@
+########### Knot.x Server ###########
+modules = ${modules} [
+  "server=io.knotx.server.KnotxServerVerticle"
+]
+
+########### Modules configurations ###########
+config.server {
+  handlers.common {
+    request = [
+      {
+        name = cookieHandler
+      },
+      {
+        name = bodyHandler
+      },
+      {
+        name = requestContextHandler
+      }
+    ],
+    response = [
+      {
+        name = headerHandler
+        # Statically defined HTTP response header returned to the client in every HTTP response
+        config {
+          name = X-Server
+          value = Knot.x-Custom-Header
+        }
+      },
+      {
+        name = writerHandler
+        # List of HTTP response headers Knot.x can return to the client
+        config.allowedResponseHeaders = [
+          Access-Control-Allow-Origin
+          Content-Type
+          Content-Length
+        ]
+      }
+    ]
+  }
+  options.config {
+    # Configuraiton of HTTP server
+    serverOptions {
+      # Knot.x server HTTP port
+      port = 9092
+
+      # If you want a server to serve SSL connections you can configure it here
+      #
+      # Enable SSL
+      # ssl = true
+      #
+      # Path on the server the keystore.jks file is located
+      # keyStoreOptions.path =
+      #
+      # Keystore password
+      # keyStoreOptions.password =
+    }
+
+    # Location of your Open API spec. It can be an absolute path, a local path or remote url (with HTTP protocol).
+    routingSpecificationLocation = /openapi.yaml
+
+    displayExceptionDetails = true
+    dropRequests = false
+
+    routingOperations = []
+    include required(classpath("conf/routes/operation-get.conf"))
+  }
+
+  # The options object carries-on configuration called DeploymentOptions for a given verticle.
+  # It allows you to control the verticle behaviour, such as how many instances, classpath isolation, workers, etc.
+  # See available options http://vertx.io/docs/vertx-core/dataobjects.html#DeploymentOptions
+  #
+  # options {}
+}