diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml
index bb14f329..cec75245 100644
--- a/.github/workflows/build-timestamped-master.yml
+++ b/.github/workflows/build-timestamped-master.yml
@@ -35,12 +35,5 @@ jobs:
           publishPAT: ${{ secrets.BALLERINA_BOT_TOKEN }}
         run: |
           ./gradlew publish --scan --no-daemon
-      - name: Archive Error Log
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: Ballerina Internal Log
-          path: websub-ballerina/ballerina-internal.log
-          if-no-files-found: ignore
       - name: Generate Codecov Report
         uses: codecov/codecov-action@v1
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index ab73dfa3..5180316d 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -19,13 +19,6 @@ jobs:
           packageUser: ${{ github.actor }}
           packagePAT: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew build --scan
-      - name: Archive Error Log
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: Ballerina Internal Log
-          path: websub-ballerina/ballerina-internal.log
-          if-no-files-found: ignore
       - name: Generate Codecov Report
         if:  github.event_name == 'pull_request'
         uses: codecov/codecov-action@v1
diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml
new file mode 100644
index 00000000..6d4dec6f
--- /dev/null
+++ b/ballerina/Ballerina.toml
@@ -0,0 +1,55 @@
+[package]
+org = "ballerina"
+name = "websub"
+version = "@toml.version@"
+
+[[platform.java11.dependency]]
+path = "../native/build/libs/websub-native-@project.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/http-native-@http.native.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-common-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-buffer-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-transport-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-resolver-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-handler-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-codec-http-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-codec-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-handler-proxy-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-codec-http2-@netty.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/commons-pool-@wso2commonspool.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/snakeyaml-@wso2snakeyaml.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/bcprov-jdk15on-@bouncycastle.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/bcpkix-jdk15on-@bouncycastle.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/netty-tcnative-boringssl-static-@nettytcnative.version@.jar"
+
+[[platform.java11.dependency]]
+path = "./lib/org.wso2.carbon.metrics.core-@wso2carbonmetrics.version@.jar"
diff --git a/websub-ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml
similarity index 55%
rename from websub-ballerina/CompilerPlugin.toml
rename to ballerina/CompilerPlugin.toml
index 100136e4..4616ca9e 100644
--- a/websub-ballerina/CompilerPlugin.toml
+++ b/ballerina/CompilerPlugin.toml
@@ -3,4 +3,4 @@ id = "websub-compiler-plugin"
 class = "io.ballerina.stdlib.websub.WebSubCompilerPlugin"
 
 [[dependency]]
