diff --git a/cpp/.gitignore b/cpp/starter/.gitignore
similarity index 100%
rename from cpp/.gitignore
rename to cpp/starter/.gitignore
diff --git a/cpp/README.md b/cpp/starter/README.md
similarity index 97%
rename from cpp/README.md
rename to cpp/starter/README.md
index 394c6707..13fde772 100644
--- a/cpp/README.md
+++ b/cpp/starter/README.md
@@ -13,7 +13,7 @@ A simple starter function. Edit `src/main.cc` to get started and create somethin
 Sample `200` Response:
 
 ```text
-Hello, World! 🌎
+Hello, World!
 ```
 
 ### `POST`, `PUT`, `PATCH`, `DELETE`
diff --git a/cpp/src/main.cc b/cpp/starter/src/main.cc
similarity index 58%
rename from cpp/src/main.cc
rename to cpp/starter/src/main.cc
index 72932643..53d4ceb3 100644
--- a/cpp/src/main.cc
+++ b/cpp/starter/src/main.cc
@@ -1,3 +1,8 @@
+#include "../RuntimeResponse.h"
+#include "../RuntimeRequest.h"
+#include "../RuntimeOutput.h"
+#include "../RuntimeContext.h"
+
 namespace runtime {
   class Handler {
     public:
@@ -5,24 +10,24 @@ namespace runtime {
       // It's executed each time we get a request
       static RuntimeOutput main(RuntimeContext &context) {
         // You can log messages to the console
-        context.log("Hello, Logs! 👋");
+        context.log("Hello, Logs!");
 
         // If something goes wrong, log an error
-        context.log("Hello, Errors! ⛔");
+        context.log("Hello, Errors!");
 
         // The `req` object contains the request data
         if (context.req.method == "GET") {
           // Send a response with the res object helpers
           // `context.res.send()` dispatches a string back to the client
-          return context.res.send("Hello, World! 🌎");
+          return context.res.send("Hello, World!");
         }
 
         // `context.res.json()` is a handy helper for sending JSON
         Json::Value response;
-        response['motto'] = "Build Fast. Scale Big. All in One Place.";
-        response['learn'] = "https://appwrite.io/docs";
-        response['connect'] = "https://appwrite.io/discord";
-        response['getInspired'] = "https://builtwith.appwrite.io";
+        response["motto"] = "Build Fast. Scale Big. All in One Place.";
+        response["learn"] = "https://appwrite.io/docs";
+        response["connect"] = "https://appwrite.io/discord";
+        response["getInspired"] = "https://builtwith.appwrite.io";
         return context.res.json(response);
       }
   };
diff --git a/dart/starter-template/.gitignore b/dart/starter/.gitignore
similarity index 100%
rename from dart/starter-template/.gitignore
rename to dart/starter/.gitignore
diff --git a/dart/starter-template/README.md b/dart/starter/README.md
similarity index 98%
rename from dart/starter-template/README.md
rename to dart/starter/README.md
index 93966d48..8f02c48c 100644
--- a/dart/starter-template/README.md
+++ b/dart/starter/README.md
@@ -13,7 +13,7 @@ A simple starter function. Edit `lib/main.dart` to get started and create someth
 Sample `200` Response:
 
 ```text
-Hello, World! 🌎
+Hello, World!
 ```
 
 ### `POST`, `PUT`, `PATCH`, `DELETE`
diff --git a/dart/starter-template/analysis_options.yaml b/dart/starter/analysis_options.yaml
similarity index 100%
rename from dart/starter-template/analysis_options.yaml
rename to dart/starter/analysis_options.yaml
diff --git a/dart/starter-template/lib/main.dart b/dart/starter/lib/main.dart
similarity index 88%
rename from dart/starter-template/lib/main.dart
rename to dart/starter/lib/main.dart
index 2142a167..2717e462 100644
--- a/dart/starter-template/lib/main.dart
+++ b/dart/starter/lib/main.dart
@@ -12,16 +12,16 @@ Future<dynamic> main(final context) async {
   //    .setKey(process.env.APPWRITE_API_KEY);
 
   // You can log messages to the console
-  context.log('Hello, Logs! 👋');
+  context.log('Hello, Logs!');
 
   // If something goes wrong, log an error
-  context.error('Hello, Errors! ⛔');
+  context.error('Hello, Errors!');
 
   // The `req` object contains the request data
   if (context.req.method == 'GET') {
     // Send a response with the res object helpers
     // `res.send()` dispatches a string back to the client
-    return context.res.send('Hello, World! 🌎');
+    return context.res.send('Hello, World!');
   }
 
   // `res.json()` is a handy helper for sending JSON
diff --git a/dart/starter-template/pubspec.yaml b/dart/starter/pubspec.yaml
similarity index 100%
rename from dart/starter-template/pubspec.yaml
rename to dart/starter/pubspec.yaml
diff --git a/deno/starter-template/.gitignore b/deno/starter/.gitignore
similarity index 100%
rename from deno/starter-template/.gitignore
rename to deno/starter/.gitignore
diff --git a/deno/starter-template/README.md b/deno/starter/README.md
similarity index 98%
rename from deno/starter-template/README.md
rename to deno/starter/README.md
index 2f32b124..a5c0b41f 100644
--- a/deno/starter-template/README.md
+++ b/deno/starter/README.md
@@ -13,7 +13,7 @@ A simple starter function. Edit `src/main.ts` to get started and create somethin
 Sample `200` Response:
 
 ```text
-Hello, World! 🌎
+Hello, World!
 ```
 
 ### `POST`, `PUT`, `PATCH`, `DELETE`
diff --git a/deno/starter-template/src/main.ts b/deno/starter/src/main.ts
similarity index 90%
rename from deno/starter-template/src/main.ts
rename to deno/starter/src/main.ts
index 69275cde..aaa776f8 100644
--- a/deno/starter-template/src/main.ts
+++ b/deno/starter/src/main.ts
@@ -11,16 +11,16 @@ export default ({ req, res, log, error }: any) => {
   //    .setKey(Deno.env.get("APPWRITE_API_KEY"));
 
   // You can log messages to the console
-  log("Hello, Logs! 👋");
+  log("Hello, Logs!");
 
   // If something goes wrong, log an error
-  error("Hello, Errors! ⛔");
+  error("Hello, Errors!");
 
   // The `req` object contains the request data
   if (req.method === "GET") {
     // Send a response with the res object helpers
     // `res.send()` dispatches a string back to the client
-    return res.send("Hello, World! 🌎");
+    return res.send("Hello, World!");
   }
 
   // `res.json()` is a handy helper for sending JSON
diff --git a/dotnet/starter-template/.gitignore b/dotnet/starter/.gitignore
similarity index 100%
rename from dotnet/starter-template/.gitignore
rename to dotnet/starter/.gitignore
diff --git a/dotnet/starter-template/README.md b/dotnet/starter/README.md
similarity index 97%
rename from dotnet/starter-template/README.md
rename to dotnet/starter/README.md
index 2e411f17..dbbf4c5d 100644
--- a/dotnet/starter-template/README.md
+++ b/dotnet/starter/README.md
@@ -13,7 +13,7 @@ A simple starter function. Edit `src/Index.cs` to get started and create somethi
 Sample `200` Response:
 
 ```text
-Hello, World! 🌎
+Hello, World!
 ```
 
 ### `POST`, `PUT`, `PATCH`, `DELETE`
diff --git a/dotnet/starter-template/StarterTemplate.csproj b/dotnet/starter/StarterTemplate.csproj
similarity index 72%
rename from dotnet/starter-template/StarterTemplate.csproj
rename to dotnet/starter/StarterTemplate.csproj
index 43e2d176..f9ab8985 100644
--- a/dotnet/starter-template/StarterTemplate.csproj
+++ b/dotnet/starter/StarterTemplate.csproj
@@ -5,4 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Appwrite" Version="0.4.2" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/dotnet/starter-template/src/Index.cs b/dotnet/starter/src/Index.cs
similarity index 67%
rename from dotnet/starter-template/src/Index.cs
rename to dotnet/starter/src/Index.cs
index 36fb7f7f..421f31d4 100644
--- a/dotnet/starter-template/src/Index.cs
+++ b/dotnet/starter/src/Index.cs
@@ -18,25 +18,25 @@ public async Task<RuntimeOutput> Main(RuntimeContext Context)
         //     .SetKey(Environment.GetEnvironmentVariable("APPWRITE_API_KEY"))
 
         // You can log messages to the console
-        Context.Log("Hello, Logs! 👋");
+        Context.Log("Hello, Logs!");
 
         // If something goes wrong, log an error
-        Context.Error("Hello, Errors! ⛔");
+        Context.Error("Hello, Errors!");
 
         // The `Context.Req` object contains the request data
-        if (Context.Req.Method === "GET") {
+        if (Context.Req.Method == "GET") {
             // Send a response with the res object helpers
             // `Context.Res.Send()` dispatches a string back to the client
-            return Context.Req.Send("Hello, World! 🌎");
+            return Context.Res.Send("Hello, World!");
         }
 
         // `Context.Res.Json()` is a handy helper for sending JSON
-        return Context.Res.Json(new()
+        return Context.Res.Json(new Dictionary<string, object?>()
         {
-            { "motto": "Build Fast. Scale Big. All in One Place." },
-            { "learn": "https://appwrite.io/docs" },
-            { "connect": "https://appwrite.io/discord" },
-            { "getInspired": "https://builtwith.appwrite.io" },
+            { "motto", "Build Fast. Scale Big. All in One Place." },
+            { "learn", "https://appwrite.io/docs" },
+            { "connect", "https://appwrite.io/discord" },
+            { "getInspired", "https://builtwith.appwrite.io" },
         });
     }
 }
\ No newline at end of file
diff --git a/java/starter-template/.gitignore b/java/starter/.gitignore
similarity index 100%
rename from java/starter-template/.gitignore
rename to java/starter/.gitignore
diff --git a/java/starter-template/README.md b/java/starter/README.md
similarity index 97%
rename from java/starter-template/README.md
rename to java/starter/README.md
index b75c5210..e1923c97 100644
--- a/java/starter-template/README.md
+++ b/java/starter/README.md
@@ -13,7 +13,7 @@ A simple starter function. Edit `src/Main.java` to get started and create someth
 Sample `200` Response:
 
 ```text
-Hello, World! 🌎
+Hello, World!
 ```
 
 ### `POST`, `PUT`, `PATCH`, `DELETE`
diff --git a/java/starter-template/deps.gradle b/java/starter/deps.gradle
similarity index 100%
rename from java/starter-template/deps.gradle
rename to java/starter/deps.gradle
diff --git a/java/starter-template/src/Main.java b/java/starter/src/Main.java
similarity index 61%
rename from java/starter-template/src/Main.java
rename to java/starter/src/Main.java
index c0525080..a3481df8 100644
--- a/java/starter-template/src/Main.java
+++ b/java/starter/src/Main.java
@@ -1,3 +1,7 @@
+package io.openruntimes.java.src;
+
+import io.openruntimes.java.RuntimeContext;
+import io.openruntimes.java.RuntimeOutput;
 import java.util.HashMap;
 import io.appwrite.Client;
 
@@ -15,26 +19,25 @@ public RuntimeOutput main(RuntimeContext context) throws Exception {
         //         .setKey(System.getenv("APPWRITE_API_KEY"));
 
         // You can log messages to the console
-        context.log("Hello, Logs! 👋");
+        context.log("Hello, Logs!");
 
         // If something goes wrong, log an error
-        context.error("Hello, Errors! ⛔");
+        context.error("Hello, Errors!");
 
         // The `context.getReq()` object contains the request data
         if (context.getReq().getMethod().equals("GET")) {
             // Send a response with the res object helpers
             // `context.getRes().send()` dispatches a string back to the client
-            return context.getRes().send("Hello, World! 🌎");
+            return context.getRes().send("Hello, World!");
         }
 
+        Map<String, Object> json = new HashMap<>();
+        json.put("motto", "Build Fast. Scale Big. All in One Place.");
+        json.put("learn", "https://appwrite.io/docs");
+        json.put("connect", "https://appwrite.io/discord");
+        json.put("getInspired", "https://builtwith.appwrite.io");
+        
         // `context.getRes().json()` is a handy helper for sending JSON
-        return context.getRes().json(new HashMap<String, String>() {
-            {
-                put("motto", "Build Fast. Scale Big. All in One Place.");
-                put("learn", "https://appwrite.io/docs");
-                put("connect", "https://appwrite.io/discord");
-                put("getInspired", "https://builtwith.appwrite.io");
-            }
-        });
+        return context.getRes().json(json);
     }
 }
\ No newline at end of file
diff --git a/kotlin/starter-template/.gitignore b/kotlin/starter/.gitignore
similarity index 100%
rename from kotlin/starter-template/.gitignore
rename to kotlin/starter/.gitignore
diff --git a/kotlin/starter-template/README.md b/kotlin/starter/README.md
similarity index 97%
rename from kotlin/starter-template/README.md
rename to kotlin/starter/README.md
index 076d4336..3648c891 100644
--- a/kotlin/starter-template/README.md
+++ b/kotlin/starter/README.md
@@ -13,7 +13,7 @@ A simple starter function. Edit `src/Main.kt` to get started and create somethin
 Sample `200` Response:
 
 ```text
-Hello, World! 🌎
+Hello, World!
 ```
 
 ### `POST`, `PUT`, `PATCH`, `DELETE`
diff --git a/kotlin/starter-template/deps.gradle b/kotlin/starter/deps.gradle
similarity index 100%
rename from kotlin/starter-template/deps.gradle
rename to kotlin/starter/deps.gradle
diff --git a/kotlin/starter-template/src/Main.kt b/kotlin/starter/src/Main.kt
similarity index 62%
rename from kotlin/starter-template/src/Main.kt
rename to kotlin/starter/src/Main.kt
index bbe55143..7cfe9ca8 100644
--- a/kotlin/starter-template/src/Main.kt
+++ b/kotlin/starter/src/Main.kt
@@ -1,3 +1,7 @@
+package io.openruntimes.kotlin.src
+
+import io.openruntimes.kotlin.RuntimeContext
+import io.openruntimes.kotlin.RuntimeOutput
 import io.appwrite.Client
 import java.util.HashMap
 
@@ -13,25 +17,24 @@ class Main {
         // }
 
         // You can log messages to the console
-        context.log("Hello, Logs! 👋")
+        context.log("Hello, Logs!")
 
         // If something goes wrong, log an error
-        context.error("Hello, Errors! ⛔")
+        context.error("Hello, Errors!")
 
         // The `context.req` object contains the request data
         if (context.req.method == "GET") {
             // Send a response with the res object helpers
             // `context.res.send()` dispatches a string back to the client
-            return context.res.send("Hello, World! 🌎")
+            return context.res.send("Hello, World!")
         }
 
         // `context.res.json()` is a handy helper for sending JSON
-        val jsonMap = HashMap<String, String>().apply {
-            put("motto", "Build Fast. Scale Big. All in One Place.")
-            put("learn", "https://appwrite.io/docs")
-            put("connect", "https://appwrite.io/discord")
-            put("getInspired", "https://builtwith.appwrite.io")
-        }
-        return context.res.json(jsonMap)
+        return context.res.json(mutableMapOf(
+            "motto" to "Build Fast. Scale Big. All in One Place.",
+            "learn" to "https://appwrite.io/docs",
+            "connect" to "https://appwrite.io/discord",
+            "getInspired" to "https://builtwith.appwrite.io"
+        ))
     }
 }
diff --git a/node/starter-template/.gitignore b/node/starter/.gitignore
similarity index 100%
rename from node/starter-template/.gitignore
rename to node/starter/.gitignore
diff --git a/node/starter-template/.prettierrc.json b/node/starter/.prettierrc.json
similarity index 100%
rename from node/starter-template/.prettierrc.json
rename to node/starter/.prettierrc.json
diff --git a/node/starter-template/README.md b/node/starter/README.md
similarity index 97%
rename from node/starter-template/README.md
rename to node/starter/README.md
index f1b4ab34..e0987fe7 100644
--- a/node/starter-template/README.md
+++ b/node/starter/README.md
@@ -13,7 +13,7 @@ A simple starter function. Edit `src/main.js` to get started and create somethin
 Sample `200` Response:
 
 ```text
-Hello, World! 🌎
+Hello, World!
 ```
 
 ### `POST`, `PUT`, `PATCH`, `DELETE`
diff --git a/node/starter-template/package-lock.json b/node/starter/package-lock.json
similarity index 100%
rename from node/starter-template/package-lock.json
rename to node/starter/package-lock.json
diff --git a/node/starter-template/package.json b/node/starter/package.json
similarity index 100%
rename from node/starter-template/package.json
rename to node/starter/package.json
diff --git a/node/starter-template/src/main.js b/node/starter/src/main.js
similarity index 90%
rename from node/starter-template/src/main.js
rename to node/starter/src/main.js
index 9c6f0736..2c1599b9 100644
--- a/node/starter-template/src/main.js
+++ b/node/starter/src/main.js
@@ -11,16 +11,16 @@ export default async ({ req, res, log, error }) => {
   //    .setKey(process.env.APPWRITE_API_KEY);
 
   // You can log messages to the console
-  log('Hello, Logs! 👋');
+  log('Hello, Logs!');
 
   // If something goes wrong, log an error
-  error('Hello, Errors! ⛔');
+  error('Hello, Errors!');
 
   // The `req` object contains the request data
   if (req.method === 'GET') {
     // Send a response with the res object helpers
     // `res.send()` dispatches a string back to the client
-    return res.send('Hello, World! 🌎');
+    return res.send('Hello, World!');
   }
 
   // `res.json()` is a handy helper for sending JSON
diff --git a/php/starter-template/composer.lock b/php/starter-template/composer.lock
deleted file mode 100644
index c64443ae..00000000
--- a/php/starter-template/composer.lock
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "110f36972c614ec2e54cd862f2e00c8e",
-    "packages": [
-        {
-            "name": "appwrite/appwrite",
-            "version": "8.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/appwrite/sdk-for-php.git",
-                "reference": "2b9e966edf35c4061179ed98ea364698ab30de8b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-for-php/zipball/2b9e966edf35c4061179ed98ea364698ab30de8b",
-                "reference": "2b9e966edf35c4061179ed98ea364698ab30de8b",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "ext-json": "*",
-                "php": ">=7.1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "3.7.35"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Appwrite\\": "src/Appwrite"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Appwrite is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API",
-            "support": {
-                "email": "team@appwrite.io",
-                "issues": "https://github.com/appwrite/sdk-for-php/issues",
-                "source": "https://github.com/appwrite/sdk-for-php/tree/8.0.0",
-                "url": "https://appwrite.io/support"
-            },
-            "time": "2023-04-12T10:16:28+00:00"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=8.0.0"
-    },
-    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
-}
diff --git a/php/starter-template/.gitignore b/php/starter/.gitignore
similarity index 100%
rename from php/starter-template/.gitignore
rename to php/starter/.gitignore
diff --git a/php/starter-template/README.md b/php/starter/README.md
similarity index 98%
rename from php/starter-template/README.md
rename to php/starter/README.md
index fbe39139..bfffe71b 100644
--- a/php/starter-template/README.md
+++ b/php/starter/README.md
@@ -13,7 +13,7 @@ A simple starter function. Edit `src/index.php` to get started and create someth
 Sample `200` Response:
 
 ```text
-Hello, World! 🌎
+Hello, World!
 ```
 
 ### `POST`, `PUT`, `PATCH`, `DELETE`
diff --git a/php/starter-template/composer.json b/php/starter/composer.json
similarity index 100%
rename from php/starter-template/composer.json
rename to php/starter/composer.json
diff --git a/php/starter-template/src/index.php b/php/starter/src/index.php
similarity index 85%
rename from php/starter-template/src/index.php
rename to php/starter/src/index.php
index 586261a7..57074912 100644
--- a/php/starter-template/src/index.php
+++ b/php/starter/src/index.php
@@ -1,6 +1,6 @@
 <?php
 
-require 'vendor/autoload.php';
+require(__DIR__ . '/../vendor/autoload.php');
 
 use Appwrite\Client;
 use Appwrite\Exception;
@@ -17,16 +17,16 @@
     //      ->setKey(getenv('APPWRITE_API_KEY'));
 
     // You can log messages to the console
-    $context->log('Hello, Logs! 👋');
+    $context->log('Hello, Logs!');
 
     // If something goes wrong, log an error
-    $context->error('Hello, Errors! ⛔');
+    $context->error('Hello, Errors!');
 
     // The `req` object contains the request data
     if ($context->req->method === 'GET') {
         // Send a response with the res object helpers
         // `res.send()` dispatches a string back to the client
-        return $context->res->send('Hello, World! 🌎');
+        return $context->res->send('Hello, World!');
     }
 
     // `res.json()` is a handy helper for sending JSON
diff --git a/python/starter-template/.gitignore b/python/starter/.gitignore
similarity index 100%
rename from python/starter-template/.gitignore
rename to python/starter/.gitignore
diff --git a/python/starter-template/README.md b/python/starter/README.md
similarity index 98%
rename from python/starter-template/README.md
rename to python/starter/README.md
index 79678e49..e1959eb8 100644
--- a/python/starter-template/README.md
+++ b/python/starter/README.md
@@ -13,7 +13,7 @@ A simple starter function. Edit `src/main.py` to get started and create somethin
 Sample `200` Response:
 
 ```text
-Hello, World! 🌎
+Hello, World!
 ```
 
 ### `POST`, `PUT`, `PATCH`, `DELETE`
diff --git a/python/starter-template/requirements.txt b/python/starter/requirements.txt
similarity index 100%
rename from python/starter-template/requirements.txt
rename to python/starter/requirements.txt
diff --git a/python/starter-template/src/main.py b/python/starter/src/main.py
similarity index 88%
rename from python/starter-template/src/main.py
rename to python/starter/src/main.py
index bb7a2d57..11983434 100644
--- a/python/starter-template/src/main.py
+++ b/python/starter/src/main.py
@@ -15,16 +15,16 @@ def main(context):
     # )
 
     # You can log messages to the console
-    context.log("Hello, Logs! 👋")
+    context.log("Hello, Logs!")
 
     # If something goes wrong, log an error
-    context.error("Hello, Errors! ⛔")
+    context.error("Hello, Errors!")
 
     # The `ctx.req` object contains the request data
     if context.req.method == "GET":
         # Send a response with the res object helpers
         # `ctx.res.send()` dispatches a string back to the client
-        return context.res.send("Hello, World! 🌎")
+        return context.res.send("Hello, World!")
 
     # `ctx.res.json()` is a handy helper for sending JSON
     return context.res.json(
diff --git a/ruby/starter-template/.gitignore b/ruby/starter/.gitignore
similarity index 100%
rename from ruby/starter-template/.gitignore
rename to ruby/starter/.gitignore
diff --git a/ruby/starter-template/Gemfile b/ruby/starter/Gemfile
similarity index 100%
rename from ruby/starter-template/Gemfile
rename to ruby/starter/Gemfile
diff --git a/ruby/starter-template/README.md b/ruby/starter/README.md
similarity index 87%
rename from ruby/starter-template/README.md
rename to ruby/starter/README.md
index 45448454..51f79815 100644
--- a/ruby/starter-template/README.md
+++ b/ruby/starter/README.md
@@ -1,6 +1,6 @@
 # ⚡ Ruby Starter Function
 
-A simple starter function. Edit `src/main.rb` to get started and create something awesome! 🚀
+A simple starter function. Edit `lib/main.rb` to get started and create something awesome! 🚀
 
 ## 🧰 Usage
 
@@ -13,7 +13,7 @@ A simple starter function. Edit `src/main.rb` to get started and create somethin
 Sample `200` Response:
 
 ```text
-Hello, World! 🌎
+Hello, World!
 ```
 
 ### `POST`, `PUT`, `PATCH`, `DELETE`
@@ -38,7 +38,7 @@ Sample `200` Response:
 | Setting           | Value            |
 |-------------------|------------------|
 | Runtime           | Ruby (3.2)       |
-| Entrypoint        | `src/main.rb`    |
+| Entrypoint        | `lib/main.rb`    |
 | Build Commands    | `bundle install` |
 | Permissions       | `any`            |
 | Timeout (Seconds) | 15               |
diff --git a/ruby/starter-template/src/main.rb b/ruby/starter/lib/main.rb
similarity index 89%
rename from ruby/starter-template/src/main.rb
rename to ruby/starter/lib/main.rb
index 0194e5d3..3f318dda 100644
--- a/ruby/starter-template/src/main.rb
+++ b/ruby/starter/lib/main.rb
@@ -12,16 +12,16 @@ def main(context)
   #   .set_key(req.variables['APPWRITE_API_KEY'])
 
   # You can log messages to the console
-  context.log("Hello, Logs! 👋")
+  context.log("Hello, Logs!")
 
   # If something goes wrong, log an error
-  context.error("Hello, Errors! ⛔")
+  context.error("Hello, Errors!")
 
   # The `ctx.req` object contains the request data
   if (context.req.method == "GET")
     # Send a response with the res object helpers
     # `ctx.res.send()` dispatches a string back to the client
-    return context.res.send("Hello, World! 🌎")
+    return context.res.send("Hello, World!")
   end
 
   # `ctx.res.json()` is a handy helper for sending JSON
diff --git a/swift/starter-template/.gitignore b/swift/starter/.gitignore
similarity index 100%
rename from swift/starter-template/.gitignore
rename to swift/starter/.gitignore
diff --git a/swift/starter-template/package.swift b/swift/starter/Package.swift
similarity index 78%
rename from swift/starter-template/package.swift
rename to swift/starter/Package.swift
index 8004e5a1..8ee95a18 100644
--- a/swift/starter-template/package.swift
+++ b/swift/starter/Package.swift
@@ -1,13 +1,14 @@
+// swift-tools-version:5.5
 import PackageDescription
 
 let package = Package(
-    name: "swift-5.5",
+    name: "swift-function",
     dependencies: [
         .package(url: "https://github.com/appwrite/sdk-for-swift", .upToNextMajor(from: "1.0.0")),
     ],
     targets: [
         .executableTarget(
-            name: "swift-5.5",
+            name: "swift-function",
             dependencies: [
                 .product(name: "Appwrite", package: "sdk-for-swift")
             ]),
diff --git a/swift/starter-template/README.md b/swift/starter/README.md
similarity index 98%
rename from swift/starter-template/README.md
rename to swift/starter/README.md
index 4541b769..26c713bb 100644
--- a/swift/starter-template/README.md
+++ b/swift/starter/README.md
@@ -13,7 +13,7 @@ A simple starter function. Edit `Sources/index.swift` to get started and create
 Sample `200` Response:
 
 ```text
-Hello, World! 🌎
+Hello, World!
 ```
 
 ### `POST`, `PUT`, `PATCH`, `DELETE`
diff --git a/swift/starter-template/Sources/index.swift b/swift/starter/Sources/index.swift
similarity index 86%
rename from swift/starter-template/Sources/index.swift
rename to swift/starter/Sources/index.swift
index cf3658c4..1eae99fd 100644
--- a/swift/starter-template/Sources/index.swift
+++ b/swift/starter/Sources/index.swift
@@ -13,20 +13,20 @@ func main(context: RuntimeContext) async throws -> RuntimeOutput {
     //    .setKey(ProcessInfo.processInfo.environment["APPWRITE_API_KEY"]);
 
     // You can log messages to the console
-    context.log("Hello, Logs! 👋")
+    context.log("Hello, Logs!")
 
     // If something goes wrong, log an error
-    context.error("Hello, Errors! ⛔")
+    context.error("Hello, Errors!")
 
     // The `context.req` object contains the request data
     if context.req.method == "GET" {
         // Send a response with the res object helpers
         // `res.send()` dispatches a string back to the client
-        return try context.res.send("Hello, World! 🌎")
+        return try context.res.send("Hello, World!")
     }
 
     // `context.res.json()` is a handy helper for sending JSON
-    return context.res.json([
+    return try context.res.json([
         "motto": "Build Fast. Scale Big. All in One Place.",
         "learn": "https://appwrite.io/docs",
         "connect": "https://appwrite.io/discord",