-path = "../websub-compiler-plugin/build/libs/websub-compiler-plugin-@project.version@.jar"
+path = "../compiler-plugin/build/libs/websub-compiler-plugin-@project.version@.jar"
diff --git a/websub-ballerina/Dependencies.toml b/ballerina/Dependencies.toml
similarity index 100%
rename from websub-ballerina/Dependencies.toml
rename to ballerina/Dependencies.toml
diff --git a/websub-ballerina/Module.md b/ballerina/Module.md
similarity index 100%
rename from websub-ballerina/Module.md
rename to ballerina/Module.md
diff --git a/websub-ballerina/Package.md b/ballerina/Package.md
similarity index 100%
rename from websub-ballerina/Package.md
rename to ballerina/Package.md
diff --git a/websub-ballerina/annotation.bal b/ballerina/annotation.bal
similarity index 100%
rename from websub-ballerina/annotation.bal
rename to ballerina/annotation.bal
diff --git a/websub-ballerina/build.gradle b/ballerina/build.gradle
similarity index 98%
rename from websub-ballerina/build.gradle
rename to ballerina/build.gradle
index 45452c73..9a58c324 100644
--- a/websub-ballerina/build.gradle
+++ b/ballerina/build.gradle
@@ -113,7 +113,7 @@ dependencies {
     externalJars(group: 'org.wso2.carbon.metrics', name: 'org.wso2.carbon.metrics.core', version: "${wso2CarbonMetricsVersion}") {
         transitive = false
     }
-    externalJars(group: 'org.ballerinalang', name: 'http-native', version: "${stdlibHttpVersion}") {
+    externalJars(group: 'io.ballerina.stdlib', name: 'http-native', version: "${stdlibHttpVersion}") {
         transitive = false
     }
 }
diff --git a/websub-ballerina/commons.bal b/ballerina/commons.bal
similarity index 100%
rename from websub-ballerina/commons.bal
rename to ballerina/commons.bal
diff --git a/websub-ballerina/errors.bal b/ballerina/errors.bal
similarity index 100%
rename from websub-ballerina/errors.bal
rename to ballerina/errors.bal
diff --git a/websub-ballerina/http_service.bal b/ballerina/http_service.bal
similarity index 100%
rename from websub-ballerina/http_service.bal
rename to ballerina/http_service.bal
diff --git a/websub-ballerina/init.bal b/ballerina/init.bal
similarity index 100%
rename from websub-ballerina/init.bal
rename to ballerina/init.bal
diff --git a/websub-ballerina/native.bal b/ballerina/native.bal
similarity index 100%
rename from websub-ballerina/native.bal
rename to ballerina/native.bal
diff --git a/websub-ballerina/request_processor.bal b/ballerina/request_processor.bal
similarity index 100%
rename from websub-ballerina/request_processor.bal
rename to ballerina/request_processor.bal
diff --git a/websub-ballerina/resource_discovery.bal b/ballerina/resource_discovery.bal
similarity index 100%
rename from websub-ballerina/resource_discovery.bal
rename to ballerina/resource_discovery.bal
diff --git a/websub-ballerina/sub_listener.bal b/ballerina/sub_listener.bal
similarity index 100%
rename from websub-ballerina/sub_listener.bal
rename to ballerina/sub_listener.bal
diff --git a/websub-ballerina/subscriber_client.bal b/ballerina/subscriber_client.bal
similarity index 100%
rename from websub-ballerina/subscriber_client.bal
rename to ballerina/subscriber_client.bal
diff --git a/websub-ballerina/subscriber_service.bal b/ballerina/subscriber_service.bal
similarity index 100%
rename from websub-ballerina/subscriber_service.bal
rename to ballerina/subscriber_service.bal
diff --git a/websub-ballerina/tests/additional_external_error_data_test.bal b/ballerina/tests/additional_external_error_data_test.bal
similarity index 100%
rename from websub-ballerina/tests/additional_external_error_data_test.bal
rename to ballerina/tests/additional_external_error_data_test.bal
diff --git a/websub-ballerina/tests/basic_subscriber_test.bal b/ballerina/tests/basic_subscriber_test.bal
similarity index 100%
rename from websub-ballerina/tests/basic_subscriber_test.bal
rename to ballerina/tests/basic_subscriber_test.bal
diff --git a/websub-ballerina/tests/content_verification_test.bal b/ballerina/tests/content_verification_test.bal
similarity index 100%
rename from websub-ballerina/tests/content_verification_test.bal
rename to ballerina/tests/content_verification_test.bal
diff --git a/websub-ballerina/tests/default_method_impl_test.bal b/ballerina/tests/default_method_impl_test.bal
similarity index 100%
rename from websub-ballerina/tests/default_method_impl_test.bal
rename to ballerina/tests/default_method_impl_test.bal
diff --git a/websub-ballerina/tests/multi_service_listener_test.bal b/ballerina/tests/multi_service_listener_test.bal
similarity index 100%
rename from websub-ballerina/tests/multi_service_listener_test.bal
rename to ballerina/tests/multi_service_listener_test.bal
diff --git a/websub-ballerina/tests/optional_subscriber_target_test.bal b/ballerina/tests/optional_subscriber_target_test.bal
similarity index 100%
rename from websub-ballerina/tests/optional_subscriber_target_test.bal
rename to ballerina/tests/optional_subscriber_target_test.bal
diff --git a/websub-ballerina/tests/resources/ballerinaKeystore.pkcs12 b/ballerina/tests/resources/ballerinaKeystore.pkcs12
similarity index 100%
rename from websub-ballerina/tests/resources/ballerinaKeystore.pkcs12
rename to ballerina/tests/resources/ballerinaKeystore.pkcs12
diff --git a/websub-ballerina/tests/resources/ballerinaTruststore.pkcs12 b/ballerina/tests/resources/ballerinaTruststore.pkcs12
similarity index 100%
rename from websub-ballerina/tests/resources/ballerinaTruststore.pkcs12
rename to ballerina/tests/resources/ballerinaTruststore.pkcs12
diff --git a/websub-ballerina/tests/resources/ca_cert.pem b/ballerina/tests/resources/ca_cert.pem
similarity index 100%
rename from websub-ballerina/tests/resources/ca_cert.pem
rename to ballerina/tests/resources/ca_cert.pem
diff --git a/websub-ballerina/tests/resources/ca_cert.srl b/ballerina/tests/resources/ca_cert.srl
similarity index 100%
rename from websub-ballerina/tests/resources/ca_cert.srl
rename to ballerina/tests/resources/ca_cert.srl
diff --git a/websub-ballerina/tests/resources/ca_key.pem b/ballerina/tests/resources/ca_key.pem
similarity index 100%
rename from websub-ballerina/tests/resources/ca_key.pem
rename to ballerina/tests/resources/ca_key.pem
diff --git a/websub-ballerina/tests/resources/localhost.cnf b/ballerina/tests/resources/localhost.cnf
similarity index 100%
rename from websub-ballerina/tests/resources/localhost.cnf
rename to ballerina/tests/resources/localhost.cnf
diff --git a/websub-ballerina/tests/resources/localhost.csr b/ballerina/tests/resources/localhost.csr
similarity index 100%
rename from websub-ballerina/tests/resources/localhost.csr
rename to ballerina/tests/resources/localhost.csr
diff --git a/websub-ballerina/tests/resources/localhost_cert.pem b/ballerina/tests/resources/localhost_cert.pem
similarity index 100%
rename from websub-ballerina/tests/resources/localhost_cert.pem
rename to ballerina/tests/resources/localhost_cert.pem
diff --git a/websub-ballerina/tests/resources/localhost_key.pem b/ballerina/tests/resources/localhost_key.pem
similarity index 100%
rename from websub-ballerina/tests/resources/localhost_key.pem
rename to ballerina/tests/resources/localhost_key.pem
diff --git a/websub-ballerina/tests/service_path_generation_test.bal b/ballerina/tests/service_path_generation_test.bal
similarity index 100%
rename from websub-ballerina/tests/service_path_generation_test.bal
rename to ballerina/tests/service_path_generation_test.bal
diff --git a/websub-ballerina/tests/ssl_enabled_subscriber_test.bal b/ballerina/tests/ssl_enabled_subscriber_test.bal
similarity index 100%
rename from websub-ballerina/tests/ssl_enabled_subscriber_test.bal
rename to ballerina/tests/ssl_enabled_subscriber_test.bal
diff --git a/websub-ballerina/tests/subscriber_with_error_return_types.bal b/ballerina/tests/subscriber_with_error_return_types.bal
similarity index 100%
rename from websub-ballerina/tests/subscriber_with_error_return_types.bal
rename to ballerina/tests/subscriber_with_error_return_types.bal
diff --git a/websub-ballerina/tests/subscription_initiation_test.bal b/ballerina/tests/subscription_initiation_test.bal
similarity index 100%
rename from websub-ballerina/tests/subscription_initiation_test.bal
rename to ballerina/tests/subscription_initiation_test.bal
diff --git a/websub-ballerina/tests/subscription_redirect_test.bal b/ballerina/tests/subscription_redirect_test.bal
similarity index 100%
rename from websub-ballerina/tests/subscription_redirect_test.bal
rename to ballerina/tests/subscription_redirect_test.bal
diff --git a/websub-ballerina/tests/test_discovery_response_parsing.bal b/ballerina/tests/test_discovery_response_parsing.bal
similarity index 100%
rename from websub-ballerina/tests/test_discovery_response_parsing.bal
rename to ballerina/tests/test_discovery_response_parsing.bal
diff --git a/websub-ballerina/tests/test_init.bal b/ballerina/tests/test_init.bal
similarity index 100%
rename from websub-ballerina/tests/test_init.bal
rename to ballerina/tests/test_init.bal
diff --git a/websub-ballerina/tests/utils_test.bal b/ballerina/tests/utils_test.bal
similarity index 100%
rename from websub-ballerina/tests/utils_test.bal
rename to ballerina/tests/utils_test.bal
diff --git a/websub-ballerina/tests/websub_config_manual_attach_test.bal b/ballerina/tests/websub_config_manual_attach_test.bal
similarity index 100%
rename from websub-ballerina/tests/websub_config_manual_attach_test.bal
rename to ballerina/tests/websub_config_manual_attach_test.bal
diff --git a/websub-ballerina/utils.bal b/ballerina/utils.bal
similarity index 100%
rename from websub-ballerina/utils.bal
rename to ballerina/utils.bal
diff --git a/build-config/checkstyle/build.gradle b/build-config/checkstyle/build.gradle
index 9e69bc65..b89ab41f 100644
--- a/build-config/checkstyle/build.gradle
+++ b/build-config/checkstyle/build.gradle
@@ -21,7 +21,7 @@ plugins {
 
 apply plugin: 'java'
 
-task downloadMultipleFiles(type: Download) {
+task downloadCheckstyleRuleFiles(type: Download) {
     src([
             'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/checkstyle.xml',
             'https://raw.githubusercontent.com/wso2/code-quality-tools/v1.3/checkstyle/suppressions.xml'
@@ -40,9 +40,9 @@ clean {
 }
 
 artifacts.add('default', file("$project.buildDir/checkstyle.xml")) {
-    builtBy('downloadMultipleFiles')
+    builtBy('downloadCheckstyleRuleFiles')
 }
 
 artifacts.add('default', file("$project.buildDir/suppressions.xml")) {
-    builtBy('downloadMultipleFiles')
+    builtBy('downloadCheckstyleRuleFiles')
 }
diff --git a/build.gradle b/build.gradle
index 60fca296..390b59ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,23 +100,23 @@ subprojects {
         }
 
         /* Standard libraries */
-        ballerinaStdLibs "org.ballerinalang:http-ballerina:${stdlibHttpVersion}"
-        ballerinaStdLibs "org.ballerinalang:mime-ballerina:${stdlibMimeVersion}"
-        ballerinaStdLibs "org.ballerinalang:auth-ballerina:${stdlibAuthVersion}"
-        ballerinaStdLibs "org.ballerinalang:file-ballerina:${stdlibFileVersion}"
-        ballerinaStdLibs "org.ballerinalang:cache-ballerina:${stdlibCacheVersion}"
-        ballerinaStdLibs "org.ballerinalang:crypto-ballerina:${stdlibCryptoVersion}"
-        ballerinaStdLibs "org.ballerinalang:url-ballerina:${stdlibUrlVersion}"
-        ballerinaStdLibs "org.ballerinalang:task-ballerina:${stdlibTaskVersion}"
-        ballerinaStdLibs "org.ballerinalang:log-ballerina:${stdlibLogVersion}"
-        ballerinaStdLibs "org.ballerinalang:time-ballerina:${stdlibTimeVersion}"
-        ballerinaStdLibs "org.ballerinalang:os-ballerina:${stdlibOsVersion}"
-        ballerinaStdLibs "org.ballerinalang:io-ballerina:${stdlibIoVersion}"
-        ballerinaStdLibs "org.ballerinalang:regex-ballerina:${stdlibRegexVersion}"
-        ballerinaStdLibs "org.ballerinalang:uuid-ballerina:${stdlibUuidVersion}"
-        ballerinaStdLibs "org.ballerinalang:jwt-ballerina:${stdlibJwtVersion}"
-        ballerinaStdLibs "org.ballerinalang:oauth2-ballerina:${stdlibOAuth2Version}"
-        ballerinaStdLibs "org.ballerinalang:random-ballerina:${stdlibRandomVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:http-ballerina:${stdlibHttpVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:mime-ballerina:${stdlibMimeVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:auth-ballerina:${stdlibAuthVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:file-ballerina:${stdlibFileVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:cache-ballerina:${stdlibCacheVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:crypto-ballerina:${stdlibCryptoVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:url-ballerina:${stdlibUrlVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:task-ballerina:${stdlibTaskVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:log-ballerina:${stdlibLogVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:time-ballerina:${stdlibTimeVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:os-ballerina:${stdlibOsVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:io-ballerina:${stdlibIoVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:regex-ballerina:${stdlibRegexVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:uuid-ballerina:${stdlibUuidVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:jwt-ballerina:${stdlibJwtVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:oauth2-ballerina:${stdlibOAuth2Version}"
+        ballerinaStdLibs "io.ballerina.stdlib:random-ballerina:${stdlibRandomVersion}"
     }
 }
 
diff --git a/websub-compiler-plugin-test/build.gradle b/compiler-plugin-test/build.gradle
similarity index 94%
rename from websub-compiler-plugin-test/build.gradle
rename to compiler-plugin-test/build.gradle
index 5a1b08a6..a6f49277 100644
--- a/websub-compiler-plugin-test/build.gradle
+++ b/compiler-plugin-test/build.gradle
@@ -24,12 +24,12 @@ plugins {
 
 description = 'Ballerina - WebSub Compiler Plugin Tests'
 
-def ballerinaModulePath = "${project.rootDir}/websub-ballerina/"
+def ballerinaModulePath = "${project.rootDir}/ballerina/"
 def ballerinaDistPath = "${ballerinaModulePath}/build/target/extracted-distributions/jballerina-tools-zip/jballerina-tools-${ballerinaLangVersion}"
 def ballerinaDist = "${buildDir}/target/ballerina-distribution"
 
 dependencies {
-    checkstyle project(':build-config:checkstyle')
+    checkstyle project(':checkstyle')
     checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
 
     testImplementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"
@@ -49,7 +49,7 @@ checkstyle {
     configProperties = ["suppressionFile" : file("${rootDir}/build-config/checkstyle/build/suppressions.xml")]
 }
 
-checkstyleTest.dependsOn(":build-config:checkstyle:downloadMultipleFiles")
+checkstyleTest.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
 
 spotbugsTest {
     effort "max"
diff --git a/websub-compiler-plugin-test/src/test/java/io/ballerina/stdlib/websub/CompilerPluginTest.java b/compiler-plugin-test/src/test/java/io/ballerina/stdlib/websub/CompilerPluginTest.java
similarity index 100%
rename from websub-compiler-plugin-test/src/test/java/io/ballerina/stdlib/websub/CompilerPluginTest.java
rename to compiler-plugin-test/src/test/java/io/ballerina/stdlib/websub/CompilerPluginTest.java
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_1/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_1/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_1/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_1/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_1/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_1/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_1/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_1/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_1/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_1/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_1/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_1/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_10/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_10/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_10/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_10/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_10/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_10/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_10/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_10/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_10/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_10/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_10/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_10/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_11/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_11/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_11/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_11/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_11/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_11/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_11/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_11/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_11/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_11/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_11/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_11/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_12/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_12/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_12/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_12/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_12/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_12/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_12/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_12/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_12/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_12/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_12/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_12/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_13/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_13/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_13/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_13/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_13/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_13/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_13/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_13/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_13/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_13/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_13/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_13/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_14/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_14/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_14/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_14/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_14/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_14/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_14/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_14/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_14/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_14/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_14/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_14/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_15/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_15/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_15/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_15/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_15/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_15/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_15/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_15/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_15/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_15/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_15/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_15/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_16/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_16/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_16/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_16/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_16/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_16/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_16/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_16/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_16/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_16/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_16/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_16/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_17/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_17/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_17/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_17/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_17/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_17/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_17/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_17/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_17/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_17/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_17/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_17/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_18/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_18/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_18/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_18/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_18/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_18/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_18/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_18/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_18/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_18/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_18/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_18/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/custom_webhook_service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/custom_webhook_service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/custom_webhook_service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/custom_webhook_service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/init.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/init.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/init.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/init.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/listener.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/listener.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/listener.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/listener.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/websub_service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/websub_service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/websub_service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_19/websub_service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_2/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_2/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_2/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_2/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_2/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_2/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_2/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_2/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_2/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_2/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_2/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_2/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_20/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_20/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_20/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_20/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_20/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_20/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_20/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_20/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_20/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_20/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_20/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_20/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_21/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_21/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_21/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_21/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_21/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_21/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_21/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_21/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_21/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_21/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_21/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_21/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_3/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_3/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_3/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_3/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_3/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_3/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_3/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_3/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_3/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_3/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_3/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_3/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_4/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_4/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_4/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_4/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_4/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_4/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_4/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_4/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_4/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_4/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_4/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_4/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_5/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_5/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_5/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_5/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_5/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_5/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_5/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_5/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_5/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_5/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_5/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_5/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_6/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_6/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_6/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_6/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_6/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_6/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_6/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_6/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_6/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_6/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_6/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_6/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_7/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_7/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_7/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_7/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_7/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_7/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_7/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_7/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_7/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_7/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_7/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_7/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_8/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_8/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_8/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_8/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_8/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_8/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_8/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_8/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_8/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_8/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_8/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_8/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_9/.gitignore b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_9/.gitignore
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_9/.gitignore
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_9/.gitignore
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_9/Ballerina.toml b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_9/Ballerina.toml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_9/Ballerina.toml
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_9/Ballerina.toml
diff --git a/websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_9/service.bal b/compiler-plugin-test/src/test/resources/ballerina_sources/sample_9/service.bal
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/ballerina_sources/sample_9/service.bal
rename to compiler-plugin-test/src/test/resources/ballerina_sources/sample_9/service.bal
diff --git a/websub-compiler-plugin-test/src/test/resources/testng.xml b/compiler-plugin-test/src/test/resources/testng.xml
similarity index 100%
rename from websub-compiler-plugin-test/src/test/resources/testng.xml
rename to compiler-plugin-test/src/test/resources/testng.xml
diff --git a/websub-compiler-plugin/build.gradle b/compiler-plugin/build.gradle
similarity index 94%
rename from websub-compiler-plugin/build.gradle
rename to compiler-plugin/build.gradle
index 05aef631..07025b01 100644
--- a/websub-compiler-plugin/build.gradle
+++ b/compiler-plugin/build.gradle
@@ -24,7 +24,7 @@ plugins {
 description = 'Ballerina - Websub Compiler Plugin'
 
 dependencies {
-    checkstyle project(':build-config:checkstyle')
+    checkstyle project(':checkstyle')
     checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
     implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"
     implementation group: 'org.ballerinalang', name: 'ballerina-parser', version: "${ballerinaLangVersion}"
@@ -37,7 +37,7 @@ checkstyle {
     configProperties = ["suppressionFile" : file("${rootDir}/build-config/checkstyle/build/suppressions.xml")]
 }
 
-checkstyleMain.dependsOn(":build-config:checkstyle:downloadMultipleFiles")
+checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
 
 spotbugsMain {
     effort "max"
diff --git a/websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/Constants.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/websub/Constants.java
similarity index 100%
rename from websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/Constants.java
rename to compiler-plugin/src/main/java/io/ballerina/stdlib/websub/Constants.java
diff --git a/websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/WebSubCodeAnalyzer.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/websub/WebSubCodeAnalyzer.java
similarity index 100%
rename from websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/WebSubCodeAnalyzer.java
rename to compiler-plugin/src/main/java/io/ballerina/stdlib/websub/WebSubCodeAnalyzer.java
diff --git a/websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/WebSubCompilerPlugin.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/websub/WebSubCompilerPlugin.java
similarity index 100%
rename from websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/WebSubCompilerPlugin.java
rename to compiler-plugin/src/main/java/io/ballerina/stdlib/websub/WebSubCompilerPlugin.java
diff --git a/websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/WebSubDiagnosticCodes.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/websub/WebSubDiagnosticCodes.java
similarity index 100%
rename from websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/WebSubDiagnosticCodes.java
rename to compiler-plugin/src/main/java/io/ballerina/stdlib/websub/WebSubDiagnosticCodes.java
diff --git a/websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/AnalyserUtils.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/AnalyserUtils.java
similarity index 100%
rename from websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/AnalyserUtils.java
rename to compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/AnalyserUtils.java
diff --git a/websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/CheckExpAnalysisTask.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/CheckExpAnalysisTask.java
similarity index 100%
rename from websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/CheckExpAnalysisTask.java
rename to compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/CheckExpAnalysisTask.java
diff --git a/websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/ListenerInitAnalysisTask.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/ListenerInitAnalysisTask.java
similarity index 100%
rename from websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/ListenerInitAnalysisTask.java
rename to compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/ListenerInitAnalysisTask.java
diff --git a/websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/ServiceAnalysisTask.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/ServiceAnalysisTask.java
similarity index 100%
rename from websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/ServiceAnalysisTask.java
rename to compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/ServiceAnalysisTask.java
diff --git a/websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/validator/ServiceDeclarationValidator.java b/compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/validator/ServiceDeclarationValidator.java
similarity index 100%
rename from websub-compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/validator/ServiceDeclarationValidator.java
rename to compiler-plugin/src/main/java/io/ballerina/stdlib/websub/task/validator/ServiceDeclarationValidator.java
diff --git a/websub-compiler-plugin/src/main/java/module-info.java b/compiler-plugin/src/main/java/module-info.java
similarity index 100%
rename from websub-compiler-plugin/src/main/java/module-info.java
rename to compiler-plugin/src/main/java/module-info.java
diff --git a/gradle.properties b/gradle.properties
index f3afdd45..0021b7bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.caching=true
-group=org.ballerinalang
+group=io.ballerina.stdlib
 version=1.2.0-beta.3-SNAPSHOT
 ballerinaLangVersion=2.0.0-beta.2.1
 
@@ -13,22 +13,30 @@ wso2CommonsPoolVersion=1.5.6.wso2v1
 wso2CarbonMetricsVersion=2.3.7
 wso2SnakeYamlVersion=1.26.0.wso2v1
 testngVersion=7.4.0
-ballerinaGradlePluginVersion=0.9.1
+ballerinaGradlePluginVersion=0.10.1
 
-stdlibHttpVersion=1.1.0-beta.2
-stdlibMimeVersion=1.1.0-beta.2
-stdlibAuthVersion=1.1.0-beta.2
-stdlibFileVersion=0.7.0-beta.2
-stdlibCacheVersion=2.1.0-beta.2
-stdlibCryptoVersion=1.1.0-beta.2
-stdlibUrlVersion=1.1.0-beta.2
-stdlibTaskVersion=2.0.0-beta.2
-stdlibLogVersion=1.1.0-beta.2
-stdlibTimeVersion=2.0.0-beta.2
-stdlibOsVersion=0.8.0-beta.2
-stdlibIoVersion=0.6.0-beta.2
-stdlibRegexVersion=0.7.0-beta.2
-stdlibUuidVersion=0.10.0-beta.2
-stdlibJwtVersion=1.1.0-beta.2
-stdlibOAuth2Version=1.1.0-beta.2
-stdlibRandomVersion=0.10.0-beta.2
+ # Direct Dependencies
+stdlibAuthVersion=1.1.0-beta.3-20210709-185300-42be42e
+stdlibFileVersion=0.7.0-beta.3-20210709-182700-9a3dc6d
+stdlibHttpVersion=1.1.0-beta.3-20210712-180400-f765707
+stdlibIoVersion=0.6.0-beta.3-20210708-142400-de75ca2
+stdlibJwtVersion=1.1.0-beta.3-20210709-185500-2beca97
+stdlibOAuth2Version=1.1.0-beta.3-20210709-191200-434ab3f
+stdlibRegexVersion=0.7.0-beta.3-20210708-161600-c58ceb5
+stdlibUrlVersion=1.1.0-beta.3-20210708-195000-66534bb
+
+# Transitive Dependencies
+# Level 01
+stdlibTimeVersion=2.0.0-beta.3-20210708-150800-a71f297
+stdlibRandomVersion=0.10.0-beta.3-20210708-165200-ebea0a8
+
+# Level 02
+stdlibCryptoVersion=1.1.0-beta.3-20210708-193200-3362778
+stdlibLogVersion=1.1.0-beta.3-20210709-104700-e27bb49
+stdlibOsVersion=0.8.0-beta.3-20210708-232300-2bf238e
+stdlibTaskVersion=2.0.0-beta.3-20210708-181600-4f72d85
+
+# Level 03
+stdlibCacheVersion=2.1.0-beta.3-20210709-112300-ad0cc44
+stdlibMimeVersion=1.1.0-beta.3-20210709-182700-7f1c1cd
+stdlibUuidVersion=0.10.0-beta.3-20210709-111400-54f7b98
diff --git a/websub-native/build.gradle b/native/build.gradle
similarity index 86%
rename from websub-native/build.gradle
rename to native/build.gradle
index ff865e9f..7feafc8f 100644
--- a/websub-native/build.gradle
+++ b/native/build.gradle
@@ -24,16 +24,16 @@ plugins {
 description = 'Ballerina - Websub Java Utils'
 
 dependencies {
-    checkstyle project(':build-config:checkstyle')
+    checkstyle project(':checkstyle')
     checkstyle "com.puppycrawl.tools:checkstyle:${puppycrawlCheckstyleVersion}"
     implementation group: 'org.ballerinalang', name: 'ballerina-lang', version: "${ballerinaLangVersion}"
     implementation group: 'org.ballerinalang', name: 'ballerina-tools-api', version: "${ballerinaLangVersion}"
     implementation (group: 'org.ballerinalang', name: 'ballerina-runtime', version: "${ballerinaLangVersion}") {
         transitive = false
     }
-    implementation group: 'org.ballerinalang', name: 'http-native', version: "${stdlibHttpVersion}"
-    implementation group: 'org.ballerinalang', name: 'mime-native', version: "${stdlibMimeVersion}"
-    implementation (group: 'org.ballerinalang', name: 'io-native', version: "${stdlibIoVersion}") {
+    implementation group: 'io.ballerina.stdlib', name: 'http-native', version: "${stdlibHttpVersion}"
+    implementation group: 'io.ballerina.stdlib', name: 'mime-native', version: "${stdlibMimeVersion}"
+    implementation (group: 'io.ballerina.stdlib', name: 'io-native', version: "${stdlibIoVersion}") {
         transitive = false
     }
     implementation (group: 'org.ballerinalang', name: 'value', version: "${ballerinaLangVersion}") {
@@ -58,7 +58,7 @@ checkstyle {
     configProperties = ["suppressionFile" : file("${rootDir}/build-config/checkstyle/build/suppressions.xml")]
 }
 
-checkstyleMain.dependsOn(":build-config:checkstyle:downloadMultipleFiles")
+checkstyleMain.dependsOn(":checkstyle:downloadCheckstyleRuleFiles")
 
 spotbugsMain {
     effort "max"
diff --git a/websub-native/spotbugs-exclude.xml b/native/spotbugs-exclude.xml
similarity index 100%
rename from websub-native/spotbugs-exclude.xml
rename to native/spotbugs-exclude.xml
diff --git a/websub-native/src/main/java/io/ballerina/stdlib/websub/Constants.java b/native/src/main/java/io/ballerina/stdlib/websub/Constants.java
similarity index 100%
rename from websub-native/src/main/java/io/ballerina/stdlib/websub/Constants.java
rename to native/src/main/java/io/ballerina/stdlib/websub/Constants.java
diff --git a/websub-native/src/main/java/io/ballerina/stdlib/websub/ModuleUtils.java b/native/src/main/java/io/ballerina/stdlib/websub/ModuleUtils.java
similarity index 100%
rename from websub-native/src/main/java/io/ballerina/stdlib/websub/ModuleUtils.java
rename to native/src/main/java/io/ballerina/stdlib/websub/ModuleUtils.java
diff --git a/websub-native/src/main/java/io/ballerina/stdlib/websub/NativeHttpToWebsubAdaptor.java b/native/src/main/java/io/ballerina/stdlib/websub/NativeHttpToWebsubAdaptor.java
similarity index 100%
rename from websub-native/src/main/java/io/ballerina/stdlib/websub/NativeHttpToWebsubAdaptor.java
rename to native/src/main/java/io/ballerina/stdlib/websub/NativeHttpToWebsubAdaptor.java
diff --git a/websub-native/src/main/java/io/ballerina/stdlib/websub/SubscriberCallback.java b/native/src/main/java/io/ballerina/stdlib/websub/SubscriberCallback.java
similarity index 100%
rename from websub-native/src/main/java/io/ballerina/stdlib/websub/SubscriberCallback.java
rename to native/src/main/java/io/ballerina/stdlib/websub/SubscriberCallback.java
diff --git a/websub-native/src/main/java/module-info.java b/native/src/main/java/module-info.java
similarity index 100%
rename from websub-native/src/main/java/module-info.java
rename to native/src/main/java/module-info.java
diff --git a/settings.gradle b/settings.gradle
index 99715292..af50a859 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,12 +12,19 @@ plugins {
 }
 
 rootProject.name = 'websub'
-include ':build-config:checkstyle'
+
+include ':checkstyle'
 include ':websub-native'
 include ':websub-ballerina'
 include ':websub-compiler-plugin'
 include ':websub-compiler-plugin-test'
 
+project(':checkstyle').projectDir = file("build-config${File.separator}checkstyle")
+project(':websub-native').projectDir = file("native")
+project(':websub-compiler-plugin').projectDir = file("compiler-plugin")
+project(':websub-ballerina').projectDir = file("ballerina")
+project(':websub-compiler-plugin-test').projectDir = file("compiler-plugin-test")
+
 gradleEnterprise {
     buildScan {
         termsOfServiceUrl = 'https://gradle.com/terms-of-service'
diff --git a/websub-ballerina/Ballerina.toml b/websub-ballerina/Ballerina.toml
deleted file mode 100644
index 3806522e..00000000
--- a/websub-ballerina/Ballerina.toml
+++ /dev/null
@@ -1,121 +0,0 @@
-[package]
-org = "ballerina"
-name = "websub"
-version = "@toml.version@"
-
-[[platform.java11.dependency]]
-path = "../websub-native/build/libs/websub-native-@project.version@.jar"
-groupId = "ballerina"
-artifactId = "web-sub"
-version = "@project.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/http-native-@http.native.version@.jar"
-groupId = "org.ballerinalang"
-artifactId = "http-native"
-version = "@http.native.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/netty-common-@netty.version@.jar"
-groupId = "io.netty"
-artifactId = "netty-common"
-version = "@netty.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/netty-buffer-@netty.version@.jar"
-groupId = "io.netty"
-artifactId = "netty-buffer"
-version = "@netty.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/netty-transport-@netty.version@.jar"
-groupId = "io.netty"
-artifactId = "netty-transport"
-version = "@netty.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/netty-resolver-@netty.version@.jar"
-groupId = "io.netty"
-artifactId = "netty-resolver"
-version = "@netty.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/netty-handler-@netty.version@.jar"
-groupId = "io.netty"
-artifactId = "netty-handler"
-version = "@netty.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/netty-codec-http-@netty.version@.jar"
-groupId = "io.netty"
-artifactId = "netty-codec-http"
-version = "@netty.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/netty-codec-@netty.version@.jar"
-groupId = "io.netty"
-artifactId = "netty-codec"
-version = "@netty.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/netty-handler-proxy-@netty.version@.jar"
-groupId = "io.netty"
-artifactId = "netty-handler-proxy"
-version = "@netty.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/netty-codec-http2-@netty.version@.jar"
-groupId = "io.netty"
-artifactId = "netty-codec-http2"
-version = "@netty.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/commons-pool-@wso2commonspool.version@.jar"
-groupId = "commons-pool.wso2"
-artifactId = "commons-pool"
-version = "@wso2commonspool.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/snakeyaml-@wso2snakeyaml.version@.jar"
-groupId = "org.wso2.orbit.org.yaml"
-artifactId = "snakeyaml"
-version = "@wso2snakeyaml.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/bcprov-jdk15on-@bouncycastle.version@.jar"
-groupId = "org.bouncycastle"
-artifactId = "bcprov-jdk15on"
-version = "@bouncycastle.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/bcpkix-jdk15on-@bouncycastle.version@.jar"
-groupId = "org.bouncycastle"
-artifactId = "bcpkix-jdk15on"
-version = "@bouncycastle.version@"
-
-
-[[platform.java11.dependency]]
-path = "./lib/netty-tcnative-boringssl-static-@nettytcnative.version@.jar"
-groupId = "io.netty"
-artifactId = "netty-tcnative-boringssl-static"
-version = "@nettytcnative.version@"
-
-[[platform.java11.dependency]]
-path = "./lib/org.wso2.carbon.metrics.core-@wso2carbonmetrics.version@.jar"
-groupId = "org.wso2.carbon.metrics"
-artifactId = "org.wso2.carbon.metrics.core"
-version = "@wso2carbonmetrics.version@"