diff --git a/.gitignore b/.gitignore
index 250d0fb7d..581cc4cc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -179,4 +179,5 @@ tmp/
 test-source/
 test-destination/
 test-portal/
-/.idea/
\ No newline at end of file
+/.idea/
+.github/copilot-instructions.md
\ No newline at end of file
diff --git a/README.md b/README.md
index bc5974d9f..1b79ffafa 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ $ npm install -g @apimatic/cli
 $ apimatic COMMAND
 running command...
 $ apimatic (--version)
-@apimatic/cli/1.1.0-alpha.21 win32-x64 node-v23.4.0
+@apimatic/cli/1.1.0-alpha.22 win32-x64 node-v23.4.0
 $ apimatic --help [COMMAND]
 USAGE
   $ apimatic COMMAND
@@ -51,39 +51,41 @@ USAGE
 
 ## `apimatic api transform`
 
-Transform API specifications from one format to another. Supports [10+ different formats](https://www.apimatic.io/transformer/#supported-formats) including OpenApi/Swagger, RAML, WSDL and Postman Collections.
+Transform API specifications between different formats.
 
 ```
 USAGE
-  $ apimatic api transform --format <value> [--file <value>] [--url <value>] [-d <value>] [-f] [-k <value>]
+  $ apimatic api transform --format
+    apimatic|wadl2009|wsdl|swagger10|swagger20|swaggeryaml|oas3|openapi3yaml|apiblueprint|raml|raml10|postman10|postman2
+    0|graphqlschema [--file <value>] [--url <value>] [-d <value>] [-f] [-k <value>]
 
 FLAGS
-  -d, --destination=<value>  [default: ./] directory to download transformed file to
+  -d, --destination=<value>  [default: ./] directory to save the transformed file to
   -f, --force                overwrite changes without asking for user consent.
   -k, --auth-key=<value>     override current authentication state with an authentication key.
       --file=<value>         path to the API specification file to transform
-      --format=<value>       (required) specification format to transform API specification into
-                             APIMATIC|WADL2009|WSDL|SWAGGER10|SWAGGER20|SWAGGERYAML|OAS3|OPENAPI3YAML|APIBLUEPRINT|RAML|
-                             RAML10|POSTMAN10|POSTMAN20|GRAPHQLSCHEMA
-      --url=<value>          URL to the API specification file to transform. Can be used in place of the --file option
-                             if the API specification is publicly available.
+      --format=<option>      (required) specification format to transform API specification into
+                             <options: apimatic|wadl2009|wsdl|swagger10|swagger20|swaggeryaml|oas3|openapi3yaml|apibluep
+                             rint|raml|raml10|postman10|postman20|graphqlschema>
+      --url=<value>          URL to the API specification file to transform (publicly accessible)
 
 DESCRIPTION
-  Transform API specifications from one format to another. Supports [10+ different
-  formats](https://www.apimatic.io/transformer/#supported-formats) including OpenApi/Swagger, RAML, WSDL and Postman
-  Collections.
+  Transform API specifications between different formats.
+
+  Transform API specifications from one format to another.
+  Supports multiple formats including OpenAPI/Swagger, RAML, WSDL, and Postman Collections.
 
 EXAMPLES
-  $ apimatic api transform --format=OPENAPI3YAML --file="./specs/sample.json" --destination="D:/"
+  apimatic api transform --format=OPENAPI3YAML --file=./specs/sample.json --destination=./
 
-  $ apimatic api transform --format=RAML --url="https://petstore.swagger.io/v2/swagger.json"  --destination="D:/"
+  apimatic api transform --format=RAML --url="https://petstore.swagger.io/v2/swagger.json" --destination=./
 ```
 
 _See code: [src/commands/api/transform.ts](https://github.com/apimatic/apimatic-cli/blob/alpha/src/commands/api/transform.ts)_
 
 ## `apimatic api validate`
 
-Validate the syntactic and semantic correctness of an API specification
+Validate API specification for syntactic and semantic correctness.
 
 ```
 USAGE
@@ -92,23 +94,24 @@ USAGE
 FLAGS
   -k, --auth-key=<value>  override current authentication state with an authentication key.
       --file=<value>      Path to the API specification file to validate
-      --url=<value>       URL to the specification file to validate. Can be used in place of the --file option if the
-                          API specification is publicly available.
+      --url=<value>       URL to the API specification file to validate (publicly accessible)
 
 DESCRIPTION
-  Validate the syntactic and semantic correctness of an API specification
+  Validate API specification for syntactic and semantic correctness.
+
+  Validate your API specification to ensure it adheres to syntactic and semantic standards.
 
 EXAMPLES
-  $ apimatic api validate --file="./specs/sample.json"
+  apimatic api validate --file=./specs/sample.json
 
-  $ apimatic api validate --url=https://petstore.swagger.io/v2/swagger.json
+  apimatic api validate --url="https://petstore.swagger.io/v2/swagger.json"
 ```
 
 _See code: [src/commands/api/validate.ts](https://github.com/apimatic/apimatic-cli/blob/alpha/src/commands/api/validate.ts)_
 
 ## `apimatic auth login`
 
-Login using your APIMatic credentials or an API Key
+Login to your APIMatic account.
 
 ```
 USAGE
@@ -118,12 +121,14 @@ FLAGS
   -k, --auth-key=<value>  Sets authentication key for all commands.
 
 DESCRIPTION
+  Login to your APIMatic account.
+
   Login using your APIMatic credentials or an API Key
 
 EXAMPLES
-  $ apimatic auth login
+  apimatic auth login
 
-  $ apimatic auth login --auth-key={api-key}
+  apimatic auth login --auth-key={api-key}
 ```
 
 _See code: [src/commands/auth/login.ts](https://github.com/apimatic/apimatic-cli/blob/alpha/src/commands/auth/login.ts)_
@@ -139,8 +144,10 @@ USAGE
 DESCRIPTION
   Clears the local login credentials.
 
+  Clears the local login credentials. This will also clear any cached credentials from the CLI.
+
 EXAMPLES
-  $ apimatic auth logout
+  apimatic auth logout
 ```
 
 _See code: [src/commands/auth/logout.ts](https://github.com/apimatic/apimatic-cli/blob/alpha/src/commands/auth/logout.ts)_
@@ -157,7 +164,7 @@ DESCRIPTION
   View the currently logged in user.
 
 EXAMPLES
-  $ apimatic auth status
+  apimatic auth status
 ```
 
 _See code: [src/commands/auth/status.ts](https://github.com/apimatic/apimatic-cli/blob/alpha/src/commands/auth/status.ts)_
@@ -233,19 +240,19 @@ DESCRIPTION
 
   Displays available API Copilots associated with your account and allows you to select which one to integrate with your
   portal. Each APIMatic account includes one Copilot by default. The selected Copilot will be added to your
-  APIMATIC-BUILD.json file
+  'APIMATIC-BUILD.json' file
 
 EXAMPLES
-  $ apimatic portal copilot --input="./"
+  apimatic portal copilot --input=./
 
-  $ apimatic portal copilot --input="./" --disable
+  apimatic portal copilot --input=./ --disable
 ```
 
 _See code: [src/commands/portal/copilot.ts](https://github.com/apimatic/apimatic-cli/blob/alpha/src/commands/portal/copilot.ts)_
 
 ## `apimatic portal generate`
 
-Generate an API Documentation portal. Requires an input directory containing API specifications, a config file and optionally, markdown guides. For details, refer to the [documentation](https://docs.apimatic.io/platform-api/#/http/guides/generating-on-prem-api-portal/build-file-reference)
+Generate an API Documentation portal.
 
 ```
 USAGE
@@ -260,86 +267,96 @@ FLAGS
       --zip                  download the generated portal as a .zip archive
 
 DESCRIPTION
+  Generate an API Documentation portal.
+
   Generate an API Documentation portal. Requires an input directory containing API specifications, a config file and
   optionally, markdown guides. For details, refer to the [documentation](https://docs.apimatic.io/platform-api/#/http/gu
   ides/generating-on-prem-api-portal/build-file-reference)
 
 EXAMPLES
-  $ apimatic portal generate
+  apimatic portal generate
 
-  $ apimatic portal generate --input="./" --destination="./portal"
+  apimatic portal generate --input="./" --destination="./portal"
 ```
 
 _See code: [src/commands/portal/generate.ts](https://github.com/apimatic/apimatic-cli/blob/alpha/src/commands/portal/generate.ts)_
 
 ## `apimatic portal quickstart`
 
-Create your first API Portal using APIMatic's Docs as Code offering.
+Get started with your first API Portal in four easy steps.
 
 ```
 USAGE
   $ apimatic portal quickstart
 
 DESCRIPTION
+  Get started with your first API Portal in four easy steps.
+
   Create your first API Portal using APIMatic's Docs as Code offering.
 
 EXAMPLES
-  $ apimatic portal quickstart
+  apimatic portal quickstart
 ```
 
 _See code: [src/commands/portal/quickstart.ts](https://github.com/apimatic/apimatic-cli/blob/alpha/src/commands/portal/quickstart.ts)_
 
 ## `apimatic portal recipe new`
 
-Add an API Recipe to your API Documentation portal.
+Add an API Recipe to your API documentation portal.
 
 ```
 USAGE
-  $ apimatic portal recipe new [--name <value>] [-i <value>]
+  $ apimatic portal recipe new [--name <value>] [-i <value>] [-f]
 
 FLAGS
+  -f, --force          overwrite changes without asking for user consent.
   -i, --input=<value>  [default: ./] path to the parent directory containing the 'src' directory, which includes API
                        specifications and configuration files.
       --name=<value>   name for the recipe
 
 DESCRIPTION
-  Add an API Recipe to your API Documentation portal.
+  Add an API Recipe to your API documentation portal.
+
+  This command adds a new API Recipe file to your documentation portal.
 
   To learn more about API Recipes, visit:
   https://docs.apimatic.io/platform-api/#/http/guides/generating-on-prem-api-portal/api-recipes
 
 EXAMPLES
-  $ apimatic portal recipe new
+  apimatic portal recipe new
 
-  $ apimatic portal recipe new --name="My API Recipe" --input="./"
+  apimatic portal recipe new --name="My API Recipe" --input="./"
 ```
 
 _See code: [src/commands/portal/recipe/new.ts](https://github.com/apimatic/apimatic-cli/blob/alpha/src/commands/portal/recipe/new.ts)_
 
 ## `apimatic portal serve`
 
-Generate and deploy a Docs as Code portal with hot reload.
+Generate and serve an API Documentation Portal with hot reload.
 
 ```
 USAGE
-  $ apimatic portal serve [-p <value>] [-i <value>] [-d <value>] [-o] [--no-reload] [-k <value>]
+  $ apimatic portal serve [-p 3000] [-i <value>] [-d <value>] [-o] [--no-reload] [-k <value>]
 
 FLAGS
   -d, --destination=<value>  [default: <input>/portal] path where the portal will be generated.
   -i, --input=<value>        [default: ./] path to the parent directory containing the 'src' directory, which includes
                              API specifications and configuration files.
   -k, --auth-key=<value>     override current authentication state with an authentication key.
-  -o, --open                 Open the portal in the default browser.
-  -p, --port=<value>         [default: 3000] port to serve the portal.
-      --no-reload            Disable hot reload.
+  -o, --open                 open the portal in the default browser.
+  -p, --port=3000            [default: 3000] port to serve the portal.
+      --no-reload            disable hot reload.
 
 DESCRIPTION
-  Generate and deploy a Docs as Code portal with hot reload.
+  Generate and serve an API Documentation Portal with hot reload.
+
+  Requires an input directory with API specifications, a config file, and optionally markdown guides. Supports disabling
+  hot reload and opening the portal in the default browser.
 
 EXAMPLES
-  $ apimatic portal serve
+  apimatic portal serve
 
-  $ apimatic portal serve --input="./" --destination="./portal" --port=3000 --open --no-reload
+  apimatic portal serve --input=./ --destination=./portal --port=3000 --open --no-reload
 ```
 
 _See code: [src/commands/portal/serve.ts](https://github.com/apimatic/apimatic-cli/blob/alpha/src/commands/portal/serve.ts)_
@@ -353,7 +370,7 @@ USAGE
   $ apimatic portal toc new [-d <value>] [-i <value>] [-f] [--expand-endpoints] [--expand-models]
 
 FLAGS
-  -d, --destination=<value>  [default: <input>/src/content] path where the 'toc.yml' will be generated.
+  -d, --destination=<value>  [default: <input>/src/content] path where the toc.yml will be generated.
   -f, --force                overwrite changes without asking for user consent.
   -i, --input=<value>        [default: ./] path to the parent directory containing the 'src' directory, which includes
                              API specifications and configuration files.
@@ -374,11 +391,11 @@ DESCRIPTION
   https://docs.apimatic.io/platform-api/#/http/guides/generating-on-prem-api-portal/overview-generating-api-portal
 
 EXAMPLES
-  $ apimatic portal toc new --destination="./src/content/"
+  apimatic portal toc new --destination=./src/content/
 
-  $ apimatic portal toc new --input="./"
+  apimatic portal toc new --input=./
 
-  $ apimatic portal toc new --input="./" --destination="./src/content/"
+  apimatic portal toc new --input=./ --destination=./src/content/
 ```
 
 _See code: [src/commands/portal/toc/new.ts](https://github.com/apimatic/apimatic-cli/blob/alpha/src/commands/portal/toc/new.ts)_
@@ -393,21 +410,26 @@ USAGE
     [-k <value>]
 
 FLAGS
-  -d, --destination=<value>  [default: ./sdk/<language>] path where the sdk will be generated.
+  -d, --destination=<value>  directory where the SDK will be generated
   -f, --force                overwrite changes without asking for user consent.
   -k, --auth-key=<value>     override current authentication state with an authentication key.
-  -l, --language=<option>    (required) language for which the sdk will be generated.
+  -l, --language=<option>    (required) programming language for SDK generation
                              <options: csharp|java|php|python|ruby|typescript|go>
-      --spec=<value>         [default: ./src/spec] path to the folder containing the API specification file.
-      --zip                  download the generated SDK as a .zip archive.
+      --spec=<value>         [default: ./src/spec] path to the folder containing the API specification file
+      --zip                  download the generated SDK as a .zip archive
 
 DESCRIPTION
   Generate an SDK for your API
 
+  Generate Software Development Kits (SDKs) from API specifications.
+  Supports multiple programming languages including Java, C#, Python, JavaScript, and more.
+
 EXAMPLES
-  $ apimatic sdk generate --language=java
+  apimatic sdk generate --language=java
+
+  apimatic sdk generate --language=csharp --spec=./src/spec
 
-  $ apimatic sdk generate --language=csharp --spec="./src/spec"
+  apimatic sdk generate --language=python --destination=./sdk --zip
 ```
 
 _See code: [src/commands/sdk/generate.ts](https://github.com/apimatic/apimatic-cli/blob/v1.1.0-alpha.21/src/commands/sdk/generate.ts)_
diff --git a/eslint.config.js b/eslint.config.js
index 4bf287062..b3323789a 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -12,6 +12,9 @@ export default [
       sourceType: "module",
       globals: {
         process: "readonly",
+        setTimeout: "readonly",
+        clearTimeout: "readonly",
+        URL: "readonly",
         NodeJS: true,
       },
     },
diff --git a/package-lock.json b/package-lock.json
index 997a8d843..c5aa171e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@apimatic/cli",
-    "version": "1.1.0-alpha.21",
+    "version": "1.1.0-alpha.22",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@apimatic/cli",
-            "version": "1.1.0-alpha.21",
+            "version": "1.1.0-alpha.22",
             "license": "MIT",
             "dependencies": {
                 "@apimatic/sdk": "^0.2.0-alpha.4",
@@ -32,7 +32,6 @@
                 "prettier": "^2.8.8",
                 "striptags": "^3.2.0",
                 "tmp-promise": "^3.0.3",
-                "treeify": "^1.1.0",
                 "tslib": "^2.8.1",
                 "uuid": "^11.1.0",
                 "yaml": "^2.8.0"
@@ -43,6 +42,7 @@
             "devDependencies": {
                 "@commitlint/cli": "^15.0.0",
                 "@commitlint/config-conventional": "^15.0.0",
+                "@eslint/js": "^9.34.0",
                 "@oclif/test": "^4.1.13",
                 "@types/archiver": "^5.3.4",
                 "@types/base-64": "^1.0.0",
@@ -2314,9 +2314,9 @@
             }
         },
         "node_modules/@eslint/config-array": {
-            "version": "0.20.1",
-            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.1.tgz",
-            "integrity": "sha512-OL0RJzC/CBzli0DrrR31qzj6d6i6Mm3HByuhflhl4LOBiWxN+3i6/t/ZQQNii4tjksXi8r2CRW1wMpWA2ULUEw==",
+            "version": "0.21.0",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
+            "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -2329,7 +2329,9 @@
             }
         },
         "node_modules/@eslint/config-array/node_modules/brace-expansion": {
-            "version": "1.1.11",
+            "version": "1.1.12",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2339,6 +2341,8 @@
         },
         "node_modules/@eslint/config-array/node_modules/minimatch": {
             "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
@@ -2349,9 +2353,9 @@
             }
         },
         "node_modules/@eslint/config-helpers": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.3.tgz",
-            "integrity": "sha512-u180qk2Um1le4yf0ruXH3PYFeEZeYC3p/4wCTKrr2U1CmGdzGi3KtY0nuPDH48UJxlKCC5RDzbcbh4X0XlqgHg==",
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
+            "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -2359,9 +2363,9 @@
             }
         },
         "node_modules/@eslint/core": {
-            "version": "0.14.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
-            "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
+            "version": "0.15.2",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
+            "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -2396,7 +2400,9 @@
             }
         },
         "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-            "version": "1.1.11",
+            "version": "1.1.12",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2416,9 +2422,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "9.29.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.29.0.tgz",
-            "integrity": "sha512-3PIF4cBw/y+1u2EazflInpV+lYsSG0aByVIQzAgb1m1MhHFSbqTyNqtBKHgWf/9Ykud+DhILS9EGkmekVhbKoQ==",
+            "version": "9.34.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.34.0.tgz",
+            "integrity": "sha512-EoyvqQnBNsV1CWaEJ559rxXL4c8V92gxirbawSmVUOWXlsRxxQXl6LmCpdUblgxgSkDIqKnhzba2SjRTI/A5Rw==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2430,6 +2436,8 @@
         },
         "node_modules/@eslint/object-schema": {
             "version": "2.1.6",
+            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+            "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -2437,32 +2445,19 @@
             }
         },
         "node_modules/@eslint/plugin-kit": {
-            "version": "0.3.2",
-            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.2.tgz",
-            "integrity": "sha512-4SaFZCNfJqvk/kenHpI8xvN42DMaoycy4PzKc5otHxRswww1kAt82OlBuwRVLofCACCTZEcla2Ydxv8scMXaTg==",
+            "version": "0.3.5",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
+            "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@eslint/core": "^0.15.0",
+                "@eslint/core": "^0.15.2",
                 "levn": "^0.4.1"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
         },
-        "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
-            "version": "0.15.0",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.0.tgz",
-            "integrity": "sha512-b7ePw78tEWWkpgZCDYkbqDOP8dmM6qe+AOC6iuJqlq1R/0ahMAeH3qynpnqKFGkMltrp44ohV4ubGyvLX28tzw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@types/json-schema": "^7.0.15"
-            },
-            "engines": {
-                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-            }
-        },
         "node_modules/@humanfs/core": {
             "version": "0.19.1",
             "dev": true,
@@ -2840,15 +2835,15 @@
             }
         },
         "node_modules/@inquirer/editor": {
-            "version": "4.2.13",
-            "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.13.tgz",
-            "integrity": "sha512-WbicD9SUQt/K8O5Vyk9iC2ojq5RHoCLK6itpp2fHsWe44VxxcA9z3GTWlvjSTGmMQpZr+lbVmrxdHcumJoLbMA==",
+            "version": "4.2.18",
+            "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.18.tgz",
+            "integrity": "sha512-yeQN3AXjCm7+Hmq5L6Dm2wEDeBRdAZuyZ4I7tWSSanbxDzqM0KqzoDbKM7p4ebllAYdoQuPJS6N71/3L281i6w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@inquirer/core": "^10.1.13",
-                "@inquirer/type": "^3.0.7",
-                "external-editor": "^3.1.0"
+                "@inquirer/core": "^10.2.0",
+                "@inquirer/external-editor": "^1.0.1",
+                "@inquirer/type": "^3.0.8"
             },
             "engines": {
                 "node": ">=18"
@@ -2863,14 +2858,14 @@
             }
         },
         "node_modules/@inquirer/editor/node_modules/@inquirer/core": {
-            "version": "10.1.13",
-            "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.13.tgz",
-            "integrity": "sha512-1viSxebkYN2nJULlzCxES6G9/stgHSepZ9LqqfdIGPHj5OHhiBUXVS0a6R0bEC2A+VL4D9w6QB66ebCr6HGllA==",
+            "version": "10.2.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.2.0.tgz",
+            "integrity": "sha512-NyDSjPqhSvpZEMZrLCYUquWNl+XC/moEcVFqS55IEYIYsY0a1cUCevSqk7ctOlnm/RaSBU5psFryNlxcmGrjaA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@inquirer/figures": "^1.0.12",
-                "@inquirer/type": "^3.0.7",
+                "@inquirer/figures": "^1.0.13",
+                "@inquirer/type": "^3.0.8",
                 "ansi-escapes": "^4.3.2",
                 "cli-width": "^4.1.0",
                 "mute-stream": "^2.0.0",
@@ -2891,9 +2886,9 @@
             }
         },
         "node_modules/@inquirer/editor/node_modules/@inquirer/type": {
-            "version": "3.0.7",
-            "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.7.tgz",
-            "integrity": "sha512-PfunHQcjwnju84L+ycmcMKB/pTPIngjUJvfnRhKY6FKPuYXlM4aQCb/nIdTFR6BEhMjFvngzvng/vBAJMZpLSA==",
+            "version": "3.0.8",
+            "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.8.tgz",
+            "integrity": "sha512-lg9Whz8onIHRthWaN1Q9EGLa/0LFJjyM8mEUbL1eTi6yMGvBf8gvyDLtxSXztQsxMvhxxNpJYrwa1YHdq+w4Jw==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -3079,10 +3074,45 @@
                 "node": ">=8"
             }
         },
+        "node_modules/@inquirer/external-editor": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-1.0.1.tgz",
+            "integrity": "sha512-Oau4yL24d2B5IL4ma4UpbQigkVhzPDXLoqy1ggK4gnHg/stmkffJE4oOXHXF3uz0UEpywG68KcyXsyYpA1Re/Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "chardet": "^2.1.0",
+                "iconv-lite": "^0.6.3"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "peerDependencies": {
+                "@types/node": ">=18"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@inquirer/external-editor/node_modules/iconv-lite": {
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+            "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "safer-buffer": ">= 2.1.2 < 3.0.0"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
         "node_modules/@inquirer/figures": {
-            "version": "1.0.12",
-            "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.12.tgz",
-            "integrity": "sha512-MJttijd8rMFcKJC8NYmprWr6hD3r9Gd9qUC0XwPNwoEPWSMVJwA2MlXxF+nhZZNMY+HXsWa+o7KY2emWYIn0jQ==",
+            "version": "1.0.13",
+            "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.13.tgz",
+            "integrity": "sha512-lGPVU3yO9ZNqA7vTYz26jny41lE7yoQansmqdMLBEfqaGsmdg7V3W9mK9Pvb5IL4EVZ9GnSDGMO/cJXud5dMaw==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -5420,6 +5450,8 @@
         },
         "node_modules/@types/json-schema": {
             "version": "7.0.15",
+            "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+            "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
             "dev": true,
             "license": "MIT"
         },
@@ -6649,7 +6681,9 @@
             "license": "MIT"
         },
         "node_modules/brace-expansion": {
-            "version": "2.0.1",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
             "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0"
@@ -6958,7 +6992,9 @@
             }
         },
         "node_modules/chardet": {
-            "version": "0.7.0",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.1.0.tgz",
+            "integrity": "sha512-bNFETTG/pM5ryzQ9Ad0lJOTa6HWD/YsScAR3EnCPZRPlQh77JocYktSHOUHelyhm8IARL+o4c4F1bP5KVOjiRA==",
             "dev": true,
             "license": "MIT"
         },
@@ -7944,18 +7980,20 @@
             }
         },
         "node_modules/eslint": {
-            "version": "9.21.0",
+            "version": "9.34.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.34.0.tgz",
+            "integrity": "sha512-RNCHRX5EwdrESy3Jc9o8ie8Bog+PeYvvSR8sDGoZxNFTvZ4dlxUB3WzQ3bQMztFrSRODGrLLj8g6OFuGY/aiQg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.12.1",
-                "@eslint/config-array": "^0.20.1",
-                "@eslint/config-helpers": "^0.2.1",
-                "@eslint/core": "^0.14.0",
+                "@eslint/config-array": "^0.21.0",
+                "@eslint/config-helpers": "^0.3.1",
+                "@eslint/core": "^0.15.2",
                 "@eslint/eslintrc": "^3.3.1",
-                "@eslint/js": "9.29.0",
-                "@eslint/plugin-kit": "^0.3.1",
+                "@eslint/js": "9.34.0",
+                "@eslint/plugin-kit": "^0.3.5",
                 "@humanfs/node": "^0.16.6",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@humanwhocodes/retry": "^0.4.2",
@@ -8088,7 +8126,9 @@
             }
         },
         "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
-            "version": "1.1.11",
+            "version": "1.1.12",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -8152,7 +8192,9 @@
             }
         },
         "node_modules/eslint/node_modules/brace-expansion": {
-            "version": "1.1.11",
+            "version": "1.1.12",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -8430,19 +8472,6 @@
             "version": "2.0.0",
             "license": "MIT"
         },
-        "node_modules/external-editor": {
-            "version": "3.1.0",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "chardet": "^0.7.0",
-                "iconv-lite": "^0.4.24",
-                "tmp": "^0.0.33"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/extract-zip": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
@@ -8776,7 +8805,9 @@
             }
         },
         "node_modules/form-data": {
-            "version": "4.0.2",
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+            "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
             "license": "MIT",
             "dependencies": {
                 "asynckit": "^0.4.0",
@@ -10183,7 +10214,9 @@
             }
         },
         "node_modules/jake/node_modules/brace-expansion": {
-            "version": "1.1.11",
+            "version": "1.1.12",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
             "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0",
@@ -11585,14 +11618,6 @@
             "version": "2.0.2",
             "license": "BSD-2-Clause"
         },
-        "node_modules/os-tmpdir": {
-            "version": "1.0.2",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/outvariant": {
             "version": "1.4.3",
             "resolved": "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz",
@@ -13346,7 +13371,9 @@
             }
         },
         "node_modules/test-exclude/node_modules/brace-expansion": {
-            "version": "1.1.11",
+            "version": "1.1.12",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+            "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -13460,14 +13487,12 @@
             }
         },
         "node_modules/tmp": {
-            "version": "0.0.33",
-            "dev": true,
+            "version": "0.2.5",
+            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
+            "integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
             "license": "MIT",
-            "dependencies": {
-                "os-tmpdir": "~1.0.2"
-            },
             "engines": {
-                "node": ">=0.6.0"
+                "node": ">=14.14"
             }
         },
         "node_modules/tmp-promise": {
@@ -13479,14 +13504,6 @@
                 "tmp": "^0.2.0"
             }
         },
-        "node_modules/tmp-promise/node_modules/tmp": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
-            "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
-            "engines": {
-                "node": ">=14.14"
-            }
-        },
         "node_modules/to-regex-range": {
             "version": "5.0.1",
             "license": "MIT",
@@ -13504,13 +13521,6 @@
                 "node": ">=0.6"
             }
         },
-        "node_modules/treeify": {
-            "version": "1.1.0",
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.6"
-            }
-        },
         "node_modules/trim-newlines": {
             "version": "3.0.1",
             "dev": true,
diff --git a/package.json b/package.json
index 5048856b7..b9305fc60 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@apimatic/cli",
     "description": "The official CLI for APIMatic.",
-    "version": "1.1.0-alpha.21",
+    "version": "1.1.0-alpha.22",
     "author": "APIMatic",
     "bin": {
         "apimatic": "./bin/run.js"
@@ -70,7 +70,6 @@
         "prettier": "^2.8.8",
         "striptags": "^3.2.0",
         "tmp-promise": "^3.0.3",
-        "treeify": "^1.1.0",
         "tslib": "^2.8.1",
         "uuid": "^11.1.0",
         "yaml": "^2.8.0"
@@ -78,6 +77,7 @@
     "devDependencies": {
         "@commitlint/cli": "^15.0.0",
         "@commitlint/config-conventional": "^15.0.0",
+        "@eslint/js": "^9.34.0",
         "@oclif/test": "^4.1.13",
         "@types/archiver": "^5.3.4",
         "@types/base-64": "^1.0.0",
diff --git a/src/actions/action-result.ts b/src/actions/action-result.ts
index 52493a9b2..49752bca6 100644
--- a/src/actions/action-result.ts
+++ b/src/actions/action-result.ts
@@ -1,62 +1,54 @@
-export enum ActionResultType {
-  Success,
-  Error,
-  Cancelled
+enum ResultType {
+  Success= 0,
+  Cancel = 130,
+  Failure= 1
 }
 
 export class ActionResult {
-  private readonly type: ActionResultType;
-  private readonly message: string | undefined;
+  private readonly message: string;
+  private readonly resultType: ResultType;
 
-  private constructor(type: ActionResultType, message?: string) {
-    this.type = type;
+  private constructor(resultType: ResultType, message: string) {
+    this.resultType = resultType;
     this.message = message;
   }
 
-  static error(message: string) {
-    return new ActionResult(ActionResultType.Error, message);
+  static success() {
+    return new ActionResult(ResultType.Success, " Succeeded ");
   }
 
-  static success(message?: string) {
-    return new ActionResult(ActionResultType.Success, message);
+  static failed() {
+    return new ActionResult(ResultType.Failure, " Failed ");
   }
 
-  static cancelled(message?: string) {
-    return new ActionResult(ActionResultType.Cancelled, message);
+  static cancelled() {
+    return new ActionResult(ResultType.Cancel, " Cancelled ");
   }
 
-  map(onError: (message: string) => void) {
-    if (this.type === ActionResultType.Error && this.message) {
-      onError(this.message);
-    }
+  static stopped() {
+    return new ActionResult(ResultType.Cancel, " Stopped ");
   }
 
-  mapAll<T>(onSuccess: (message?: string) => T, onError: (message: string) => T, onCancelled: (message: string) => T) {
-    switch (this.type) {
-      case ActionResultType.Success:
-        return onSuccess(this.message);
-      case ActionResultType.Error:
-        return onError(this.message || "Unknown error");
-      case ActionResultType.Cancelled:
-        return onCancelled(this.message || "Operation cancelled");
-      default:
-        throw new Error(`Unknown ActionResultType: ${this.type}`);
-    }
+  public getMessage() {
+    return this.message;
   }
 
-  getType(): ActionResultType {
-    return this.type;
+  public getExitCode() {
+    return this.resultType.valueOf();
   }
 
-  isSuccess(): boolean {
-    return this.type === ActionResultType.Success;
+  public isFailed() {
+    return this.resultType === ResultType.Failure;
   }
 
-  isError(): boolean {
-    return this.type === ActionResultType.Error;
-  }
-
-  isCancelled(): boolean {
-    return this.type === ActionResultType.Cancelled;
+  public mapAll<T>(onSuccess: () => T, onFailure: () => T, onCancel: () => T): T {
+    switch (this.resultType) {
+      case ResultType.Success:
+        return onSuccess();
+      case ResultType.Failure:
+        return onFailure();
+      case ResultType.Cancel:
+        return onCancel();
+    }
   }
 }
diff --git a/src/actions/api/transform.ts b/src/actions/api/transform.ts
index 119a0f469..4efbeb9b8 100644
--- a/src/actions/api/transform.ts
+++ b/src/actions/api/transform.ts
@@ -1,31 +1,19 @@
-import fsExtra from "fs-extra";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { ActionResult } from "../action-result.js";
 import { ApiTransformPrompts } from "../../prompts/api/transform.js";
-import { DestinationFormats } from "../../types/api/transform.js";
-import { getFileNameFromPath } from "../../utils/utils.js";
-import { FileService } from "../../infrastructure/file-service.js";
-import { validateFileInputParams } from "../../infrastructure/api-utils.js";
 import { withDirPath } from "../../infrastructure/tmp-extensions.js";
-import { TransformationService } from "../../infrastructure/services/transform-service.js";
-import { FilePath } from "../../types/file/filePath.js";
-import { FileName } from "../../types/file/fileName.js";
-import { Result } from "../../types/common/result.js";
-import { ApiValidationSummary } from "@apimatic/sdk";
+import { TransformationService } from "../../infrastructure/services/transformation-service.js";
+import { ExportFormats } from "@apimatic/sdk";
 import { ApiValidatePrompts } from "../../prompts/api/validate.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
-import { getValidFormat } from "../../controllers/api/transform.js";
-
-export interface TransformationResultData {
-  stream: NodeJS.ReadableStream;
-  apiValidationSummary: ApiValidationSummary;
-}
+import { TransformContext } from "../../types/transform-context.js";
+import { ResourceInput } from "../../types/file/resource-input.js";
+import { ResourceContext } from "../../types/resource-context.js";
 
 export class TransformAction {
   private readonly prompts: ApiTransformPrompts = new ApiTransformPrompts();
   private readonly validatePrompts: ApiValidatePrompts = new ApiValidatePrompts();
   private readonly transformationService: TransformationService = new TransformationService();
-  private readonly fileService: FileService = new FileService();
   private readonly configDir: DirectoryPath;
   private readonly commandMetadata: CommandMetadata;
   private readonly authKey: string | null;
@@ -37,72 +25,43 @@ export class TransformAction {
   }
 
   public readonly execute = async (
-    format: string,
+    resourcePath: ResourceInput,
+    format: ExportFormats,
     destination: DirectoryPath,
-    force: boolean,
-    file?: FilePath,
-    url?: string
+    force: boolean
   ): Promise<ActionResult> => {
-    const validationResult = await validateFileInputParams(file, url);
-
-    if (!validationResult.isSuccess()) {
-      return ActionResult.error(validationResult.error!);
-    }
-
-    this.prompts.displayApiTransformationMessage();
-
-    const parsedFormat = getValidFormat(format);
-
-    const destinationFileExt: string = DestinationFormats[format as keyof typeof DestinationFormats];
-    const destinationFilePrefix = file ? getFileNameFromPath(file.toString()) : getFileNameFromPath(url || "");
-
-    const destinationFileName = `${destinationFilePrefix}_${format}.${destinationFileExt}`;
-    const destinationFilePath = new FilePath(destination, new FileName(destinationFileName));
-
-    if ((await fsExtra.pathExists(destinationFilePath.toString())) && !force) {
-      return ActionResult.error(
-        `Can't download transformed file to path ${destinationFilePath.toString()}, because it already exists`
-      );
-    }
-
-    if (!(await fsExtra.pathExists(destination.toString()))) {
-      await fsExtra.ensureDir(destination.toString());
-    }
-
     return await withDirPath(async (tempDirectory) => {
-      let result: Result<TransformationResultData, string>;
+      const resourceContext = new ResourceContext(tempDirectory);
+      const specFileDirResult = await resourceContext.resolveTo(resourcePath);
+      if (specFileDirResult.isErr()) {
+        this.prompts.networkError(specFileDirResult.error);
+        return ActionResult.failed();
+      }
+      const transformContext = new TransformContext(specFileDirResult.value, format, destination);
+      if (!force && (await transformContext.exists()) && !(await this.prompts.overwriteApi(destination))) {
+        this.prompts.transformedApiAlreadyExists();
+        return ActionResult.cancelled();
+      }
 
-      if (file) {
-        result = await this.transformationService.transformViaFile({
-          file,
-          format: parsedFormat,
-          configDir: this.configDir,
-          commandMetadata: this.commandMetadata,
-          authKey: this.authKey
-        });
-      } else {
-        result = await this.transformationService.transformViaUrl({
-          url: url!,
-          format: parsedFormat,
+      const result = await this.prompts.transformApi(
+        this.transformationService.transformViaFile({
+          file: specFileDirResult.value,
+          format: format,
           configDir: this.configDir,
           commandMetadata: this.commandMetadata,
           authKey: this.authKey
-        });
-      }
-
-      const tempTransformedFilePath = new FilePath(tempDirectory, new FileName(`transformed_${destinationFileName}`));
-      await this.fileService.writeFile(tempTransformedFilePath, result.value?.stream as NodeJS.ReadableStream);
+        })
+      );
 
-      if (!result.isSuccess()) {
-        this.validatePrompts.displayValidationMessages(
-          result.value?.apiValidationSummary || { warnings: [], errors: [], messages: [] }
-        );
-        this.prompts.displayApiTransformationFailureMessage();
-        return ActionResult.error(result.error || "An unknown error occurred");
+      if (result.isErr()) {
+        this.prompts.logTransformationError(result.error);
+        return ActionResult.failed();
       }
 
-      this.prompts.displayApiTransformationSuccessMessage();
-      this.validatePrompts.displayValidationMessages(result.value!.apiValidationSummary);
+      const transformedFilePath = await transformContext.save(result.value.stream);
+      this.validatePrompts.displayValidationMessages(result.value.apiValidationSummary);
+
+      this.validatePrompts.transformedApiSaved(transformedFilePath);
 
       return ActionResult.success();
     });
diff --git a/src/actions/api/validate.ts b/src/actions/api/validate.ts
index 69e9d752d..4af0ee70f 100644
--- a/src/actions/api/validate.ts
+++ b/src/actions/api/validate.ts
@@ -2,60 +2,55 @@ import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { ActionResult } from "../action-result.js";
 import { ApiValidatePrompts } from "../../prompts/api/validate.js";
 import { ValidationService } from "../../infrastructure/services/validation-service.js";
-import { FilePath } from "../../types/file/filePath.js";
-import { ApiValidationSummary } from "@apimatic/sdk";
-import { Result } from "../../types/common/result.js";
-import { validateFileInputParams } from "../../infrastructure/api-utils.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { ResourceInput } from "../../types/file/resource-input.js";
+import { withDirPath } from "../../infrastructure/tmp-extensions.js";
+import { ResourceContext } from "../../types/resource-context.js";
 
 export class ValidateAction {
   private readonly prompts: ApiValidatePrompts = new ApiValidatePrompts();
   private readonly validationService: ValidationService;
   private readonly authKey: string | null;
+  private readonly commandMetadata: CommandMetadata;
 
   constructor(configDir: DirectoryPath, commandMetadata: CommandMetadata, authKey: string | null = null) {
     this.authKey = authKey;
-    this.validationService = new ValidationService(configDir, commandMetadata);
+    this.validationService = new ValidationService(configDir);
+    this.commandMetadata = commandMetadata;
   }
 
-  public readonly execute = async (file?: FilePath, url?: string): Promise<ActionResult> => {
-    const validationResult = await validateFileInputParams(file, url);
-
-    if (!validationResult.isSuccess()) {
-      return ActionResult.error(validationResult.error!);
-    }
-
-    this.prompts.displayValidationStartMessage();
-
-    let validationSummaryResult: Result<ApiValidationSummary, string>;
-
-    if (file) {
-      validationSummaryResult = await this.validationService.validateViaFile({
-        file,
-        authKey: this.authKey
-      });
-    } else {
-      validationSummaryResult = await this.validationService.validateViaUrl({
-        url: url!,
-        authKey: this.authKey
-      });
-    }
-
-    if (!validationSummaryResult.isSuccess()) {
-      return ActionResult.error(validationSummaryResult.error! || "Validation failed with an unknown error");
-    }
-
-    const validationSummary = validationSummaryResult.value;
-    if (!validationSummary?.success) {
-      this.prompts.displayValidationFailureMessage();
-      if (validationSummary) {
+  public readonly execute = async (
+    resourcePath: ResourceInput,
+    displayValidationSummary = true
+  ): Promise<ActionResult> => {
+    return await withDirPath(async (tempDirectory) => {
+      const resourceContext = new ResourceContext(tempDirectory);
+      const specFileDirResult = await resourceContext.resolveTo(resourcePath);
+      if (specFileDirResult.isErr()) {
+        this.prompts.networkError(specFileDirResult.error);
+        return ActionResult.failed();
+      }
+      const validationSummaryResult = await this.prompts.validateApi(
+        this.validationService.validateViaFile({
+          file: specFileDirResult.value,
+          commandMetadata: this.commandMetadata,
+          authKey: this.authKey
+        })
+      );
+
+      if (validationSummaryResult.isErr()) {
+        this.prompts.logValidationError(validationSummaryResult.error);
+        return ActionResult.failed();
+      }
+      const validationSummary = validationSummaryResult.value;
+      if (displayValidationSummary) {
         this.prompts.displayValidationMessages(validationSummary);
       }
-      return ActionResult.error("Specification file provided is invalid");
-    }
+      if (!validationSummary.success) {
+        return ActionResult.failed();
+      }
 
-    this.prompts.displayValidationSuccessMessage();
-    this.prompts.displayValidationMessages(validationSummary);
-    return ActionResult.success();
+      return ActionResult.success();
+    });
   };
 }
diff --git a/src/actions/auth/login.ts b/src/actions/auth/login.ts
index 1f61d0081..f2e72601d 100644
--- a/src/actions/auth/login.ts
+++ b/src/actions/auth/login.ts
@@ -1,13 +1,15 @@
 import { AuthService } from "../../infrastructure/services/auth-service.js";
 import { ApiService } from "../../infrastructure/services/api-service.js";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
-import { err, ok, Result } from "neverthrow";
 import { v4 as uuid } from "uuid";
 import open from "open";
 import { setAuthInfo } from "../../client-utils/auth-manager.js";
 import { LoginPrompts } from "../../prompts/auth/login.js";
-import { getErrorMessage, ServiceError } from "../../infrastructure/api-utils.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { ActionResult } from "../action-result.js";
+import { err, ok, Result } from "neverthrow";
+
+type LoginTimeout = "TIMEOUT";
 
 export class LoginAction {
   private readonly authService = new AuthService();
@@ -16,20 +18,30 @@ export class LoginAction {
 
   constructor(private readonly configDir: DirectoryPath, private readonly commandMetadata: CommandMetadata) {}
 
-  public async execute(apiKey: string | undefined = undefined): Promise<Result<string, string>> {
-    if (!apiKey) {
-      const result = await this.poolDeviceToken(this.commandMetadata.shell);
-      return (
-        await result.asyncMap(async (token) => {
-          return await this.verifyKeyAndSave(token, this.commandMetadata.shell);
-        })
-      ).andThen((r) => r);
-    } else {
-      return await this.verifyKeyAndSave(apiKey, this.commandMetadata.shell);
+  public async execute(apiKey: string | undefined = undefined): Promise<ActionResult> {
+    const apiKeyResult = await this.pollDeviceToken(apiKey, this.commandMetadata.shell);
+    if (apiKeyResult.isErr()) {
+      this.prompts.loginTimeout();
+      return ActionResult.failed();
+    }
+
+    // TODO: Use status endpoint here
+    // Problem, we don't have email info here, just the key and required for setAuthInfo
+    const accountInfoResult =
+      await this.prompts.accountInfoSpinner(
+        this.apiService.getAccountInfo(this.configDir, this.commandMetadata.shell, apiKeyResult.value)
+      );
+    if (accountInfoResult.isErr()) {
+      this.prompts.invalidKeyProvided(accountInfoResult.error);
+      return ActionResult.failed();
     }
+    await setAuthInfo(accountInfoResult.value.Email, apiKeyResult.value, false, this.configDir);
+    this.prompts.loginSuccessful(accountInfoResult.value.Email);
+    return ActionResult.success();
   }
 
-  private async poolDeviceToken(shell: string): Promise<Result<string, string>> {
+  private async pollDeviceToken(apiKey: string | undefined, shell: string): Promise<Result<string, LoginTimeout>> {
+    if (apiKey) return ok(apiKey);
     const state = uuid();
     this.prompts.openBrowser();
     await open(this.authService.getDeviceLoginUrl(state));
@@ -40,37 +52,13 @@ export class LoginAction {
 
     while (true) {
       if (Date.now() - startTime > timeoutDuration) {
-        return err("Authentication timed out. Please try again.");
+        return err("TIMEOUT");
       }
-
       const result = await this.authService.getDeviceLoginToken(state, shell);
-      const token = result.match(
-        (res) => res.apiKey,
-        () => {
-          /* ignore errors */
-        }
-      );
-      if (token) return ok(token);
-
-      // eslint-disable-next-line no-undef
+      if (result.isOk()) {
+        return ok(result.value.apiKey);
+      }
       await new Promise((resolve) => setTimeout(resolve, delayMs));
     }
   }
-
-  private async verifyKeyAndSave(apiKey: string, shell: string): Promise<Result<string, string>> {
-    const result = await this.apiService.getAccountInfo(this.configDir, shell, apiKey);
-    return result
-      .asyncMap(async (info) => {
-        await setAuthInfo(info.Email, apiKey, false, this.configDir);
-        return info.Email;
-      })
-      .mapErr((e) => {
-        switch (e) {
-          case ServiceError.UnAuthorized:
-            return "The provided auth key is invalid";
-          default:
-            return getErrorMessage(e);
-        }
-      });
-  }
 }
diff --git a/src/actions/auth/logout.ts b/src/actions/auth/logout.ts
new file mode 100644
index 000000000..f03a10d71
--- /dev/null
+++ b/src/actions/auth/logout.ts
@@ -0,0 +1,16 @@
+import { DirectoryPath } from "../../types/file/directoryPath.js";
+import { ActionResult } from "../action-result.js";
+import { removeAuthInfo } from "../../client-utils/auth-manager.js";
+import { LogoutPrompts } from "../../prompts/auth/logout.js";
+
+export class LogoutAction {
+  private readonly prompts = new LogoutPrompts();
+
+  constructor(private readonly configDir: DirectoryPath) {}
+
+  public async execute(): Promise<ActionResult> {
+    await removeAuthInfo(this.configDir);
+    this.prompts.removeAuthInfo();
+    return ActionResult.success();
+  }
+}
diff --git a/src/actions/auth/status.ts b/src/actions/auth/status.ts
new file mode 100644
index 000000000..e77432bdc
--- /dev/null
+++ b/src/actions/auth/status.ts
@@ -0,0 +1,29 @@
+import { ActionResult } from "../action-result.js";
+import { DirectoryPath } from "../../types/file/directoryPath.js";
+import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { getAuthInfo } from "../../client-utils/auth-manager.js";
+import { StatusPrompts } from "../../prompts/auth/status.js";
+import { ApiService } from "../../infrastructure/services/api-service.js";
+
+export class StatusAction {
+  private readonly prompts = new StatusPrompts();
+  private readonly apiService = new ApiService();
+
+  constructor(private readonly configDir: DirectoryPath, private readonly commandMetadata: CommandMetadata) {}
+
+  public async execute(authKey: string | null): Promise<ActionResult> {
+    const accountInfo = await getAuthInfo(this.configDir.toString());
+    if (accountInfo === null) {
+      return ActionResult.failed();
+    }
+    const result = await this.prompts.accountInfoSpinner(
+      this.apiService.getAccountInfo(this.configDir, this.commandMetadata.shell, authKey)
+    );
+    if (result.isErr()) {
+      this.prompts.invalidKeyProvided(result.error);
+      return ActionResult.failed();
+    }
+    this.prompts.showAccountInfo(result.value);
+    return ActionResult.success();
+  }
+}
diff --git a/src/actions/portal/copilot.ts b/src/actions/portal/copilot.ts
index a1d08c742..b9ca65a7b 100644
--- a/src/actions/portal/copilot.ts
+++ b/src/actions/portal/copilot.ts
@@ -10,6 +10,10 @@ import { FileName } from "../../types/file/fileName.js";
 import { FileService } from "../../infrastructure/file-service.js";
 import { LauncherService } from "../../infrastructure/launcher-service.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { err, ok, Result } from "neverthrow";
+
+type SelectKeyFailure = "failed" | "cancelled";
+type SelectKeyResult = Result<string, SelectKeyFailure>;
 
 export class CopilotAction {
   private readonly apiService = new ApiService();
@@ -26,73 +30,78 @@ export class CopilotAction {
     this.authKey = authKey;
   }
 
-  public async execute(buildDirectory: DirectoryPath, force: boolean, enable: boolean): Promise<ActionResult> {
+  public readonly execute = async (
+    buildDirectory: DirectoryPath,
+    force: boolean,
+    enable: boolean
+  ): Promise<ActionResult> => {
     const buildContext = new BuildContext(buildDirectory);
 
     if (!(await buildContext.validate())) {
-      return ActionResult.error(
-        `Unable to locate a valid "src" directory. Navigate to the directory containing your APIMatic Portal source or set up a new project by running \`apimatic portal quickstart\`.`
-      );
+      this.prompts.srcDirectoryEmpty(buildDirectory);
+      return ActionResult.failed();
     }
 
     const buildJson = await buildContext.getBuildFileContents();
 
-    if (!force && buildJson.apiCopilotConfig != null && !(await this.prompts.confirmOverwrite()))
-      return ActionResult.error("Exiting without making any change.");
+    if (!force && buildJson.apiCopilotConfig != null && !(await this.prompts.confirmOverwrite())) {
+      this.prompts.cancelled();
+      return ActionResult.cancelled();
+    }
 
-    const response = await this.prompts.spinnerAccountInfo(() =>
+    const response = await this.prompts.spinnerAccountInfo(
       this.apiService.getAccountInfo(this.configDir, this.commandMetadata.shell, this.authKey)
     );
 
     if (response.isErr()) {
-      return ActionResult.error(response._unsafeUnwrapErr());
+      this.prompts.serviceError(response.error);
+      return ActionResult.failed();
     }
 
-    const apiCopilotKey = await this.selectCopilotKey(response._unsafeUnwrap(), force);
-    if (apiCopilotKey instanceof Error) {
-      return ActionResult.error(apiCopilotKey.message);
+    const apiCopilotKeyResult = await this.selectCopilotKey(response.value, force);
+    if (apiCopilotKeyResult.isErr()) {
+      if (apiCopilotKeyResult.error === "cancelled") return ActionResult.cancelled();
+      return ActionResult.failed();
     }
 
-    const welcomeMessage = await this.getWelcomeMessage();
+    const welcomeMessage = await this.prepareWelcomeMessage();
 
     buildJson.apiCopilotConfig = {
       isEnabled: enable,
-      key: apiCopilotKey,
+      key: apiCopilotKeyResult.value,
       welcomeMessage: welcomeMessage
     };
 
     await buildContext.updateBuildFileContents(buildJson);
 
-    this.prompts.copilotConfigured(enable, apiCopilotKey);
+    this.prompts.copilotConfigured(enable, apiCopilotKeyResult.value);
 
     return ActionResult.success();
-  }
+  };
 
-  private async selectCopilotKey(subscription: SubscriptionInfo | undefined, force: boolean): Promise<string | Error> {
-    if (
-      subscription === undefined ||
-      subscription.ApiCopilotKeys === undefined ||
-      subscription.ApiCopilotKeys.length === 0
-    ) {
-      return new Error(
-        "No copilot key found for the current subscription. Please contact support at support@apimatic.io."
-      );
+  private async selectCopilotKey(subscription: SubscriptionInfo, force: boolean): Promise<SelectKeyResult> {
+    if (subscription.ApiCopilotKeys === undefined || subscription.ApiCopilotKeys.length === 0) {
+      this.prompts.noCopilotKeyFound();
+      return err("failed");
     }
 
     if (subscription.ApiCopilotKeys.length === 1) {
       if (force || (await this.prompts.confirmSingleKeyUsage(subscription.ApiCopilotKeys[0])))
-        return subscription.ApiCopilotKeys[0];
-      return new Error("Operation cancelled. No API Copilot key was selected.");
+        return ok(subscription.ApiCopilotKeys[0]);
+      this.prompts.noCopilotKeySelected();
+      return err("cancelled");
     }
 
     const key = await this.prompts.selectCopilotKey(subscription.ApiCopilotKeys);
-    if (key === null) return new Error("Operation cancelled. No API Copilot key was selected.");
+    if (key === null) {
+      this.prompts.noCopilotKeySelected();
+      return err("cancelled");
+    }
     await this.prompts.displayApiCopilotKeyUsageWarning();
-
-    return key;
+    return ok(key);
   }
 
-  private async getWelcomeMessage(): Promise<string> {
+  private async prepareWelcomeMessage(): Promise<string> {
     return await withDirPath(async (tempDir) => {
       const tempFile = new FilePath(tempDir, new FileName("welcome-message.md"));
       const defaultContent =
diff --git a/src/actions/portal/generate.ts b/src/actions/portal/generate.ts
index 71b900c97..c23e8d6c3 100644
--- a/src/actions/portal/generate.ts
+++ b/src/actions/portal/generate.ts
@@ -1,21 +1,16 @@
 import { PortalGeneratePrompts } from "../../prompts/portal/generate.js";
-import { ZipService } from "../../infrastructure/zip-service.js";
-import { FileService } from "../../infrastructure/file-service.js";
 import { PortalService } from "../../infrastructure/services/portal-service.js";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
-import { FilePath } from "../../types/file/filePath.js";
-import { FileName } from "../../types/file/fileName.js";
 import { ActionResult } from "../action-result.js";
 import { BuildContext } from "../../types/build-context.js";
 import { PortalContext } from "../../types/portal-context.js";
 import { withDirPath } from "../../infrastructure/tmp-extensions.js";
 import { LauncherService } from "../../infrastructure/launcher-service.js";
+import { TempContext } from "../../types/temp-context.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
 
 export class GenerateAction {
   private readonly prompts: PortalGeneratePrompts = new PortalGeneratePrompts();
-  private readonly zipArchiver: ZipService = new ZipService();
-  private readonly fileService: FileService = new FileService();
   private readonly launcherService: LauncherService = new LauncherService();
   private readonly portalService: PortalService = new PortalService();
   private readonly configDir: DirectoryPath;
@@ -32,78 +27,55 @@ export class GenerateAction {
     buildDirectory: DirectoryPath,
     portalDirectory: DirectoryPath,
     force: boolean,
-    zipPortal: boolean
+    zipPortal: boolean,
+    displayMessages: boolean = true
   ): Promise<ActionResult> => {
     if (buildDirectory.isEqual(portalDirectory)) {
-      return ActionResult.error(`The 'src' and 'portal' directory cannot be the same: "${portalDirectory}"`);
+      this.prompts.directoryCannotBeSame(portalDirectory);
+      return ActionResult.failed();
     }
 
     const buildContext = new BuildContext(buildDirectory);
     if (!(await buildContext.validate())) {
-      return ActionResult.error(
-        `Unable to locate a valid "src" directory. Navigate to the directory containing your APIMatic Portal source or set up a new project by running \`apimatic portal quickstart\`.`
-      );
+      this.prompts.srcDirectoryEmpty(buildDirectory);
+      return ActionResult.failed();
     }
 
     const portalContext = new PortalContext(portalDirectory);
     if (!force && (await portalContext.exists()) && !(await this.prompts.overwritePortal(portalDirectory))) {
-      return ActionResult.error(
-        "Please enter a different destination folder or remove the existing files and try again."
-      );
+      this.prompts.portalDirectoryNotEmpty();
+      return ActionResult.cancelled();
     }
 
     return await withDirPath(async (tempDirectory) => {
-      this.prompts.displayPortalGenerationMessage();
+      const tempContext = new TempContext(tempDirectory);
+      const buildZipPath = await tempContext.zip(buildDirectory);
 
-      const buildZipPath = new FilePath(tempDirectory, new FileName("build.zip"));
-      await this.zipArchiver.archive(buildDirectory, buildZipPath);
-
-      const response = await this.portalService.generatePortal(
-        buildZipPath,
-        this.configDir,
-        this.commandMetadata,
-        this.authKey
+      const response = await this.prompts.generatePortal(
+        this.portalService.generatePortal(buildZipPath, this.configDir, this.commandMetadata, this.authKey)
       );
 
-      if (!response.isSuccess()) {
-        this.prompts.displayPortalGenerationErrorMessage();
-        return ActionResult.error(await this.parseError(response.error!, portalDirectory, tempDirectory));
+      if (response.isErr()) {
+        const error = response.error;
+        if (typeof error === "string") {
+          this.prompts.portalGenerationError(error);
+        } else {
+          const errorZipPath = await tempContext.save(error);
+          const reportPath = await portalContext.saveError(errorZipPath);
+          await this.launcherService.openFile(reportPath);
+          this.prompts.portalGenerationErrorWithReport(reportPath);
+        }
+        return ActionResult.failed();
       }
 
-      const tempPortalFilePath = new FilePath(tempDirectory, new FileName("portal.zip"));
-      await this.fileService.writeFile(tempPortalFilePath, <NodeJS.ReadableStream>response.value);
+      const tempPortalZipPath = await tempContext.save(response.value);
+      await portalContext.save(tempPortalZipPath, zipPortal);
 
-      await portalContext.save(tempPortalFilePath, zipPortal);
-      this.prompts.displayPortalGenerationSuccessMessage();
+      if (displayMessages) {
+        this.prompts.portalGenerated(portalDirectory);
+      }
 
       return ActionResult.success();
     });
   };
-
-  private async parseError(
-    error: string | NodeJS.ReadableStream,
-    portalDirectory: DirectoryPath,
-    tempDirectory: DirectoryPath
-  ): Promise<string> {
-    if (typeof error === "string") {
-      return error;
-    }
-
-    const tempErrorFilePath = new FilePath(tempDirectory, new FileName("error.zip"));
-    await this.fileService.writeFile(tempErrorFilePath, <NodeJS.ReadableStream>error);
-
-    await this.fileService.cleanDirectory(portalDirectory);
-    await this.zipArchiver.unArchive(tempErrorFilePath, portalDirectory);
-
-    const errorReportPath = portalDirectory.join("apimatic-debug");
-
-    const htmlFilePath = new FilePath(errorReportPath, new FileName("apimatic-report.html"));
-    await this.launcherService.openFile(htmlFilePath); // Open the error report in the default browser
-
-    return (
-      "An error occurred during portal generation due to an issue with the input. " +
-      "An error report has been written at the destination path: " +
-      errorReportPath
-    );
-  }
 }
diff --git a/src/actions/portal/quickstart.ts b/src/actions/portal/quickstart.ts
index a27ec9ca1..ebd7b4117 100644
--- a/src/actions/portal/quickstart.ts
+++ b/src/actions/portal/quickstart.ts
@@ -4,244 +4,169 @@ import { withDirPath } from "../../infrastructure/tmp-extensions.js";
 import { ZipService } from "../../infrastructure/zip-service.js";
 import { PortalQuickstartPrompts } from "../../prompts/portal/quickstart.js";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
-import { FilePath } from "../../types/file/filePath.js";
-import { getMessageInCyanColor, getMessageInMagentaColor, getMessageInOrangeColor } from "../../utils/utils.js";
 import { UrlPath } from "../../types/file/urlPath.js";
-import { PortalScaffoldService } from "../../infrastructure/services/portal-scaffold-service.js";
 import { LoginAction } from "../auth/login.js";
-import { Result } from "../../types/common/result.js";
-import { err, ok, Result as ResultEx } from "neverthrow";
-import { PortalService } from "../../infrastructure/services/portal-service.js";
 import { ActionResult } from "../action-result.js";
-import { GenerateAction } from "./generate.js";
-import { ServeFlags, ServePaths } from "../../types/portal/serve.js";
 import { PortalServeAction } from "./serve.js";
-import { PortalServePrompts } from "../../prompts/portal/serve.js";
-import { ServeHandler } from "../../application/portal/serve/serve-handler.js";
-import { ValidationService } from "../../infrastructure/services/validation-service.js";
-import { ResourceContext } from "../../types/resource-context.js";
-import { FileName } from "../../types/file/fileName.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { ValidateAction } from "../api/validate.js";
+import { BuildContext } from "../../types/build-context.js";
+import { TempContext } from "../../types/temp-context.js";
+import { FileDownloadService } from "../../infrastructure/services/file-download-service.js";
+import { getLanguagesConfig } from "../../types/build/build.js";
+import { FilePath } from "../../types/file/filePath.js";
+import { SpecContext } from "../../types/spec-context.js";
+
+
+const defaultPort: number = 3000 as const;
 
 export class PortalQuickstartAction {
   private readonly prompts: PortalQuickstartPrompts = new PortalQuickstartPrompts();
   private readonly zipService: ZipService = new ZipService();
   private readonly fileService: FileService = new FileService();
-  private readonly portalScaffoldService: PortalScaffoldService = new PortalScaffoldService();
-  private readonly validationService: ValidationService;
-  private readonly defaultSpecUrl: UrlPath = new UrlPath(
-    "https://raw.githubusercontent.com/apimatic/static-portal-workflow/refs/heads/master/spec/openapi.json"
-  );
-  private readonly defaultPort: number = 3000 as const;
   private readonly configDir: DirectoryPath;
   private readonly commandMetadata: CommandMetadata;
+  private readonly fileDownloadService = new FileDownloadService();
+  private readonly buildFileUrl = new UrlPath(`https://github.com/apimatic/static-portal-workflow/archive/refs/heads/master.zip`);
+  private readonly defaultSpecUrl = new UrlPath(`https://raw.githubusercontent.com/apimatic/static-portal-workflow/refs/heads/master/spec/openapi.json`);
+  private readonly repositoryFolderName = "static-portal-workflow-master" as const;
 
   constructor(configDir: DirectoryPath, commandMetadata: CommandMetadata) {
     this.configDir = configDir;
     this.commandMetadata = commandMetadata;
-    this.validationService = new ValidationService(configDir, commandMetadata);
   }
 
   public readonly execute = async (): Promise<ActionResult> => {
-    this.prompts.displayWelcomeMessage();
+    this.prompts.welcomeMessage();
 
-    const authenticateUserResult = await this.authenticateUser();
-    if (authenticateUserResult.isFailed()) {
-      return ActionResult.error(authenticateUserResult.error!);
+    const storedAuth = await getAuthInfo(this.configDir.toString());
+    if (!storedAuth?.authKey) {
+      const loginResult = await new LoginAction(this.configDir, this.commandMetadata).execute();
+      if (loginResult.isFailed()) {
+        return ActionResult.failed();
+      }
     }
 
-    return await withDirPath<ActionResult>(async (tempDirectory: DirectoryPath) => {
+    return await withDirPath<ActionResult>(async (tempDirectory: DirectoryPath): Promise<ActionResult> => {
       // Step 1/4
-      const specDirectory = await this.importSpec(tempDirectory);
-      if (specDirectory.isErr()) {
-        return ActionResult.error(specDirectory.error);
+      this.prompts.importSpecStep();
+
+      let specPath: FilePath | undefined;
+      while (!specPath) {
+        const inputPath = await this.prompts.specPathPrompt(this.defaultSpecUrl);
+        if (!inputPath) {
+          this.prompts.noSpecSpecified();
+          return ActionResult.cancelled();
+        }
+
+        if (inputPath instanceof UrlPath) {
+          const downloadFileResult = await this.prompts.downloadSpecFile(
+            this.fileDownloadService.downloadFile(inputPath)
+          );
+          if (downloadFileResult.isErr()) {
+            this.prompts.serviceError(downloadFileResult.error);
+          } else {
+            const specContext = new SpecContext(tempDirectory)
+            specPath = await specContext.save(downloadFileResult.value.stream, downloadFileResult.value.filename);
+          }
+        } else {
+          const fileExists = await this.fileService.fileExists(inputPath);
+          if (!fileExists) {
+            this.prompts.specFileDoesNotExist();
+          } else {
+            specPath = inputPath;
+          }
+        }
       }
 
       // Step 2/4
-      const validatedSpecDirectory = await this.validateSpec(tempDirectory, specDirectory.value);
-      if (validatedSpecDirectory.isFailed()) {
-        return ActionResult.error(validatedSpecDirectory.error!);
-      }
-      if (validatedSpecDirectory.isCancelled()) {
-        return ActionResult.cancelled(
-          "Good luck fixing your API definition! Feel free to run this command again once you're done."
+      this.prompts.validateSpecStep();
+      const validateAction = new ValidateAction(this.configDir, this.commandMetadata);
+      const validationResult = await validateAction.execute(specPath, false);
+
+      if (validationResult.isFailed()) {
+        this.prompts.specValidationFailed();
+        if (!(await this.prompts.useDefaultSpecPrompt())) {
+          this.prompts.fixYourSpec();
+          return ActionResult.cancelled();
+        }
+        const downloadFileResult = await this.prompts.downloadSpecFile(
+          this.fileDownloadService.downloadFile(this.defaultSpecUrl)
         );
+        if (downloadFileResult.isErr()) {
+          this.prompts.serviceError(downloadFileResult.error);
+        } else {
+          const specContext = new SpecContext(tempDirectory)
+          specPath = await specContext.save(downloadFileResult.value.stream, downloadFileResult.value.filename);
+        }
       }
 
       // Step 3/4
-      const selectedLanguages = await this.selectLanguages();
+      this.prompts.selectLanguagesStep();
+      const languages = await this.prompts.selectLanguagesPrompt();
+      if (!languages) {
+        this.prompts.noLanguagesSelected();
+        return ActionResult.cancelled();
+      }
 
       // Step 4/4
-      const { sourceDirectory, portalDirectory } = await this.selectInputDirectory();
-
-      const buildDirectoryResult = await this.setupBuildDirectory(
-        tempDirectory,
-        sourceDirectory,
-        validatedSpecDirectory.value!,
-        selectedLanguages
-      );
-      if (buildDirectoryResult.isFailed()) {
-        return ActionResult.error(buildDirectoryResult.error!);
+      this.prompts.selectInputDirectoryStep();
+      let inputDirectory: DirectoryPath | undefined;
+      while (true) {
+        inputDirectory = await this.prompts.inputDirectoryPathPrompt();
+        if (!inputDirectory) {
+          this.prompts.noInputDirectoryProvided();
+          return ActionResult.cancelled();
+        }
+
+        if (!(await this.fileService.directoryExists(inputDirectory))) {
+          this.prompts.inputDirectoryPathDoesNotExist(inputDirectory);
+          // TODO: Prompt user if he wants to create the directory
+          continue;
+        }
+
+        if (!(await this.fileService.directoryEmpty(inputDirectory))) {
+          this.prompts.inputDirectoryNotEmpty(inputDirectory);
+          continue;
+        }
+        break;
       }
 
-      const generateAndServePortalResult = await this.generateAndServePortal(sourceDirectory, portalDirectory);
-
-      if (generateAndServePortalResult.isFailed()) {
-        return ActionResult.error(generateAndServePortalResult.error!);
+      const masterBuildFile = await this.prompts.downloadBuildDirectory(
+        this.fileDownloadService.downloadFile(this.buildFileUrl)
+      );
+      if (masterBuildFile.isErr()) {
+        this.prompts.serviceError(masterBuildFile.error);
+        return ActionResult.failed();
       }
-
-      if (generateAndServePortalResult.isCancelled()) {
-        return ActionResult.cancelled(generateAndServePortalResult.value!);
+      const tempContext = new TempContext(tempDirectory);
+      const masterBuildFilePath = await tempContext.save(masterBuildFile.value.stream);
+      await this.zipService.unArchive(masterBuildFilePath, tempDirectory);
+      const extractedFolder = tempDirectory.join(this.repositoryFolderName);
+
+      const tempBuildContext = new BuildContext(extractedFolder);
+      await tempBuildContext.replaceDefaultSpec(specPath);
+      await tempBuildContext.deleteWorkflowDir();
+
+      const buildFile = await tempBuildContext.getBuildFileContents();
+      buildFile.generatePortal!.languageConfig = getLanguagesConfig(languages);
+      await tempBuildContext.updateBuildFileContents(buildFile);
+
+      const sourceDirectory = inputDirectory.join("src");
+      await this.fileService.copyDirectoryContents(extractedFolder, sourceDirectory);
+
+      const buildDirectoryStructure = await this.fileService.getDirectory(sourceDirectory);
+      this.prompts.printDirectoryStructure(inputDirectory, buildDirectoryStructure);
+
+      const portalDirectory = inputDirectory.join("portal");
+      const portalServeAction = new PortalServeAction(this.configDir, this.commandMetadata, null);
+      const result = await portalServeAction.execute(sourceDirectory, portalDirectory, defaultPort, true, false, () => {
+        this.prompts.nextSteps();
+      });
+      if (result.isFailed()) {
+        return ActionResult.failed();
       }
-
-      return ActionResult.success(buildDirectoryResult.value!.toString());
+      return ActionResult.success();
     });
   };
-
-  private async authenticateUser(): Promise<Result<string, string>> {
-    const storedAuth = await getAuthInfo(this.configDir.toString());
-    if (storedAuth?.authKey) {
-      return Result.success("User is already authenticated.");
-    }
-
-    this.prompts.displayInfo("You need to be logged in to continue.");
-    const loginResult = await new LoginAction(this.configDir, this.commandMetadata).execute();
-
-    if (loginResult.isErr()) {
-      this.prompts.logError(loginResult.error);
-      return Result.failure("Unable to login, please check your credentials and try again later.");
-    }
-    this.prompts.displaySuccess(`Logged in as: ${loginResult.value}`);
-    return Result.success("Authentication was successful.");
-  }
-
-  // TODO: create TempSpecContext and then refactor this.
-  private async importSpec(tempDirectory: DirectoryPath): Promise<ResultEx<DirectoryPath, string>> {
-    this.prompts.displayInfo(getMessageInOrangeColor(`Step 1 of 4: Import your OpenAPI Definition`));
-    const inputPath = await this.prompts.specPathPrompt(this.defaultSpecUrl);
-
-    const resourceContext = new ResourceContext(tempDirectory);
-    const result = await resourceContext.resolveTo(inputPath, "spec");
-    if (result.isErr()) {
-      return err(result.error);
-    }
-    return ok(result.value);
-  }
-
-  private async validateSpec(
-    tempDirectory: DirectoryPath,
-    specDirectory: DirectoryPath
-  ): Promise<Result<DirectoryPath, string>> {
-    this.prompts.displayInfo(getMessageInOrangeColor(`Step 2 of 4: Validate and Lint your OpenAPI file`));
-    this.prompts.startProgressIndicator(
-      getMessageInMagentaColor(
-        `Running your API Definition through APIMatic's 1200+ CodeGen Specific validation and linting rules 🔍 `
-      )
-    );
-
-    //TODO: Replace with validate action.
-    const specZipFilePath = new FilePath(tempDirectory, new FileName("spec.zip"));
-    await this.zipService.archive(specDirectory, specZipFilePath);
-
-    const validationResult = await this.validationService.validateViaFile({ file: specZipFilePath });
-    // TODO: Add spinner when refactoring
-    if (validationResult.isFailed()) {
-      this.prompts.stopProgressIndicator(`Something went wrong while validating your API Definition.`, 1);
-      return Result.failure(validationResult.error!);
-    }
-
-    const validationPassed = validationResult.value!.success;
-    if (validationPassed) {
-      this.prompts.stopProgressIndicator(getMessageInCyanColor(`Validation Successful.`));
-      return Result.success(specDirectory);
-    }
-
-    this.prompts.stopProgressIndicator(`❗ Oops, it looks like there are some errors in your API Definition.`, 1);
-    if (!(await this.prompts.useDefaultSpecPrompt())) {
-      return Result.cancelled(specDirectory);
-    }
-
-    // Use default spec...
-    const resourceContext = new ResourceContext(tempDirectory);
-    const result = await resourceContext.resolveTo(this.defaultSpecUrl.toString(), "spec");
-    if (result.isErr()) {
-      return Result.failure(result.error);
-    }
-    return Result.success(result.value);
-  }
-
-  private async selectLanguages(): Promise<string[]> {
-    this.prompts.displayInfo(getMessageInOrangeColor(`Step 3 of 4: Select programming languages`));
-
-    return await this.prompts.selectLanguagesPrompt();
-  }
-
-  private async selectInputDirectory(): Promise<{ sourceDirectory: DirectoryPath; portalDirectory: DirectoryPath }> {
-    this.prompts.displayInfo(getMessageInOrangeColor(`Step 4 of 4: Generate source files for Docs as Code`));
-
-    const workingDirectory = new DirectoryPath(await this.prompts.inputDirectoryPathPrompt());
-
-    return { sourceDirectory: workingDirectory.join("src"), portalDirectory: workingDirectory.join("portal") };
-  }
-
-  //TODO: Remove tempDirectory as param.
-  private async setupBuildDirectory(
-    tempDirectory: DirectoryPath,
-    sourceDirectory: DirectoryPath,
-    specDirectory: DirectoryPath,
-    selectedLanguages: string[]
-  ): Promise<Result<DirectoryPath, string>> {
-    this.prompts.startProgressIndicator(getMessageInMagentaColor("Generating build directory ⚙️"));
-
-    //TODO: Create a separate temp directory for scaffolding, don't pass the existing temp directory.
-    const createBuildDirectoryResult = await this.portalScaffoldService.createBuildDirectory(
-      tempDirectory,
-      specDirectory,
-      selectedLanguages
-    );
-    if (createBuildDirectoryResult.isErr()) {
-      this.prompts.stopProgressIndicator(`Something went wrong while setting up your build directory.`, 1);
-      return Result.failure(createBuildDirectoryResult.error);
-    }
-
-    await this.fileService.copyDirectoryContents(createBuildDirectoryResult.value!, sourceDirectory);
-    this.prompts.stopProgressIndicator(getMessageInCyanColor(`📁 Directory created at ${sourceDirectory.toString()}`));
-    this.prompts.displayBuildDirectoryAsTree(sourceDirectory.toString());
-
-    return Result.success(sourceDirectory);
-  }
-
-  private async generateAndServePortal(
-    sourceDirectory: DirectoryPath,
-    portalDirectory: DirectoryPath
-  ): Promise<Result<string, string>> {
-    const generatePortalAction = new GenerateAction(this.configDir, this.commandMetadata);
-    const portalServeAction = new PortalServeAction(new PortalServePrompts(), new ServeHandler(), new PortalService());
-
-    const serveFlags: ServeFlags = {
-      input: sourceDirectory.toString(),
-      destination: portalDirectory.toString(),
-      port: this.defaultPort,
-      open: true,
-      "no-reload": false,
-      "auth-key": undefined
-    };
-
-    const servePaths: ServePaths = {
-      sourceDirectoryPath: sourceDirectory.toString(),
-      destinationDirectoryPath: portalDirectory.toString()
-    };
-
-    const servePortalResult = await portalServeAction.servePortal(serveFlags, servePaths, generatePortalAction.execute);
-
-    if (servePortalResult.isFailed()) {
-      return Result.failure(servePortalResult.error!);
-    }
-
-    if (servePortalResult.isCancelled()) {
-      return Result.cancelled(servePortalResult.value!);
-    }
-
-    return Result.success("Generated portal and served it successfully.");
-  }
 }
diff --git a/src/actions/portal/recipe/new-recipe.ts b/src/actions/portal/recipe/new-recipe.ts
index 4731f2812..ff8d58d0e 100644
--- a/src/actions/portal/recipe/new-recipe.ts
+++ b/src/actions/portal/recipe/new-recipe.ts
@@ -1,327 +1,210 @@
-import * as path from "path";
-import fs from "fs";
-import fsExtra from "fs-extra";
-import { parse } from "yaml";
-import { TreeObject } from "treeify";
-import { tmpdir } from "os";
-import { execa } from "execa";
 import { PortalRecipePrompts } from "../../../prompts/portal/recipe/new-recipe.js";
-import { SerializableRecipe, StepType, DirectoryNode } from "../../../types/recipe/recipe.js";
-import { Result } from "../../../types/common/result.js";
-import { PortalRecipe } from "../../../application/portal/recipe/portal-recipe.js";
-import { PortalRecipeGenerator } from "../../../application/portal/recipe/recipe-generator.js";
-import { SdlParser } from "../../../application/portal/toc/sdl-parser.js";
+import { StepType } from "../../../types/recipe/recipe.js";
 import { PortalService } from "../../../infrastructure/services/portal-service.js";
-import { SdlEndpoint } from "../../../types/sdl/sdl.js";
+import { getEndpointDescription, getEndpointGroupsFromSdl, SdlEndpoint } from "../../../types/sdl/sdl.js";
 import { DirectoryPath } from "../../../types/file/directoryPath.js";
 import { CommandMetadata } from "../../../types/common/command-metadata.js";
+import { ActionResult } from "../../action-result.js";
+import { TocContext } from "../../../types/toc-context.js";
+import { FileName } from "../../../types/file/fileName.js";
+import { PortalRecipe } from "../../../application/portal/recipe/portal-recipe.js";
+import { PortalRecipeGenerator } from "../../../application/portal/recipe/recipe-generator.js";
+import { BuildContext } from "../../../types/build-context.js";
+import { ContentContext } from "../toc/new-toc.js";
+import { SpecContext } from "../../../types/spec-context.js";
+import { LauncherService } from "../../../infrastructure/launcher-service.js";
+import { FileService } from "../../../infrastructure/file-service.js";
+import { FilePath } from "../../../types/file/filePath.js";
+import { withDirPath } from "../../../infrastructure/tmp-extensions.js";
+import { TempContext } from "../../../types/temp-context.js";
+import { RecipeContext } from "../../../types/recipe-context.js";
+import { TreeNode } from "../../../prompts/format.js";
 
 export class PortalRecipeAction {
   private readonly prompts: PortalRecipePrompts = new PortalRecipePrompts();
-  private readonly sdlParser: SdlParser;
-  private readonly BUILD_FILE_NAME: string = "APIMATIC-BUILD.json" as const;
+  private readonly launcherService = new LauncherService();
+  private readonly fileService = new FileService();
+  private readonly portalService = new PortalService();
 
-  constructor(configDirectory: DirectoryPath, commandMetadata: CommandMetadata) {
-    this.sdlParser = new SdlParser(new PortalService(), configDirectory, commandMetadata);
-  }
+  constructor(private readonly configDirectory: DirectoryPath, private readonly commandMetadata: CommandMetadata) {}
 
-  public async createRecipe(buildDirectoryPath: DirectoryPath, name?: string): Promise<Result<string, string>> {
+  public async execute(buildDirectory: DirectoryPath, name?: string): Promise<ActionResult> {
     this.prompts.displayWelcomeMessage();
 
-    const recipeName = name ?? (await this.prompts.recipeNamePrompt());
-    const recipeFileName = this.createRecipeFileName(recipeName);
-
-    const validateBuildDirectoryPathResult = await this.validateBuildDirectoryPath(buildDirectoryPath);
-    if (validateBuildDirectoryPathResult.isFailed()) {
-      return Result.failure(
-        `Unable to locate a valid "src" directory. Navigate to the directory containing your APIMatic Portal source or set up a new project by running \`apimatic portal quickstart\`.`
-      );
+    const buildContext = new BuildContext(buildDirectory);
+    if (!(await buildContext.validate())) {
+      this.prompts.invalidBuildDirectory(buildDirectory);
+      return ActionResult.failed();
     }
 
-    //TODO: Create a type for the build config and use that here instead of any.
-    const buildConfigFilePath = await this.getBuildConfigFilePath(buildDirectoryPath);
-    const buildConfigResult = await this.parseBuildConfig(buildConfigFilePath);
-    if (buildConfigResult.isFailed()) {
-      return Result.failure(`Unable to generate API Recipe: ${buildConfigResult.error!}`);
+    const recipeName = name ?? (await this.prompts.recipeNamePrompt());
+    if (!recipeName) {
+      this.prompts.recipeNameEmpty();
+      return ActionResult.cancelled();
     }
 
-    const contentFolderPath = this.getContentFolderPath(buildConfigResult.value, buildDirectoryPath);
-    const tocFilePath = path.join(contentFolderPath, "content", "toc.yml");
-    //TODO: Replace any type of tocFileResult.value to concrete type.
-    const tocFileResult = await this.parseTocFile(tocFilePath);
-    if (tocFileResult.isFailed()) {
-      return Result.failure(`Unable to generate API Recipe: ${tocFileResult.error!}`);
-    }
+    const contentDirectory = buildDirectory.join("content");
+    const contentContext = new ContentContext(contentDirectory);
 
-    const recipeAlreadyExists = this.checkRecipeAlreadyExists(tocFileResult.value, recipeName, recipeFileName);
-    if (recipeAlreadyExists && !(await this.prompts.overwriteApiRecipeInTocPrompt())) {
-      return Result.cancelled("Operation was cancelled by the user.");
+    if (!(await contentContext.exists())) {
+      this.prompts.contentFolderNotFound();
+      return ActionResult.failed();
     }
 
-    const recipeResult = await this.promptUserAndBuildNewRecipe(buildConfigResult.value, contentFolderPath, recipeName);
-    if (recipeResult.isFailed()) {
-      return Result.failure(`Unable to generate API Recipe: ${recipeResult.error!}`);
-    }
+    const specDirectory = buildDirectory.join("spec");
+    const specContext = new SpecContext(specDirectory);
 
-    const recipeGenerator = new PortalRecipeGenerator();
-    await recipeGenerator.createRecipe(
-      recipeResult.value!,
-      buildConfigResult.value!,
-      tocFileResult.value,
-      tocFilePath,
-      recipeName,
-      recipeFileName,
-      buildConfigFilePath,
-      contentFolderPath
-    );
+    if (!(await specContext.validate())) {
+      this.prompts.specFileEmptyInvalid();
+      return ActionResult.failed();
+    }
 
-    const buildDirectoryStructure = await this.getBuildDirectoryStructure(recipeFileName);
+    // Setup TOC context
+    const tocContext = new TocContext(contentDirectory);
+    const tocData = await tocContext.parseTocData();
 
-    this.prompts.displayBuildDirectoryStructureAsTree(buildDirectoryStructure as TreeObject);
-    this.prompts.displayRecipeGenerationSuccessMessage(contentFolderPath);
-    return Result.success("Generated recipe successfully.");
-  }
+    // Setup recipe context
+    const recipeContext = new RecipeContext(recipeName);
+    const recipeFileName = recipeContext.getRecipeName();
 
-  private createRecipeFileName(recipeName: string): string {
-    return this.toPascalCase(recipeName.trim());
-  }
+    // Check if the recipe already exists
+    const recipeAlreadyExists = recipeContext.exists(tocData, recipeName, recipeFileName);
+    if (recipeAlreadyExists && !(await this.prompts.overwriteApiRecipeInTocPrompt(recipeName))) {
+      return ActionResult.cancelled();
+    }
 
-  private toPascalCase(str: string): string {
-    return str
-      .split(" ")
-      .map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
-      .join("");
-  }
+    // Build the recipe
+    const recipe = new PortalRecipe(recipeName);
 
-  private async validateBuildDirectoryPath(buildDirectoryPath: DirectoryPath): Promise<Result<string, string>> {
-    if (!(await fsExtra.pathExists(buildDirectoryPath.toString()))) {
-      return Result.failure(`Portal build input folder ${buildDirectoryPath.toString()} does not exist.`);
-    }
+    let stepIndex: number = 0;
 
-    return Result.success("Portal build input folder path validated successfully.");
-  }
+    this.prompts.displayStepsInformation();
 
-  //TODO: Figure out a better way to do this without the while loop.
-  private async promptUserAndBuildNewRecipe(
-    buildConfig: any,
-    contentFolderPath: string,
-    recipeName: string
-  ): Promise<Result<SerializableRecipe, string>> {
-    const recipe = new PortalRecipe(recipeName);
     let endpointGroups: Map<string, SdlEndpoint[]> | undefined;
-    let idx: number = 1;
-    let addAnotherStep = true;
-    this.prompts.displayStepsInformation();
-    while (addAnotherStep) {
+
+    do {
       const stepType = await this.prompts.stepTypeSelectionPrompt();
-      const stepName = await this.prompts.stepNamePrompt("Step " + idx);
+      if (!stepType) return ActionResult.cancelled();
+
+      const stepName = await this.prompts.stepNamePrompt(`Step ${++stepIndex}`);
+      if (!stepName) return ActionResult.cancelled();
+
       switch (stepType) {
         case StepType.Content: {
-          const addContentStepResult = await this.promptUserAndAddContentStepToRecipe(recipe, stepName);
-          if (addContentStepResult.isFailed()) {
-            return Result.failure(addContentStepResult.error!);
-          }
+          const contentResult = await this.promptForContent();
+          recipe.addContentStep(stepName, contentResult);
+          this.prompts.displayStepAddedSuccessfullyMessage();
           break;
         }
+
         case StepType.Endpoint: {
           if (!endpointGroups) {
-            const extractEndpointGroupsFromSdlResult = await this.extractEndpointGroupsFromSdl(
-              buildConfig,
-              contentFolderPath
-            );
-            if (extractEndpointGroupsFromSdlResult.isFailed()) {
-              return Result.failure(`${extractEndpointGroupsFromSdlResult.error!}`);
+            const sdlResult = await withDirPath(async (tempDirectory) => {
+              const tempContext = new TempContext(tempDirectory);
+              const specZipPath = await tempContext.zip(specDirectory);
+
+              const specFileStream = await this.fileService.getStream(specZipPath);
+
+              try {
+                return await this.prompts.generateSdl(this.portalService.generateSdl(specFileStream, this.configDirectory, this.commandMetadata))
+              } finally {
+                specFileStream.close();
+              }
+            });
+
+            if (sdlResult.isErr()) {
+              this.prompts.serviceError(sdlResult.error);
+              return ActionResult.failed();
             }
-            endpointGroups = extractEndpointGroupsFromSdlResult.value!;
+            endpointGroups = getEndpointGroupsFromSdl(sdlResult.value);
           }
-          await this.promptUserAndAddEndpointStepToRecipe(recipe, endpointGroups, stepName);
-          break;
-        }
-      }
-      addAnotherStep = await this.prompts.addAnotherStepSelectionPrompt();
-      idx++;
-    }
 
-    return Result.success(recipe.toSerializableRecipe());
-  }
+          const endpointGroupName = await this.prompts.endpointGroupNamePrompt(endpointGroups);
+          if (!endpointGroupName) return ActionResult.cancelled();
+          const endpointName = await this.prompts.endpointNamePrompt(endpointGroups, endpointGroupName);
+          if (!endpointName) return ActionResult.cancelled();
 
-  private async promptUserAndAddContentStepToRecipe(
-    recipe: PortalRecipe,
-    stepName: string
-  ): Promise<Result<string, string>> {
-    this.prompts.displayContentStepInfo();
-    let editor = process.env.EDITOR;
-    let editorArgs: string[] = [];
-    const tempFilePath = path.join(tmpdir(), `recipe-markdown-content-${Date.now()}.txt`);
-    const template = `# The Heading Goes Here\n\nThis is placeholder text for your API Recipe content step. Feel free to edit this. Save your changes and then close the file once you're done.`;
-    await fsExtra.writeFile(tempFilePath, template, "utf-8");
-
-    try {
-      if (!editor) {
-        if (process.platform === "win32") {
-          await execa("cmd", ["/c", "start", "/wait", "notepad", tempFilePath], { stdio: "ignore" });
-        } else if (process.platform === "darwin" || process.platform === "linux") {
-          editor = "vim";
-          try {
-            await execa(editor, [tempFilePath], { stdio: "inherit" });
-          } catch {
-            // User exiting vim can throw a non-zero exit code leading to exception, ignore it.
-          }
-        }
-      } else {
-        if (editor === "code" || editor.endsWith("code.cmd") || editor.endsWith("code.exe")) {
-          editorArgs.push("--wait");
+          const defaultDescription = getEndpointDescription(endpointGroups, endpointGroupName, endpointName);
+          const description = await this.prompts.endpointDescriptionPrompt(defaultDescription);
+          if (!description) return ActionResult.cancelled();
+
+          recipe.addEndpointStep(stepName, description, endpointGroupName, endpointName);
+          this.prompts.displayStepAddedSuccessfullyMessage();
+          break;
         }
-        editorArgs.push(tempFilePath);
-        await execa(editor, editorArgs, { stdio: "ignore" });
       }
+    } while (await this.prompts.addAnotherStepSelectionPrompt());
 
-      const fileContent = await fsExtra.readFile(tempFilePath, "utf-8");
-      recipe.addContentStep(stepName, stepName, fileContent);
+    const serializableRecipe = recipe.toSerializableRecipe();
 
-      this.prompts.displayStepAddedSuccessfullyMessage();
-      return Result.success("Added content step successfully.");
-    } catch {
-      return Result.failure(`Unable to add content step. Please try again later.`);
-    } finally {
-      await fsExtra.unlink(tempFilePath);
-    }
-  }
-
-  private async promptUserAndAddEndpointStepToRecipe(
-    recipe: PortalRecipe,
-    endpointGroups: Map<string, SdlEndpoint[]>,
-    stepName: string
-  ): Promise<void> {
-    const endpointGroupName = await this.prompts.endpointGroupNamePrompt(endpointGroups);
-    const endpointName = await this.prompts.endpointNamePrompt(endpointGroups, endpointGroupName);
-    const description = await this.prompts.endpointDescriptionPrompt(endpointGroups, endpointGroupName, endpointName);
-    const endpointPermalink = await this.createPermalink([endpointGroupName, endpointName]);
-    recipe.addEndpointStep(stepName, stepName, description, endpointPermalink);
-    this.prompts.displayStepAddedSuccessfullyMessage();
-  }
-
-  //TODO: Replace any with concrete toc file object.
-  private async parseTocFile(tocFilePath: string): Promise<Result<any, string>> {
-    // Check if the file exists
-    if (!fs.existsSync(tocFilePath)) {
-      return Result.failure<any, string>(
-        `toc.yml file not found at ${tocFilePath}. Please run 'apimatic:toc:new' to create your toc.yml file first.`
-      );
-    }
-
-    try {
-      const tocContent = await fs.promises.readFile(tocFilePath, "utf-8");
-      return Result.success(parse(tocContent));
-    } catch {
-      return Result.failure(
-        `Unable to parse the toc.yml file located at ${tocFilePath}. Please make sure that the toc.yml is a valid YAML file.`
-      );
-    }
-  }
-
-  private async createPermalink(pathPieces: string[]): Promise<string> {
-    return `$e/${pathPieces.map(encodeURIComponent).join("/")}`;
-  }
-
-  private async getBuildConfigFilePath(buildDirectoryPath: DirectoryPath): Promise<string> {
-    const files = await fs.promises.readdir(buildDirectoryPath.toString());
-    const buildFileExists = files.find((file) => file === this.BUILD_FILE_NAME);
-    if (!buildFileExists) {
-      return await this.prompts.buildConfigFilePathPrompt(buildDirectoryPath.toString());
-    }
-
-    return path.join(buildDirectoryPath.toString(), this.BUILD_FILE_NAME);
-  }
+    // Generate the recipe
+    const recipeGenerator = new PortalRecipeGenerator();
+    await recipeGenerator.createRecipe(
+      serializableRecipe,
+      tocData,
+      tocContext.tocPath,
+      recipeName,
+      recipeFileName,
+      buildContext,
+      buildDirectory
+    );
 
-  //TODO: Create a type for the build config and use that here instead of any.
-  private async parseBuildConfig(buildConfigFilePath: string): Promise<Result<any, string>> {
-    try {
-      const fileData = await fs.promises.readFile(buildConfigFilePath, "utf-8");
-      return Result.success(JSON.parse(fileData));
-    } catch {
-      return Result.failure(
-        `There was an error parsing the build config file located at "${buildConfigFilePath}". Please check your build config file and try again later.`
-      );
-    }
+    const tocStructure = this.getTocStructure(recipeFileName);
+    this.prompts.recipeCreated();
+    this.prompts.displayRecipeStructure(tocStructure);
+    this.prompts.nextSteps();
+    return ActionResult.success();
   }
 
-  private checkRecipeAlreadyExists(tocData: any, recipeName: string, recipeFileName: string): boolean {
-    let apiRecipesGroup = tocData.toc?.find((item: any) => item.group === "API Recipes");
-    if (!apiRecipesGroup) {
-      return false;
-    }
+  private async promptForContent(): Promise<string> {
+    return await withDirPath(async (tempDir) => {
+      const tempFile = new FilePath(tempDir, new FileName(`recipe-markdown-content.md`));
+      const defaultContent =
+        "# The Heading Goes Here\n\n" +
+        "This is placeholder text for your API Recipe content step. " +
+        "Feel free to edit this. Save your changes and then close the file once you're done.";
 
-    // Check if recipe name or file name already exists
-    const existingRecipe = apiRecipesGroup.items.find(
-      (item: any) => item.page === recipeName || item.file === `recipes/${recipeFileName}.md`
-    );
-    if (existingRecipe) {
-      return true;
-    }
-
-    return false;
+      await this.fileService.writeContents(tempFile, defaultContent);
+      this.prompts.openRecipeMarkdownEditor();
+      await this.launcherService.openInEditor(tempFile);
+      const fileContent = await this.fileService.getContents(tempFile);
+      return fileContent.replace(/\r\n|\r/g, "\n");
+    });
   }
 
-  private async getBuildDirectoryStructure(recipeFileName: string): Promise<DirectoryNode> {
+  private getTocStructure(recipeFileName: FileName): TreeNode {
     return {
-      content: {
-        "toc.yml : # Contains the API Recipes group with a new page for your API recipe": null
-      },
-      static: {
-        scripts: {
-          recipes: {
-            [`${recipeFileName}.js : # Generated recipe script file containing all of the steps`]: null
-          }
+      name: "src",
+      items: [
+        {
+          name: "content",
+          items: [
+            {
+              name: "toc.yml",
+              description: "# Contains the API Recipes group with a new page for your API recipe"
+            }
+          ]
+        },
+        {
+          name: "static",
+          items: [
+            {
+              name: "scripts",
+              items: [
+                {
+                  name: "recipes",
+                  items: [
+                    {
+                      name: `${recipeFileName}`,
+                      description: "# Generated recipe script file containing all of the steps"
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
         }
-      }
+      ]
     };
   }
-
-  //TODO: Replace type of buildConfig from any to actual BuildConfig type after creating it.
-  private async extractEndpointGroupsFromSdl(
-    buildConfig: any,
-    contentFolderPath: string
-  ): Promise<Result<Map<string, SdlEndpoint[]>, string>> {
-    const specFolderPath = this.getSpecFolderPath(buildConfig, contentFolderPath);
-    if (!(await fsExtra.pathExists(specFolderPath))) {
-      return Result.failure(`API specification file not found at ${specFolderPath}.`);
-    }
-
-    this.prompts.startProgressIndicatorWithMessage(
-      "Extracting endpoint groups and endpoints from the API specification."
-    );
-
-    const endpointGroupsResult = await this.sdlParser.getEndpointGroupsFromSdl(specFolderPath);
-
-    if (endpointGroupsResult.isFailed()) {
-      this.prompts.stopProgressIndicatorWithMessage("Unable to extract endpoints from your API specification.");
-      return Result.failure(`${endpointGroupsResult.error!}`);
-    }
-
-    this.prompts.stopProgressIndicatorWithMessage(
-      "Successfully extracted endpoint groups and endpoints from the API specification."
-    );
-    return Result.success(endpointGroupsResult.value!);
-  }
-
-  //TODO: Replace type of buildConfig from any to actual BuildConfig type after creating it.
-  private getSpecFolderPath(buildConfig: any, contentFolderPath: string): string {
-    const apiSpecPath = buildConfig.generatePortal?.apiSpecPath;
-    if (apiSpecPath) {
-      return path.join(contentFolderPath, apiSpecPath);
-    }
-
-    return path.join(contentFolderPath, "spec");
-  }
-
-  //TODO: Replace type of buildConfig from any to actual BuildConfig type after creating it.
-  private getContentFolderPath(buildConfig: any, buildDirectoryPath: DirectoryPath): string {
-    const contentFolder = buildConfig.generatePortal?.contentFolder;
-    if (contentFolder) {
-      return path.join(buildDirectoryPath.toString(), contentFolder);
-    }
-
-    return buildDirectoryPath.toString();
-  }
 }
diff --git a/src/actions/portal/serve.ts b/src/actions/portal/serve.ts
index f1fdc6378..e58e9b012 100644
--- a/src/actions/portal/serve.ts
+++ b/src/actions/portal/serve.ts
@@ -1,74 +1,152 @@
+import { createServer as createLiveReloadServer } from "livereload";
+import connectLiveReload from "connect-livereload";
+import express, { Express } from "express";
+import chokidar from "chokidar";
+import crypto from "crypto";
+import { Mutex } from "async-mutex";
 import { PortalServePrompts } from "../../prompts/portal/serve.js";
-import { ServeFlags, ServePaths } from "../../types/portal/serve.js";
-import { ServeHandler } from "../../application/portal/serve/serve-handler.js";
-import { Result } from "../../types/common/result.js";
-import { PortalService } from "../../infrastructure/services/portal-service.js";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { ActionResult } from "../action-result.js";
-import getPort from "get-port";
+import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { GenerateAction } from "./generate.js";
+import { NetworkService } from "../../infrastructure/network-service.js";
+import { UrlPath } from "../../types/file/urlPath.js";
+import { LauncherService } from "../../infrastructure/launcher-service.js";
+import { DebounceService } from "../../infrastructure/debounce-service.js";
 
 export class PortalServeAction {
-  protected readonly prompts: PortalServePrompts;
-  protected readonly serveHandler: ServeHandler;
-  protected readonly docsPortalService: PortalService;
-
-  public constructor(prompts: PortalServePrompts, serveHandler: ServeHandler, docsPortalService: PortalService) {
-    this.prompts = prompts;
-    this.serveHandler = serveHandler;
-    this.docsPortalService = docsPortalService;
+  private readonly prompts: PortalServePrompts = new PortalServePrompts();
+  private readonly networkService: NetworkService = new NetworkService();
+  private readonly launcherService: LauncherService = new LauncherService();
+  private readonly application: Express = express();
+  private readonly configDir: DirectoryPath;
+  private readonly commandMetadata: CommandMetadata;
+  private readonly authKey: string | null;
+  private isPortalServed: boolean = false;
+
+  public constructor(configDir: DirectoryPath, commandMetadata: CommandMetadata, authKey: string | null = null) {
+    this.configDir = configDir;
+    this.commandMetadata = commandMetadata;
+    this.authKey = authKey;
   }
 
-  public async servePortal(
-    flags: ServeFlags,
-    paths: ServePaths,
-    generatePortal: (
-      buildDirectory: DirectoryPath,
-      portalDirectory: DirectoryPath,
-      force: boolean,
-      zipPortal: boolean
-    ) => Promise<ActionResult>
-  ): Promise<Result<string, string>> {
-    const serverPort: number = await this.getServerPort(flags.port);
-
-    const result = await generatePortal(
-      new DirectoryPath(paths.sourceDirectoryPath),
-      new DirectoryPath(paths.destinationDirectoryPath),
-      false,
-      false
-    );
-
-    return await result.mapAll<Promise<Result<string, string>>>(
-      async () => {
-        const setupServerResult = await this.serveHandler.setupServer(paths.destinationDirectoryPath);
-        if (setupServerResult.isFailed()) {
-          return Result.failure(setupServerResult.error!);
-        }
+  public async execute(
+    buildDirectory: DirectoryPath,
+    portalDirectory: DirectoryPath,
+    port: number,
+    openInBrowser: boolean,
+    hotReload: boolean,
+    onAfterServe?: () => void
+  ): Promise<ActionResult> {
+    const generatePortalAction = new GenerateAction(this.configDir, this.commandMetadata, this.authKey);
+    const result = await generatePortalAction.execute(buildDirectory, portalDirectory, true, false);
+    if (result.isFailed()) {
+      return ActionResult.failed();
+    }
 
-        const startServerResult = await this.serveHandler.startServer(paths, flags, generatePortal, serverPort);
-        if (startServerResult.isFailed()) {
-          return Result.failure(startServerResult.error!);
-        }
+    const servePort = await this.networkService.getServerPort([port, 3000, 3001, 3002]);
+    if (servePort != port && !onAfterServe) {
+      this.prompts.usingFallbackPort(port, servePort);
+    }
 
-        //TODO: Figure out a better way for this.
-        return Result.success(serverPort.toString());
-      },
-      async (message) => Result.failure(message),
-      async (message) => Result.cancelled(message)
-    );
-  }
+    const liveReloadPort = await this.networkService.getServerPort([35729, 35730, 35731, 35732]);
+    const liveReloadServer = createLiveReloadServer({ port: liveReloadPort});
+    const server = this.application
+      .use(connectLiveReload())
+      .use(express.static(portalDirectory.toString(), { extensions: ["html"] }))
+      .listen(servePort);
 
-  private async getServerPort(port: number | undefined): Promise<number> {
-    const defaultPorts = [3000, 3001, 3002];
+    const portalUrl = new UrlPath(`http://localhost:${servePort}`);
+    this.prompts.portalServed(portalUrl);
+    if (openInBrowser) {
+      await this.launcherService.openUrlInBrowser(portalUrl);
+    }
+    this.prompts.promptForExit();
 
-    const preferredPorts = typeof port === "number" ? [port, ...defaultPorts.filter((p) => p !== port)] : defaultPorts;
+    if (!hotReload) {
+      if (onAfterServe) {
+        onAfterServe();
+      }
 
-    const availablePort = await getPort({ port: preferredPorts });
+      this.clearStandardInput();
+      await this.prompts.blockExecution();
 
-    // Show warning only if user provided --port and it is not available
-    if (typeof port === "number" && availablePort !== port) {
-      this.prompts.displayInfo(`⚠️ Port ${port} is already in use. Available port ${availablePort} will be used.`);
+      liveReloadServer.close();
+      server.close();
+      return ActionResult.success();
     }
 
-    return availablePort;
+    this.prompts.hotReloadEnabled(buildDirectory);
+
+    const watcher = chokidar.watch(buildDirectory.toString(), {
+      ignored: [/(^|[/\\])\..+/],
+      ignoreInitial: true,
+      persistent: true,
+      awaitWriteFinish: true,
+      atomic: true
+    });
+
+    const deletedDirectories = new Set<string>();
+    // TODO: Verify if we need mutex and eventQueue after refactoring.
+    const eventQueue = new Map();
+    const mutex = new Mutex();
+
+    const debounceService: DebounceService = new DebounceService();
+
+    watcher
+      .on("all", async (event, path) => {
+        // triggers folder deletion as a single event
+        if (event == "unlinkDir") {
+          deletedDirectories.add(path);
+        }
+        if (event == "unlink") {
+          for (const dir of deletedDirectories) {
+            if (path.startsWith(dir)) {
+              return;
+            }
+          }
+        }
+        const eventId: string = `${Date.now()}-${crypto.randomUUID()}`;
+        await mutex.runExclusive(async () => {
+          eventQueue.clear();
+          eventQueue.set(eventId, path);
+        });
+
+        await debounceService.batchSingleRequest(async () => {
+          this.prompts.changesDetected();
+
+          // TODO: Verify if this is needed.
+          if (!eventQueue.has(eventId)) {
+            return;
+          }
+
+          await generatePortalAction.execute(buildDirectory, portalDirectory, true, false, false);
+
+          liveReloadServer.refresh(portalDirectory.toString());
+          this.clearStandardInput();
+        });
+      })
+      .on("error", async () => {
+        this.prompts.watcherError();
+      });
+
+    // Wait for SIGINT or SIGTERM
+    this.clearStandardInput();
+    await this.prompts.blockExecution();
+
+    await watcher.close();
+    debounceService.close();
+
+    liveReloadServer.close();
+    server.close();
+    return ActionResult.success();
+  }
+
+  // This clears the standard input to allow interrupts like CTRL+C to work properly.
+  private clearStandardInput() {
+    if (process.platform !== "darwin" && process.stdin.isTTY) {
+      process.stdin.setRawMode(false);
+      process.stdin.pause();
+    }
   }
 }
diff --git a/src/actions/portal/toc/new-toc.ts b/src/actions/portal/toc/new-toc.ts
index 9ba21d25d..42e879bd8 100644
--- a/src/actions/portal/toc/new-toc.ts
+++ b/src/actions/portal/toc/new-toc.ts
@@ -1,182 +1,129 @@
-import * as path from "path";
-import fsExtra from "fs-extra";
+import { err, ok, Result } from "neverthrow";
 import { PortalNewTocPrompts } from "../../../prompts/portal/toc/new-toc.js";
-import { Result } from "../../../types/common/result.js";
-import { getMessageInRedColor } from "../../../utils/utils.js";
-import { SdlParser } from "../../../application/portal/toc/sdl-parser.js";
 import { TocStructureGenerator } from "../../../application/portal/toc/toc-structure-generator.js";
-import { TocContentParser } from "../../../application/portal/toc/toc-content-parser.js";
 import { TocEndpoint, TocGroup, TocModel } from "../../../types/toc/toc.js";
-import { PortalService } from "../../../infrastructure/services/portal-service.js";
 import { DirectoryPath } from "../../../types/file/directoryPath.js";
+import { CommandMetadata } from "../../../types/common/command-metadata.js";
+import { ActionResult } from "../../action-result.js";
+import { TocContext } from "../../../types/toc-context.js";
+import { FileService } from "../../../infrastructure/file-service.js";
 import { FilePath } from "../../../types/file/filePath.js";
-import { FileName } from "../../../types/file/fileName.js";
 import { BuildContext } from "../../../types/build-context.js";
-import { CommandMetadata } from "../../../types/common/command-metadata.js";
+import { getEndpointGroupsAndModels } from "../../../types/sdl/sdl.js";
+import { withDirPath } from "../../../infrastructure/tmp-extensions.js";
+import { TempContext } from "../../../types/temp-context.js";
+import { PortalService } from "../../../infrastructure/services/portal-service.js";
 
-export class PortalNewTocAction {
-  private readonly prompts: PortalNewTocPrompts;
-  private readonly sdlParser: SdlParser;
-  private readonly tocGenerator: TocStructureGenerator;
-  private readonly contentParser: TocContentParser;
-  private readonly DEFAULT_TOC_FILENAME: string = "toc.yml" as const;
-  private readonly APIMATIC_BUILD_FILENAME: string = "APIMATIC-BUILD.json" as const;
-
-  constructor(configDirectory: DirectoryPath, commandMetadata: CommandMetadata) {
-    this.prompts = new PortalNewTocPrompts();
-    this.sdlParser = new SdlParser(new PortalService(), configDirectory, commandMetadata);
-    this.tocGenerator = new TocStructureGenerator();
-    this.contentParser = new TocContentParser();
-  }
+export class ContentContext {
+  private readonly fileService = new FileService();
 
-  public async createToc(
-    buildDirectory: DirectoryPath,
-    tocDirectory?: DirectoryPath,
-    force: boolean = false,
-    expandEndpoints: boolean = false,
-    expandModels: boolean = false
-  ): Promise<Result<string, string>> {
-    try {
-      const tocDir = await this.getDestinationPath(buildDirectory, tocDirectory);
-      const tocPath = new FilePath(tocDir, new FileName(this.DEFAULT_TOC_FILENAME));
-      const tocCheckResult = await this.handleExistingToc(tocPath, force);
-      if (!tocCheckResult.isSuccess()) {
-        return Result.cancelled(tocCheckResult.value!);
-      }
+  constructor(private readonly contentDirectory: DirectoryPath) {}
 
-      const { endpointGroups, models } = await this.extractSdlComponents(buildDirectory, expandEndpoints, expandModels);
-
-      const contentGroups = await this.extractContentGroups(buildDirectory);
-
-      const toc = this.tocGenerator.createTocStructure(
-        endpointGroups,
-        models,
-        expandEndpoints,
-        expandModels,
-        contentGroups
-      );
-      const yamlString = this.tocGenerator.transformToYaml(toc);
-      await this.writeToc(tocPath.toString(), yamlString, "utf8");
-
-      this.prompts.displayOutroMessage(tocPath);
-      return Result.success(tocPath.toString());
-    } catch (error) {
-      this.prompts.logError(getMessageInRedColor(`${(error as Error).message}`));
-      return Result.failure(`An unexpected error occurred while generating the TOC file.`);
-    }
+  public async exists(): Promise<boolean> {
+    return this.fileService.directoryExists(this.contentDirectory);
   }
 
-  private async writeToc(path: string, content: string, encoding: string) {
-    await fsExtra.ensureFile(path);
-    await fsExtra.writeFile(path, content, encoding);
+  public async extractContentGroups(): Promise<TocGroup[]> {
+    const directory = await this.fileService.getDirectory(this.contentDirectory);
+    return await directory.parseContentFolder(this.contentDirectory);
   }
+}
 
-  private async handleExistingToc(tocPath: FilePath, force: boolean): Promise<Result<string, string>> {
-    const shouldContinue = await this.checkExistingToc(tocPath, force);
-    if (!shouldContinue) {
-      return Result.cancelled("Operation was cancelled by the user.");
-    }
-    return Result.success("TOC check passed.");
-  }
-
-  private async extractSdlComponents(
-    buildDirectory: DirectoryPath,
-    expandEndpoints: boolean,
-    expandModels: boolean
-  ): Promise<{ endpointGroups: Map<string, TocEndpoint[]>; models: TocModel[] }> {
-    if (!expandEndpoints && !expandModels) {
-      return { endpointGroups: new Map(), models: [] };
-    }
-
-    this.prompts.startProgressIndicatorWithMessage("Extracting endpoints and/or models from the API specification...");
-    const specFolderPath = await this.getSpecFolderPath(buildDirectory);
+type SdlComponents = {
+  endpointGroups: Map<string, TocEndpoint[]>;
+  models: TocModel[];
+};
 
-    if (!(await fsExtra.pathExists(specFolderPath))) {
-      this.prompts.stopProgressIndicatorWithMessage(`⚠️ Could not find the specification folder at: ${specFolderPath}`);
-      this.prompts.displayInfo("Falling back to default TOC structure without expanded endpoints or models...");
-      return { endpointGroups: new Map(), models: [] };
-    }
+export class PortalNewTocAction {
+  private readonly prompts: PortalNewTocPrompts = new PortalNewTocPrompts();
+  private readonly tocGenerator: TocStructureGenerator = new TocStructureGenerator();
+  private readonly fileService = new FileService();
+  private readonly portalService = new PortalService();
 
-    const sdlResult = await this.sdlParser.getTocComponentsFromSdl(specFolderPath);
+  constructor(private readonly configDirectory: DirectoryPath, private readonly commandMetadata: CommandMetadata) {}
 
-    if (!sdlResult.isSuccess()) {
-      this.prompts.stopProgressIndicatorWithMessage(`⚠️ ${sdlResult.error!}`);
-      this.prompts.displayInfo("Falling back to default TOC structure without expanded endpoints or models...");
-      return { endpointGroups: new Map(), models: [] };
+  public async execute(
+    buildDirectory: DirectoryPath,
+    tocDirectory?: DirectoryPath,
+    force: boolean = false,
+    expandEndpoints: boolean = false,
+    expandModels: boolean = false
+  ): Promise<ActionResult> {
+    // Validate build directory
+    const buildContext = new BuildContext(buildDirectory);
+    if (!(await buildContext.validate())) {
+      this.prompts.invalidBuildDirectory(buildDirectory);
+      return ActionResult.failed();
     }
+    const buildConfig = await buildContext.getBuildFileContents();
+    const contentDirectory = buildDirectory.join(buildConfig.generatePortal?.contentFolder ?? "content");
 
-    this.prompts.stopProgressIndicatorWithMessage(
-      "Successfully extracted endpoints and/or models from the specification."
-    );
-    return sdlResult.value!;
-  }
-
-  private async extractContentGroups(buildDirectory: DirectoryPath): Promise<TocGroup[]> {
-    const contentFolderPath = await this.getContentFolderPath(buildDirectory);
+    const tocDir = tocDirectory ?? contentDirectory;
+    const tocContext = new TocContext(tocDir);
 
-    if (!(await fsExtra.pathExists(contentFolderPath.toString()))) {
-      this.prompts.displayInfo(`⚠️ Could not locate the content folder at: ${contentFolderPath}`);
-      this.prompts.displayInfo("Skipping custom content addition in TOC...");
-      return [];
+    if (!force && (await tocContext.exists()) && !(await this.prompts.overwriteToc(tocContext.tocPath))) {
+      this.prompts.tocFileAlreadyExists();
+      return ActionResult.cancelled();
     }
 
-    return await this.contentParser.parseContentFolder(contentFolderPath.toString(), contentFolderPath.toString());
-  }
-
-  private async getDestinationPath(
-    buildDirectory: DirectoryPath,
-    providedTocDirectory?: DirectoryPath
-  ): Promise<DirectoryPath> {
-    if (providedTocDirectory === undefined) {
-      const inferredDestination = await this.getContentFolderPath(buildDirectory);
-      return inferredDestination;
+    let sdlComponents: SdlComponents = { endpointGroups: new Map(), models: [] };
+    if (expandEndpoints || expandModels) {
+      const specDirectory = buildDirectory.join("spec");
+
+      if (!(await this.fileService.directoryExists(specDirectory))) {
+        this.prompts.fallingBackToDefault();
+      } else {
+        const sdlResult = await withDirPath(async (tempDirectory) => {
+          const tempContext = new TempContext(tempDirectory);
+          const specZipPath = await tempContext.zip(specDirectory);
+          const specFileStream = await this.fileService.getStream(specZipPath);
+          try {
+            const result = await this.prompts.extractEndpointGroupsAndModels(
+              this.portalService.generateSdl(specFileStream, this.configDirectory, this.commandMetadata)
+            );
+            if (result.isErr()) {
+              this.prompts.fallingBackToDefault();
+              return ok({ endpointGroups: new Map(), models: [] } as SdlComponents);
+            }
+            return ok(getEndpointGroupsAndModels(result.value));
+          } finally {
+            specFileStream.close();
+          }
+        });
+
+        if (sdlResult.isErr()) {
+          this.prompts.logError(sdlResult.error);
+          return ActionResult.failed();
+        }
+        sdlComponents = sdlResult.value;
+      }
     }
-    return providedTocDirectory;
-  }
-
-  private async checkExistingToc(tocPath: FilePath, force: boolean): Promise<boolean> {
-    if ((await fsExtra.pathExists(tocPath.toString())) && !force) {
-      return await this.prompts.overwriteExistingTocPrompt(tocPath);
+    const contentContext = new ContentContext(contentDirectory);
+    const contentExists = await contentContext.exists();
+
+    let contentGroups: TocGroup[];
+    if (!contentExists) {
+      this.prompts.contentDirectoryNotFound(contentDirectory);
+      contentGroups = [];
+    } else {
+      contentGroups = await contentContext.extractContentGroups();
     }
-    return true;
-  }
-
-  private async getContentFolderPath(buildDirectory: DirectoryPath): Promise<DirectoryPath> {
-    const buildContext = new BuildContext(buildDirectory);
-    const defaultContentFolder = buildDirectory.join("content");
 
-    if (!(await buildContext.validate())) {
-      return defaultContentFolder;
-    }
 
-    try {
-      const buildConfig = await buildContext.getBuildFileContents();
-      if (buildConfig.generatePortal?.contentFolder == null) {
-        return defaultContentFolder;
-      }
-      return buildDirectory.join(buildConfig.generatePortal.contentFolder).join("content");
-    } catch {
-      return defaultContentFolder;
-    }
-  }
+    const toc = this.tocGenerator.createTocStructure(
+      sdlComponents.endpointGroups,
+      sdlComponents.models,
+      expandEndpoints,
+      expandModels,
+      contentGroups
+    );
 
-  private async getSpecFolderPath(buildDirectory: DirectoryPath): Promise<string> {
-    const buildFilePath = path.join(buildDirectory.toString(), this.APIMATIC_BUILD_FILENAME);
-    const defaultSpecFolder = path.join(buildDirectory.toString(), "spec");
+    const yamlString = this.tocGenerator.transformToYaml(toc);
+    const tocFilePath = await tocContext.save(yamlString);
 
-    if (!(await fsExtra.pathExists(buildFilePath))) {
-      return defaultSpecFolder;
-    }
 
-    try {
-      const buildConfig = await fsExtra.readJson(buildFilePath, "utf8");
+    this.prompts.tocCreated(tocFilePath)
 
-      if (buildConfig.generatePortal?.apiSpecPath == null) {
-        return defaultSpecFolder;
-      }
-      return path.join(buildDirectory.toString(), buildConfig.generatePortal.apiSpecPath);
-    } catch {
-      return defaultSpecFolder;
-    }
+    return ActionResult.success();
   }
 }
diff --git a/src/actions/sdk/generate.ts b/src/actions/sdk/generate.ts
index f017acae7..72d3f027e 100644
--- a/src/actions/sdk/generate.ts
+++ b/src/actions/sdk/generate.ts
@@ -1,22 +1,16 @@
-import { ZipService } from "../../infrastructure/zip-service.js";
-import { FileService } from "../../infrastructure/file-service.js";
 import { PortalService } from "../../infrastructure/services/portal-service.js";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
-import { FilePath } from "../../types/file/filePath.js";
-import { FileName } from "../../types/file/fileName.js";
 import { ActionResult } from "../action-result.js";
 import { withDirPath } from "../../infrastructure/tmp-extensions.js";
 import { SdkContext } from "../../types/sdk-context.js";
-import { Platforms } from "@apimatic/sdk";
 import { SpecContext } from "../../types/spec-context.js";
 import { SdkGeneratePrompts } from "../../prompts/sdk/generate.js";
-import { Language } from "../../types/sdk/generate.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { TempContext } from "../../types/temp-context.js";
+import { Language } from "../../types/sdk/generate.js";
 
 export class GenerateAction {
   private readonly prompts: SdkGeneratePrompts = new SdkGeneratePrompts();
-  private readonly zipArchiver: ZipService = new ZipService();
-  private readonly fileService: FileService = new FileService();
   private readonly portalService: PortalService = new PortalService();
   private readonly configDir: DirectoryPath;
   private readonly commandMetadata: CommandMetadata;
@@ -36,71 +30,42 @@ export class GenerateAction {
     zipSdk: boolean
   ): Promise<ActionResult> => {
     if (specDirectory.isEqual(sdkDirectory)) {
-      return ActionResult.error(`The spec directory and sdk directory cannot be the same: "${specDirectory}"`);
+      this.prompts.sameSpecAndSdkDir(specDirectory);
+      return ActionResult.failed();
     }
 
     const specContext = new SpecContext(specDirectory);
     if (!(await specContext.validate())) {
-      return ActionResult.error(
-        `Unable to locate a valid "src" directory. Navigate to the directory containing your APIMatic Portal source or set up a new project by running \`apimatic portal quickstart\`.`
-      );
+      this.prompts.invalidSpecDirectory(specDirectory);
+      return ActionResult.failed();
     }
 
     const sdkContext = new SdkContext(sdkDirectory, language);
-    if (!force && (await sdkContext.exists()) && !(await this.prompts.overwriteSdk(sdkDirectory))) {
-      return ActionResult.error(
-        "Please enter a different destination folder or remove the existing files and try again."
-      );
+    if (!force && (await sdkContext.exists()) && !(await this.prompts.overwriteSdk(sdkContext.sdkLanguageDirectory))) {
+      this.prompts.destinationDirNotEmpty();
+      return ActionResult.cancelled();
     }
 
     return await withDirPath(async (tempDirectory) => {
-      this.prompts.displaySdkGenerationMessage();
+      const tempContext = new TempContext(tempDirectory);
+      const specZipPath = await tempContext.zip(specDirectory);
 
-      const specZipPath = new FilePath(tempDirectory, new FileName("spec.zip"));
-      await this.zipArchiver.archive(specDirectory, specZipPath);
-
-      const platform = this.convertLanguageToPlatform(language);
-      const response = await this.portalService.generateSdk(
-        specZipPath,
-        platform,
-        this.configDir,
-        this.commandMetadata,
-        this.authKey
+      const response = await this.prompts.generateSDK(
+        this.portalService.generateSdk(specZipPath, language, this.configDir, this.commandMetadata, this.authKey)
       );
 
-      if (!response.isSuccess()) {
-        this.prompts.displaySdkGenerationErrorMessage();
-        return ActionResult.error(response.error!);
+      // TODO: this should be service error
+      if (response.isErr()) {
+        this.prompts.logGenerationError(response.error);
+        return ActionResult.failed();
       }
 
-      const tempSdkFilePath = new FilePath(tempDirectory, new FileName("sdk.zip"));
-      await this.fileService.writeFile(tempSdkFilePath, <NodeJS.ReadableStream>response.value);
+      const tempSdkFilePath = await tempContext.save(response.value);
+      const sdkLanguageDirectory = await sdkContext.save(tempSdkFilePath, zipSdk);
 
-      await sdkContext.save(tempSdkFilePath, zipSdk);
-      this.prompts.displaySdkGenerationSuccessMessage();
+      this.prompts.sdkGenerated(sdkLanguageDirectory);
 
       return ActionResult.success();
     });
   };
-
-  private convertLanguageToPlatform(language: Language): Platforms {
-    switch (language) {
-      case Language.CSHARP:
-        return Platforms.CsNetStandardLib;
-      case Language.JAVA:
-        return Platforms.JavaEclipseJreLib;
-      case Language.PHP:
-        return Platforms.PhpGenericLibV2;
-      case Language.PYTHON:
-        return Platforms.PythonGenericLib;
-      case Language.RUBY:
-        return Platforms.RubyGenericLib;
-      case Language.TYPESCRIPT:
-        return Platforms.TsGenericLib;
-      case Language.GO:
-        return Platforms.GoGenericLib;
-      default:
-        throw new Error(`Unknown LanguagePlatform: ${language}`);
-    }
-  }
 }
diff --git a/src/application/portal/recipe/portal-recipe.ts b/src/application/portal/recipe/portal-recipe.ts
index 46e7e7ba0..b34c0a3b7 100644
--- a/src/application/portal/recipe/portal-recipe.ts
+++ b/src/application/portal/recipe/portal-recipe.ts
@@ -1,4 +1,4 @@
-import { SerializableRecipe } from "../../../types/recipe/recipe.js";
+import { SerializableRecipe, StepType } from "../../../types/recipe/recipe.js";
 
 export class PortalRecipe {
   private readonly recipe: SerializableRecipe;
@@ -10,35 +10,29 @@ export class PortalRecipe {
     };
   }
 
-  addContentStep(key: string, name: string, content: string): this {
+  addContentStep(key: string, content: string) {
     this.recipe.steps.push({
       key,
-      name,
-      type: 'content',
+      name: key, //TODO: Check if key is required
+      type: StepType.Content,
       config: { content }
     });
-    return this;
   }
 
-  addEndpointStep(
-    key: string, 
-    name: string, 
-    description: string,
-    endpointPermalink: string
-  ): this {
+  addEndpointStep(key: string, description: string, endpointGroupName: string, endpointName: string) {
+    const endpointPermalink = `$e/${[endpointGroupName, endpointName].map(encodeURIComponent).join("/")}`;
     this.recipe.steps.push({
       key,
-      name,
-      type: 'endpoint',
+      name: key, //TODO: Check if key is required
+      type: StepType.Endpoint,
       config: {
         description,
-        endpointPermalink,
+        endpointPermalink
       }
     });
-    return this;
   }
 
   toSerializableRecipe(): SerializableRecipe {
     return this.recipe;
   }
-}
\ No newline at end of file
+}
diff --git a/src/application/portal/recipe/recipe-generator.ts b/src/application/portal/recipe/recipe-generator.ts
index c2f64d8b9..15a9c7fcc 100644
--- a/src/application/portal/recipe/recipe-generator.ts
+++ b/src/application/portal/recipe/recipe-generator.ts
@@ -1,27 +1,32 @@
-import * as path from "path";
-import fs from "fs";
 import prettier from "prettier";
 import { stringify } from "yaml";
 import { SerializableRecipe, ContentStepConfig, EndpointStepConfig } from "../../../types/recipe/recipe.js";
+import { DirectoryPath } from "../../../types/file/directoryPath.js";
+import { FileService } from "../../../infrastructure/file-service.js";
+import { Toc } from "../../../types/toc/toc.js";
+import { FilePath } from "../../../types/file/filePath.js";
+import { FileName } from "../../../types/file/fileName.js";
+import { BuildContext } from "../../../types/build-context.js";
 
 export class PortalRecipeGenerator {
   //TODO: Replace tocFileContent any type with concrete type.
+  private readonly fileService: FileService = new FileService();
+
   public async createRecipe(
     recipe: SerializableRecipe,
-    buildConfig: any,
-    tocFileContent: any,
-    tocFilePath: string,
+    tocFileContent: Toc,
+    tocFilePath: FilePath,
     recipeName: string,
-    recipeFileName: string,
-    buildConfigFilePath: string,
-    contentFolderPath: string
+    recipeFileName: FileName,
+    buildContext: BuildContext,
+    buildDirectory: DirectoryPath
   ) {
     await this.addRecipeToToc(tocFileContent, tocFilePath, recipeName, recipeFileName);
-    await this.registerRecipeInBuildConfigFile(buildConfig, recipeName, recipeFileName, buildConfigFilePath);
-    await this.createMarkdownFile(recipeFileName, contentFolderPath);
+    await this.registerRecipeInBuildConfigFile(buildContext, recipeName, recipeFileName);
+    await this.createMarkdownFile(recipeFileName, buildDirectory.join("content"));
 
     const generatedRecipeScript = await this.createScriptFromRecipe(recipe);
-    const generatedRecipeScriptsDirectoryPath = path.join(contentFolderPath, "static", "scripts", "recipes");
+    const generatedRecipeScriptsDirectoryPath = buildDirectory.join("static", "scripts", "recipes");
     await this.saveGeneratedRecipeScriptToBuildDirectory(
       generatedRecipeScript,
       generatedRecipeScriptsDirectoryPath,
@@ -30,12 +35,12 @@ export class PortalRecipeGenerator {
   }
 
   private async addRecipeToToc(
-    tocData: any,
-    tocFilePath: string,
+    tocData: Toc,
+    tocFilePath: FilePath,
     recipeName: string,
-    recipeFileName: string
+    recipeFileName: FileName
   ): Promise<void> {
-    let toc = tocData.toc;
+    let toc = tocData.toc as any;
     let apiRecipesGroup = toc.find((item: any) => item.group === "API Recipes");
 
     if (!apiRecipesGroup) {
@@ -44,7 +49,7 @@ export class PortalRecipeGenerator {
         group: "API Recipes",
         items: []
       };
-      // Insert after the last group section, before any generate sections
+      // Insert after the last group section, before generate sections
       let lastGroupIdx = -1;
       for (let i = 0; i < toc.length; i++) {
         if (toc[i].group) lastGroupIdx = i;
@@ -61,20 +66,21 @@ export class PortalRecipeGenerator {
         page: recipeName,
         file: `recipes/${recipeFileName}.md`
       });
-      await fs.promises.writeFile(tocFilePath, stringify(tocData));
+      await this.fileService.writeContents(tocFilePath, stringify(tocData));
     }
   }
 
   private async registerRecipeInBuildConfigFile(
-    buildConfig: any,
+    buildContext: BuildContext,
     recipeName: string,
-    recipeFileName: string,
-    buildConfigFilePath: string
+    recipeFileName: FileName,
   ): Promise<void> {
+
+    const buildConfig = await buildContext.getBuildFileContents();
     if (!buildConfig.recipes) {
       buildConfig.recipes = {};
     }
-    const recipesConfig = buildConfig.recipes;
+    const recipesConfig = buildConfig.recipes as any;
 
     if (!recipesConfig.workflows) {
       recipesConfig.workflows = [];
@@ -98,24 +104,15 @@ export class PortalRecipeGenerator {
       recipesConfig.workflows.push(newWorkflow);
     }
 
-    await this.writeRecipesConfigToBuildConfigFile(recipesConfig, buildConfigFilePath);
-  }
-
-  private async writeRecipesConfigToBuildConfigFile(recipesConfig: string, buildConfigFilePath: string): Promise<void> {
-    const fileData = await fs.promises.readFile(buildConfigFilePath, "utf-8");
-    const buildConfig = JSON.parse(fileData);
-
-    buildConfig.recipes = recipesConfig;
-
-    await fs.promises.writeFile(buildConfigFilePath, JSON.stringify(buildConfig, null, 2));
+    await buildContext.updateBuildFileContents(buildConfig)
   }
 
-  private async createMarkdownFile(recipeFileName: string, contentFolder: string): Promise<void> {
-    const directory = path.join(contentFolder, "content", "recipes");
+  private async createMarkdownFile(recipeFileName: FileName, contentFolder: DirectoryPath): Promise<void> {
+    const directory = contentFolder.join("recipes");
     const markdownFileContent = this.getMarkdownFileContent();
 
-    fs.mkdirSync(directory, { recursive: true });
-    fs.writeFileSync(`${directory}/${recipeFileName}.md`, markdownFileContent);
+    await this.fileService.createDirectoryIfNotExists(directory);
+    await this.fileService.writeContents(new FilePath(directory, new FileName(`${recipeFileName}.md`)), markdownFileContent);
   }
 
   private async createScriptFromRecipe(recipe: SerializableRecipe): Promise<string> {
@@ -149,20 +146,16 @@ export class PortalRecipeGenerator {
 
   private async saveGeneratedRecipeScriptToBuildDirectory(
     generatedRecipeScript: string,
-    generatedRecipeScriptsDirectoryPath: string,
-    recipeFileName: string,
+    generatedRecipeScriptsDirectoryPath: DirectoryPath,
+    recipeFileName: FileName,
     format: boolean = false
   ): Promise<void> {
     if (format) {
       generatedRecipeScript = await this.formatScript(generatedRecipeScript);
     }
 
-    fs.mkdirSync(generatedRecipeScriptsDirectoryPath, { recursive: true });
-    await fs.promises.writeFile(
-      `${generatedRecipeScriptsDirectoryPath}/${recipeFileName}.js`,
-      generatedRecipeScript,
-      "utf8"
-    );
+    await this.fileService.createDirectoryIfNotExists(generatedRecipeScriptsDirectoryPath);
+    await this.fileService.writeContents(new FilePath(generatedRecipeScriptsDirectoryPath, new FileName(`${recipeFileName}.js`)), generatedRecipeScript);
   }
 
   private generateVerifyFunction(): string {
diff --git a/src/application/portal/serve/portal-watcher.ts b/src/application/portal/serve/portal-watcher.ts
deleted file mode 100644
index 1250c7cba..000000000
--- a/src/application/portal/serve/portal-watcher.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import chokidar from "chokidar";
-import crypto from "crypto";
-import console from "console";
-import { Mutex } from "async-mutex";
-import { ServePaths } from "../../../types/portal/serve.js";
-import { WatcherHandler } from "./watcher-handler.js";
-import { DirectoryPath } from "../../../types/file/directoryPath.js";
-import { ActionResult } from "../../../actions/action-result.js";
-
-export class PortalWatcher {
-  private watcherHandler: WatcherHandler;
-
-  constructor() {
-    this.watcherHandler = new WatcherHandler();
-  }
-
-  public async watchAndRegeneratePortalOnChange(
-    paths: ServePaths,
-    generatePortal: (
-      buildDirectory: DirectoryPath,
-      portalDirectory: DirectoryPath,
-      force: boolean,
-      zipPortal: boolean
-    ) => Promise<ActionResult>
-  ) {
-    //Regex matches any hidden files and folders.
-    const watcher = chokidar.watch(paths.sourceDirectoryPath, {
-      ignored: [/(^|[/\\])\..+/],
-      ignoreInitial: true,
-      persistent: true,
-      awaitWriteFinish: true,
-      atomic: true
-    });
-
-    const deletedDirectories = new Set<string>();
-    const eventQueue = new Map();
-    const mutex = new Mutex();
-
-    watcher
-      .on("all", async (event, path) => {
-        if (event == "unlinkDir") {
-          deletedDirectories.add(path);
-        }
-
-        if (event == "unlink") {
-          for (const dir of deletedDirectories) {
-            if (path.startsWith(dir)) {
-              return;
-            }
-          }
-        }
-
-        const eventId: string = `${Date.now()}-${crypto.randomUUID()}`;
-
-        await mutex.runExclusive(async () => {
-          eventQueue.clear();
-          eventQueue.set(eventId, path);
-        });
-
-        await this.watcherHandler.execute(async () => {
-          await this.handleFileChange(paths, eventQueue, eventId, generatePortal);
-        });
-      })
-      .on("error", () => {
-        console.error(
-          "An unexpected error occurred while watching your build folder for changes. Please try again later. If the issue persists, contact our team at support@apimatic.io"
-        );
-        watcher.close();
-      });
-
-    return watcher;
-  }
-
-  // TODO: Remove this method. Figure out a better way to do this.
-  public cancelPendingOperations(): void {
-    if (this.watcherHandler) {
-      this.watcherHandler.cancel();
-    }
-  }
-
-  protected async handleFileChange(
-    paths: ServePaths,
-    eventQueue: Map<string, string>,
-    eventId: string,
-    generatePortal: (
-      buildDirectory: DirectoryPath,
-      portalDirectory: DirectoryPath,
-      force: boolean,
-      zipPortal: boolean
-    ) => Promise<ActionResult>
-  ): Promise<void> {
-    if (!eventQueue.has(eventId)) {
-      return;
-    }
-    const result = await generatePortal(
-      new DirectoryPath(paths.sourceDirectoryPath),
-      new DirectoryPath(paths.destinationDirectoryPath),
-      true,
-      false
-    );
-    result.map((error) => console.log(error));
-  }
-}
diff --git a/src/application/portal/serve/serve-handler.ts b/src/application/portal/serve/serve-handler.ts
deleted file mode 100644
index dcdf36755..000000000
--- a/src/application/portal/serve/serve-handler.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import express from "express";
-import livereload from "livereload";
-import connectLivereload from "connect-livereload";
-import open from "open";
-import process from "process";
-import getPort from "get-port";
-import console from "console";
-import { Server } from "http";
-import { Result } from "../../../types/common/result.js";
-import { ServeFlags, ServePaths } from "../../../types/portal/serve.js";
-import { PortalWatcher } from "./portal-watcher.js";
-import { DirectoryPath } from "../../../types/file/directoryPath.js";
-import { ActionResult } from "../../../actions/action-result.js";
-
-export class ServeHandler {
-  private server!: Server;
-  private liveReloadServer!: livereload.LiveReloadServer;
-  private readonly app: express.Application;
-  private readonly portalWatcher: PortalWatcher;
-
-  constructor() {
-    this.app = express();
-    this.portalWatcher = new PortalWatcher();
-  }
-
-  //TODO: Needs to be refactored after refactoring quickstart.
-  public async setupServer(generatedPortalArtifactsDirectoryPath: string): Promise<Result<string, string>> {
-    const createLiveReloadServerResult = await this.createLiveReloadServer(generatedPortalArtifactsDirectoryPath);
-    if (createLiveReloadServerResult.isFailed()) {
-      return Result.failure(createLiveReloadServerResult.error!);
-    }
-
-    this.app.use(express.static(generatedPortalArtifactsDirectoryPath, { extensions: ["html"] }));
-
-    return Result.success(`Server is set up and serving files from ${generatedPortalArtifactsDirectoryPath}`);
-  }
-
-  //TODO: Needs to be refactored after refactoring quickstart.
-  public async startServer(
-    paths: ServePaths,
-    flags: ServeFlags,
-    generatePortal: (
-      buildDirectory: DirectoryPath,
-      portalDirectory: DirectoryPath,
-      force: boolean,
-      zipPortal: boolean
-    ) => Promise<ActionResult>,
-    serverPort: number,
-    displayShutdownMessages = true
-  ): Promise<Result<boolean, string>> {
-    return new Promise<Result<boolean, string>>((resolve, reject) => {
-      this.server = this.app
-        .listen(serverPort, async () => {
-          if (flags.open) {
-            await open(`http://localhost:${serverPort}`);
-          }
-
-          if (!flags["no-reload"]) {
-            await this.portalWatcher.watchAndRegeneratePortalOnChange(paths, generatePortal);
-          }
-
-          if (process.platform !== "darwin") {
-            //For non-macOS users.
-            if (process.stdin.setRawMode) {
-              process.stdin.setRawMode(false);
-            }
-          }
-          resolve(Result.success(true));
-        })
-        .on("error", () => {
-          reject(
-            new Error(
-              `Something went wrong while serving your portal. Please try again later. If the issue persists, contact our team at support@apimatic.io`
-            )
-          );
-        });
-
-      const shutdown = async () => {
-        if (displayShutdownMessages) {
-          console.log("Shutting down server...");
-        }
-        await this.stopServer();
-        if (displayShutdownMessages) {
-          console.log("Server shut down successfully.");
-        }
-        resolve(Result.success(true));
-        process.exit(0);
-      };
-
-      process.on("SIGINT", shutdown);
-      process.on("SIGTERM", shutdown);
-    });
-  }
-
-  private async stopServer(): Promise<void> {
-    this.portalWatcher.cancelPendingOperations();
-    if (this.liveReloadServer) {
-      this.liveReloadServer.close();
-    }
-
-    if (this.server) {
-      await new Promise<void>((resolve) => {
-        this.server.close(() => resolve());
-      });
-    }
-  }
-
-  private async createLiveReloadServer(generatedPortalPath: string): Promise<Result<string, string>> {
-    try {
-      const availablePort = await this.getPortForReloadServer();
-      this.liveReloadServer = livereload.createServer({
-        port: availablePort
-      });
-
-      this.liveReloadServer.watch(generatedPortalPath);
-      this.app.use(connectLivereload());
-
-      return Result.success("Live Reload Server setup successfully.");
-    } catch {
-      return Result.failure(
-        "An unexpected error occurred while serving your portal, please try again later. If the issue persists, contact our team at support@apimatic.io for assistance."
-      );
-    }
-  }
-
-  private async getPortForReloadServer(): Promise<number> {
-    const defaultPorts = [35729, 35730, 35731];
-    return await getPort({ port: defaultPorts });
-  }
-}
diff --git a/src/application/portal/toc/sdl-parser.ts b/src/application/portal/toc/sdl-parser.ts
deleted file mode 100644
index d068bc1d9..000000000
--- a/src/application/portal/toc/sdl-parser.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import { PortalService } from "../../../infrastructure/services/portal-service.js";
-import { TocEndpoint, TocModel } from "../../../types/toc/toc.js";
-import { Result } from "../../../types/common/result.js";
-import { Sdl, SdlEndpoint, SdlModel } from "../../../types/sdl/sdl.js";
-import { DirectoryPath } from "../../../types/file/directoryPath.js";
-import { withDirPath } from "../../../infrastructure/tmp-extensions.js";
-import { FileName } from "../../../types/file/fileName.js";
-import { ZipService } from "../../../infrastructure/zip-service.js";
-import { FilePath } from "../../../types/file/filePath.js";
-import { FileService } from "../../../infrastructure/file-service.js";
-import { CommandMetadata } from "../../../types/common/command-metadata.js";
-
-export class SdlParser {
-  private readonly zipArchiver: ZipService = new ZipService();
-  private readonly fileService = new FileService();
-  private readonly configDirectory: DirectoryPath;
-  private readonly commandMetadata: CommandMetadata;
-
-  constructor(
-    private readonly portalService: PortalService,
-    configDirectory: DirectoryPath,
-    commandMetadata: CommandMetadata
-  ) {
-    this.configDirectory = configDirectory;
-    this.commandMetadata = commandMetadata;
-  }
-
-  public async getTocComponentsFromSdl(
-    specFolderPath: string
-  ): Promise<Result<{ endpointGroups: Map<string, TocEndpoint[]>; models: TocModel[] }, string>> {
-    const sdlResult = await this.generateSdlFromSpec(specFolderPath);
-
-    if (!sdlResult.isSuccess()) {
-      return Result.failure(
-        "Failed to extract endpoints/models from the specification. Please validate your spec using APIMatic's interactive VS Code Extension and then try again."
-      );
-    }
-
-    const sdl: Sdl = sdlResult.value!;
-    const endpointGroups = this.extractEndpointGroupsForToc(sdl);
-    const models = this.extractModelsForToc(sdl);
-
-    return Result.success({ endpointGroups, models });
-  }
-
-  public async getEndpointGroupsFromSdl(specFolderPath: string): Promise<Result<Map<string, SdlEndpoint[]>, string>> {
-    const sdlResult = await this.generateSdlFromSpec(specFolderPath);
-
-    if (!sdlResult.isSuccess()) {
-      return Result.failure(
-        "Failed to extract endpoints from the API specification. Please validate your spec using APIMatic's interactive VS Code Extension and then try again."
-      );
-    }
-
-    const sdl: Sdl = sdlResult.value!;
-    const endpointGroups = this.extractEndpointGroupsForRecipe(sdl);
-
-    return Result.success(endpointGroups);
-  }
-
-  private async generateSdlFromSpec(specFolderPath: string): Promise<Result<Sdl, string>> {
-    return await withDirPath(async (tempDirectory) => {
-      const specZipPath = new FilePath(tempDirectory, new FileName("spec.zip"));
-      await this.zipArchiver.archive(new DirectoryPath(specFolderPath), specZipPath);
-
-      const specFileStream = await this.fileService.getStream(specZipPath);
-      let result: Result<Sdl, string>;
-
-      try {
-        result = await this.portalService.generateSdl(specFileStream, this.configDirectory, this.commandMetadata);
-      } finally {
-        specFileStream.close();
-      }
-
-      if (!result.isSuccess()) {
-        return Result.failure(
-          "Failed to generate SDL from the API specification. Please validate your spec using APIMatic's interactive VS Code Extension."
-        );
-      }
-
-      return Result.success(result.value!);
-    });
-  }
-
-  private extractEndpointGroupsForRecipe(sdl: Sdl): Map<string, SdlEndpoint[]> {
-    const endpointGroups = new Map<string, SdlEndpoint[]>();
-    for (const endpoint of sdl.Endpoints) {
-      if (!endpointGroups.has(endpoint.Group)) {
-        endpointGroups.set(endpoint.Group, []);
-      }
-
-      endpointGroups.get(endpoint.Group)!.push({
-        Name: endpoint.Name,
-        Description: endpoint.Description,
-        Group: endpoint.Group
-      });
-    }
-
-    return endpointGroups;
-  }
-
-  private extractEndpointGroupsForToc(sdl: Sdl): Map<string, TocEndpoint[]> {
-    const endpointGroups = new Map<string, TocEndpoint[]>();
-
-    const endpoints = sdl.Endpoints.map(
-      (e: SdlEndpoint): TocEndpoint => ({
-        generate: null,
-        from: "endpoint",
-        endpointName: e.Name,
-        endpointGroup: e.Group
-      })
-    );
-
-    endpoints.forEach((endpoint: TocEndpoint) => {
-      const group = endpoint.endpointGroup;
-      if (!endpointGroups.has(group)) {
-        endpointGroups.set(group, []);
-      }
-      endpointGroups.get(group)!.push(endpoint);
-    });
-
-    return endpointGroups;
-  }
-
-  private extractModelsForToc(sdl: Sdl): TocModel[] {
-    return sdl.CustomTypes.map(
-      (e: SdlModel): TocModel => ({
-        generate: null,
-        from: "model",
-        modelName: e.Name
-      })
-    );
-  }
-}
diff --git a/src/client-utils/auth-manager.ts b/src/client-utils/auth-manager.ts
index a4e95f068..e71ee6229 100644
--- a/src/client-utils/auth-manager.ts
+++ b/src/client-utils/auth-manager.ts
@@ -14,8 +14,7 @@ export type AuthInfo = {
  */
 export async function getAuthInfo(configDir: string): Promise<AuthInfo | null> {
   try {
-    const data: AuthInfo | null = JSON.parse(await fs.readFile(path.join(configDir, "config.json"), "utf8"));
-    return data;
+    return JSON.parse(await fs.readFile(path.join(configDir, "config.json"), "utf8"));
   } catch {
     return null;
   }
@@ -47,12 +46,12 @@ export async function setAuthInfo(
   return await fs.writeFile(configFilePath, JSON.stringify(credentials));
 }
 
-export async function removeAuthInfo(configDir: string): Promise<void> {
+export async function removeAuthInfo(configDir: DirectoryPath): Promise<void> {
   const credentials: AuthInfo = {
     email: "",
     authKey: ""
   };
-  const configFilePath = path.join(configDir, "config.json");
+  const configFilePath = path.join(configDir.toString(), "config.json");
 
   if (!fs.existsSync(configFilePath)) fs.createFileSync(configFilePath);
 
diff --git a/src/client-utils/sdk-client.ts b/src/client-utils/sdk-client.ts
deleted file mode 100644
index f17ae4f91..000000000
--- a/src/client-utils/sdk-client.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Client } from "@apimatic/sdk";
-import { AuthInfo, getAuthInfo, removeAuthInfo } from "./auth-manager.js";
-
-/**
- * The Singleton class defines the `getInstance` method that lets clients access
- * the unique singleton instance.
- */
-export class SDKClient {
-  public static client: Client;
-  private static instance: SDKClient;
-
-  /**
-   * The static method that controls the access to the SDKClient instance.
-   *
-   * This implementation let you subclass the SDKClient class while keeping
-   * just one instance of each subclass around.
-   */
-  public static getInstance(): SDKClient {
-    if (!SDKClient.instance) {
-      SDKClient.instance = new SDKClient();
-    }
-
-    return SDKClient.instance;
-  }
-
-  public async logout(configDir: string): Promise<string> {
-    await removeAuthInfo(configDir);
-    return "Logged out";
-  }
-
-  public async status(configDir: string): Promise<string> {
-    try {
-      let storedAuthInfo: AuthInfo | null = await getAuthInfo(configDir);
-
-      if (!storedAuthInfo) {
-        // If no config file or no credentials exist in the config file
-        storedAuthInfo = { email: "", authKey: "" };
-      }
-
-      return storedAuthInfo.email === "" && storedAuthInfo.authKey === ""
-        ? "Not logged in"
-        : storedAuthInfo.email === "" && storedAuthInfo.authKey !== ""
-        ? "Logged in with authentication key"
-        : `Currently logged in as ${storedAuthInfo.email}`;
-    } catch (error) {
-      throw error as Error;
-    }
-  }
-}
diff --git a/src/commands/api/transform.ts b/src/commands/api/transform.ts
index 8efa79ae7..6c54dd542 100644
--- a/src/commands/api/transform.ts
+++ b/src/commands/api/transform.ts
@@ -1,29 +1,40 @@
 import { Command, Flags } from "@oclif/core";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { FlagsProvider } from "../../types/flags-provider.js";
-import { ApiTransformPrompts } from "../../prompts/api/transform.js";
 import { TransformAction } from "../../actions/api/transform.js";
-import { FilePath } from "../../types/file/filePath.js";
-import path from "path/win32";
-import { FileName } from "../../types/file/fileName.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { format, intro, outro } from "../../prompts/format.js";
+import { createResourceInput } from "../../types/file/resource-input.js";
+import { TransformationFormats } from "../../types/api/transform.js";
+import { ExportFormats } from "@apimatic/sdk";
 
 const DEFAULT_WORKING_DIRECTORY = "./";
 
 export default class Transform extends Command {
+  static readonly summary = "Transform API specifications between different formats";
+
   static readonly description = `Transform API specifications from one format to another.
 Supports multiple formats including OpenAPI/Swagger, RAML, WSDL, and Postman Collections.`;
 
+  static readonly cmdTxt = format.cmd("apimatic", "api", "transform");
+
   static examples = [
-    `apimatic api transform --format=OPENAPI3YAML --file="./specs/sample.json" --destination="D:/"`,
-    `apimatic api transform --format=RAML --url="https://petstore.swagger.io/v2/swagger.json"  --destination="D:/"`
+    `${Transform.cmdTxt} ${format.flag("format", "OPENAPI3YAML")} ${format.flag(
+      "file",
+      "./specs/sample.json"
+    )} ${format.flag("destination", "./")}`,
+    `${Transform.cmdTxt} ${format.flag("format", "RAML")} ${format.flag(
+      "url",
+      '"https://petstore.swagger.io/v2/swagger.json"'
+    )} ${format.flag("destination", "./")}`
   ];
 
   static flags = {
-    format: Flags.string({
-      required: true,
-      description: "Specification format to transform API specification into"
-    }),
+      format: Flags.string({
+        required: true,
+        description: "Specification format to transform API specification into",
+        options: Object.keys(TransformationFormats)
+      }),
     file: Flags.string({
       description: "Path to the API specification file to transform"
     }),
@@ -32,40 +43,35 @@ Supports multiple formats including OpenAPI/Swagger, RAML, WSDL, and Postman Col
     }),
     destination: Flags.string({
       char: "d",
-      description: "Directory to download the transformed file to",
+      description: "Directory to save the transformed file to",
       default: DEFAULT_WORKING_DIRECTORY
     }),
     ...FlagsProvider.force,
     ...FlagsProvider.authKey
   };
 
-  private readonly prompts: ApiTransformPrompts = new ApiTransformPrompts();
-
   async run() {
     const {
       flags: { format, file, url, destination, force, "auth-key": authKey }
     } = await this.parse(Transform);
 
-    const destinationDir = new DirectoryPath(destination);
+  const workingDirectory = new DirectoryPath(destination ?? DEFAULT_WORKING_DIRECTORY);
+  const transformedApiDirectory = workingDirectory.join("transformations");
+  const specFile = createResourceInput(file, url);
+  // Directly map the format flag to ExportFormats using TransformationFormats
+  const key = format as keyof typeof TransformationFormats;
+  const transformationFormat = TransformationFormats[key] as keyof typeof ExportFormats;
+  const parsedFormat = ExportFormats[transformationFormat];
 
-    let filePath: FilePath | undefined = undefined;
-    if (file) {
-      filePath = new FilePath(new DirectoryPath(path.dirname(file)), new FileName(path.basename(file)));
-    }
     const commandMetadata: CommandMetadata = {
       commandName: Transform.id,
       shell: this.config.shell
-    }
+    };
 
+    intro("Transform API");
     const action = new TransformAction(this.getConfigDir(), commandMetadata, authKey);
-
-    const result = await action.execute(format, destinationDir, force, filePath, url);
-
-    result.mapAll(
-      () => this.prompts.displayOutroMessage(destinationDir),
-      (message: string) => this.prompts.logError(message),
-      (message: string) => this.prompts.logError(message)
-    );
+    const result = await action.execute(specFile, parsedFormat, transformedApiDirectory, force);
+    outro(result);
   }
 
   private readonly getConfigDir = () => {
diff --git a/src/commands/api/validate.ts b/src/commands/api/validate.ts
index dffc04203..d07a70f46 100644
--- a/src/commands/api/validate.ts
+++ b/src/commands/api/validate.ts
@@ -1,19 +1,21 @@
 import { Command, Flags } from "@oclif/core";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { FlagsProvider } from "../../types/flags-provider.js";
-import { ApiValidatePrompts } from "../../prompts/api/validate.js";
 import { ValidateAction } from "../../actions/api/validate.js";
-import { FilePath } from "../../types/file/filePath.js";
-import path from "path";
-import { FileName } from "../../types/file/fileName.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { format, intro, outro } from "../../prompts/format.js";
+import { createResourceInput } from "../../types/file/resource-input.js";
 
 export default class Validate extends Command {
-  static description = "Validate the syntactic and semantic correctness of an API specification";
+  static readonly summary = "Validate API specification for syntactic and semantic correctness";
+
+  static readonly description = `Validate your API specification to ensure it adheres to syntactic and semantic standards.`;
+
+  static readonly cmdTxt = format.cmd("apimatic", "api", "validate");
 
   static examples = [
-    `apimatic api validate --file="./specs/sample.json"`,
-    `apimatic api validate --url=https://petstore.swagger.io/v2/swagger.json`
+    `${Validate.cmdTxt} ${format.flag("file", "./specs/sample.json")}`,
+    `${Validate.cmdTxt} ${format.flag("url", '"https://petstore.swagger.io/v2/swagger.json"')}`
   ];
 
   static flags = {
@@ -22,8 +24,6 @@ export default class Validate extends Command {
     ...FlagsProvider.authKey
   };
 
-  private readonly prompts: ApiValidatePrompts = new ApiValidatePrompts();
-
   async run() {
     const {
       flags: { file, url, "auth-key": authKey }
@@ -34,23 +34,12 @@ export default class Validate extends Command {
       shell: this.config.shell
     };
 
-    const action = new ValidateAction(
-      this.getConfigDir(),
-      commandMetadata,
-      authKey
-    );
-    let filePath: FilePath | undefined = undefined;
-    if (file) {
-      filePath = new FilePath(new DirectoryPath(path.dirname(file)), new FileName(path.basename(file)));
-    }
-
-    const result = await action.execute(filePath, url);
-
-    result.mapAll(
-      () => this.prompts.displayOutroMessage(),
-      (message: string) => this.prompts.logError(message),
-      (message: string) => this.prompts.logError(message)
-    );
+    const action = new ValidateAction(this.getConfigDir(), commandMetadata, authKey);
+    const resourceInput = createResourceInput(file, url);
+
+    intro("Validate API");
+    const result = await action.execute(resourceInput);
+    outro(result);
   }
 
   private readonly getConfigDir = () => {
diff --git a/src/commands/auth/login.ts b/src/commands/auth/login.ts
index eada191ce..830f17b45 100644
--- a/src/commands/auth/login.ts
+++ b/src/commands/auth/login.ts
@@ -1,13 +1,18 @@
 import { Command, Flags } from "@oclif/core";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
-import { LoginPrompts } from "../../prompts/auth/login.js";
 import { LoginAction } from "../../actions/auth/login.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { format, intro, outro } from "../../prompts/format.js";
 
 export default class Login extends Command {
+  static summary = "Login to your APIMatic account";
+
   static description = "Login using your APIMatic credentials or an API Key";
 
-  static examples = [`apimatic auth login`, `apimatic auth login --auth-key={api-key}`];
+  private static cmdTxt = format.cmd('apimatic',  'auth' ,'login');
+  static examples = [
+    Login.cmdTxt,
+    `${Login.cmdTxt} ${format.flag('auth-key', '{api-key}')}`];
 
   static flags = {
     "auth-key": Flags.string({
@@ -16,7 +21,6 @@ export default class Login extends Command {
     })
   };
 
-  private readonly prompts = new LoginPrompts();
 
   async run() {
     const {
@@ -31,11 +35,10 @@ export default class Login extends Command {
       commandName: Login.id,
       shell: this.config.shell
     };
+
+    intro("Login");
     const loginAction = new LoginAction(new DirectoryPath(this.config.configDir), commandMetadata);
     const result = await loginAction.execute(authKey);
-    result.match(
-      (email) => this.prompts.loginSuccessful(email),
-      (error) => this.prompts.logError(error)
-    );
+    outro(result);
   }
 }
diff --git a/src/commands/auth/logout.ts b/src/commands/auth/logout.ts
index 0ccc3d22f..9e4734663 100644
--- a/src/commands/auth/logout.ts
+++ b/src/commands/auth/logout.ts
@@ -1,20 +1,20 @@
 import { Command } from "@oclif/core";
+import { format, intro, outro } from "../../prompts/format.js";
+import { LogoutAction } from "../../actions/auth/logout.js";
+import { DirectoryPath } from "../../types/file/directoryPath.js";
 
-import { SDKClient } from "../../client-utils/sdk-client.js";
+export default class Logout extends Command {
+  static summary = "Clears the local login credentials.";
 
-export default class Login extends Command {
-  static description = "Clears the local login credentials.";
+  static description = "Clears the local login credentials. This will also clear any cached credentials from the CLI.";
 
-  static examples = [`apimatic auth logout`];
+  private static cmdTxt = format.cmd('apimatic',  'auth' ,'logout');
+  static examples = [Logout.cmdTxt];
 
   async run() {
-    try {
-      const client = SDKClient.getInstance();
-      const response = await client.logout(this.config.configDir);
 
-      this.log(response);
-    } catch (error) {
-      this.error(error as string);
-    }
+    intro("Logout");
+    const actionResult = await new LogoutAction(new DirectoryPath(this.config.configDir)).execute();
+    outro(actionResult)
   }
 }
diff --git a/src/commands/auth/status.ts b/src/commands/auth/status.ts
index 0816d3a33..9660f795c 100644
--- a/src/commands/auth/status.ts
+++ b/src/commands/auth/status.ts
@@ -1,21 +1,27 @@
 import { Command } from "@oclif/core";
 
-import { SDKClient } from "../../client-utils/sdk-client.js";
+import { format, intro, outro } from "../../prompts/format.js";
+import { StatusAction } from "../../actions/auth/status.js";
+import { DirectoryPath } from "../../types/file/directoryPath.js";
+import { CommandMetadata } from "../../types/common/command-metadata.js";
+
 
 export default class Status extends Command {
   static description = "View the currently logged in user.";
 
-  static examples = [`apimatic auth status`];
+  private static cmdTxt = format.cmd('apimatic',  'auth' ,'status');
+  static examples = [Status.cmdTxt];
 
   async run() {
-    try {
-      const client = SDKClient.getInstance();
-      // TODO: Add validation for auth key from the server.
-      const response = await client.status(this.config.configDir);
 
-      this.log(response);
-    } catch (error) {
-      this.error(error as string);
-    }
+    const commandMetadata: CommandMetadata = {
+      commandName: Status.id,
+      shell: this.config.shell
+    };
+
+    intro('Status')
+    const statusAction = new StatusAction(new DirectoryPath(this.config.configDir), commandMetadata);
+    const actionResult = await statusAction.execute(null);
+    outro(actionResult)
   }
 }
diff --git a/src/commands/portal/copilot.ts b/src/commands/portal/copilot.ts
index 4e77b68ac..10c293065 100644
--- a/src/commands/portal/copilot.ts
+++ b/src/commands/portal/copilot.ts
@@ -1,17 +1,15 @@
 import { Command, Flags } from "@oclif/core";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
-import { PortalCopilotPrompts } from "../../prompts/portal/copilot.js";
 import { FlagsProvider } from "../../types/flags-provider.js";
 import { CopilotAction } from "../../actions/portal/copilot.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { format, intro, outro } from "../../prompts/format.js";
 
-const DEFAULT_WORKING_DIRECTORY = "./";
-
-export default class PortalCopilotEnable extends Command {
+export default class PortalCopilot extends Command {
   static summary = "Configure API Copilot for your API Documentation portal";
 
   static description =
-    "Displays available API Copilots associated with your account and allows you to select which one to integrate with your portal. Each APIMatic account includes one Copilot by default. The selected Copilot will be added to your APIMATIC-BUILD.json file";
+    `Displays available API Copilots associated with your account and allows you to select which one to integrate with your portal. Each APIMatic account includes one Copilot by default. The selected Copilot will be added to your ${format.var("APIMATIC-BUILD.json")} file`;
 
   static flags = {
     ...FlagsProvider.input,
@@ -20,28 +18,30 @@ export default class PortalCopilotEnable extends Command {
       description: "marks the API Copilot as disabled in the configuration"
     }),
     ...FlagsProvider.force,
+    ...FlagsProvider.force,
     ...FlagsProvider.authKey
   };
 
-  static examples = [`apimatic portal copilot --input="./"`, `apimatic portal copilot --input="./" --disable`];
-
-  private readonly prompts = new PortalCopilotPrompts();
+  static cmdTxt = format.cmd("apimatic", "portal", "copilot");
+  static examples = [
+    `${this.cmdTxt} ${format.flag("input", './')}`,
+    `${this.cmdTxt} ${format.flag("input", './')} ${format.flag("disable")}`
+  ];
 
   async run(): Promise<void> {
     const {
       flags: { input, "auth-key": authKey, disable, force }
-    } = await this.parse(PortalCopilotEnable);
-
-    const workingDirectory = new DirectoryPath(input ?? DEFAULT_WORKING_DIRECTORY);
-    const buildDirectory = input ? new DirectoryPath(input, "src") : workingDirectory.join("src");
+    } = await this.parse(PortalCopilot);
 
     const commandMetadata: CommandMetadata = {
-      commandName: PortalCopilotEnable.id,
+      commandName: PortalCopilot.id,
       shell: this.config.shell
     };
 
+    intro("Configure API Copilot");
+    const buildDirectory = new DirectoryPath(input ?? "./", "src");
     const copilotConfigAction = new CopilotAction(new DirectoryPath(this.config.configDir), commandMetadata, authKey);
     const result = await copilotConfigAction.execute(buildDirectory, force, !disable);
-    result.map((message) => this.prompts.logError(message));
+    outro(result);
   }
 }
diff --git a/src/commands/portal/generate.ts b/src/commands/portal/generate.ts
index 7abe99a85..212081988 100644
--- a/src/commands/portal/generate.ts
+++ b/src/commands/portal/generate.ts
@@ -1,13 +1,15 @@
-import { Command, Config, Flags } from "@oclif/core";
+import { Command, Flags } from "@oclif/core";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { GenerateAction } from "../../actions/portal/generate.js";
-import { PortalGeneratePrompts } from "../../prompts/portal/generate.js";
 import { FlagsProvider } from "../../types/flags-provider.js";
+import { format, intro, outro } from "../../prompts/format.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
 
 const DEFAULT_WORKING_DIRECTORY = "./";
 
 export class PortalGenerate extends Command {
+  static summary = "Generate an API Documentation portal";
+
   static description =
     "Generate an API Documentation portal. Requires an input directory containing API specifications, a config file and optionally, markdown guides. For details, refer to the [documentation](https://docs.apimatic.io/platform-api/#/http/guides/generating-on-prem-api-portal/build-file-reference)";
 
@@ -17,19 +19,16 @@ export class PortalGenerate extends Command {
     ...FlagsProvider.force,
     zip: Flags.boolean({
       default: false,
-      description: "download the generated portal as a .zip archive"
+      description: "Download the generated portal as a .zip archive"
     }),
     ...FlagsProvider.authKey
   };
 
-  static examples = [`apimatic portal generate`, `apimatic portal generate --input="./" --destination="./portal"`];
-
-  private readonly prompts: PortalGeneratePrompts;
-
-  constructor(argv: string[], config: Config) {
-    super(argv, config);
-    this.prompts = new PortalGeneratePrompts();
-  }
+  static cmdTxt = format.cmd("apimatic", "portal", "generate");
+  static examples = [
+    this.cmdTxt,
+    `${this.cmdTxt} ${format.flag("input", '"./"')} ${format.flag("destination", '"./portal"')}`
+  ];
 
   async run(): Promise<void> {
     const {
@@ -44,16 +43,9 @@ export class PortalGenerate extends Command {
       shell: this.config.shell
     };
 
-    const action = new GenerateAction(this.getConfigDir(), commandMetadata, authKey);
+    intro("Generate Portal");
+    const action = new GenerateAction(new DirectoryPath(this.config.configDir), commandMetadata, authKey);
     const result = await action.execute(buildDirectory, portalDirectory, force, zipPortal);
-    result.mapAll(
-      () => this.prompts.displayOutroMessage(portalDirectory.toString()),
-      (message) => this.prompts.logError(message),
-      (message) => this.prompts.logError(message)
-    );
+    outro(result);
   }
-
-  private getConfigDir = () => {
-    return new DirectoryPath(this.config.configDir);
-  };
 }
diff --git a/src/commands/portal/quickstart.ts b/src/commands/portal/quickstart.ts
index e4b890dbb..9c8c7bd5d 100644
--- a/src/commands/portal/quickstart.ts
+++ b/src/commands/portal/quickstart.ts
@@ -1,36 +1,40 @@
 import { Command } from "@oclif/core";
-import { PortalQuickstartPrompts } from "../../prompts/portal/quickstart.js";
 import { PortalQuickstartAction } from "../../actions/portal/quickstart.js";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { TelemetryService } from "../../infrastructure/services/telemetry-service.js";
 import { QuickstartInitiatedEvent } from "../../types/events/quickstart-initiated.js";
 import { QuickstartCompletedEvent } from "../../types/events/quickstart-completed.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { format, intro, outro } from "../../prompts/format.js";
 
 export default class PortalQuickstart extends Command {
   static description = "Create your first API Portal using APIMatic's Docs as Code offering.";
 
-  static examples = ["apimatic portal quickstart"];
+  static summary = "Get started with your first API Portal in four easy steps.";
+
+  static cmdTxt = format.cmd("apimatic", "portal", "quickstart");
+
+  static examples = [this.cmdTxt];
 
   async run() {
     const telemetryService = new TelemetryService(this.getConfigDir());
-    const prompts = new PortalQuickstartPrompts();
     const commandMetadata: CommandMetadata = {
       commandName: PortalQuickstart.id,
       shell: this.config.shell
     };
-    const action = new PortalQuickstartAction(this.getConfigDir(), commandMetadata);
 
     await telemetryService.trackEvent(new QuickstartInitiatedEvent(), commandMetadata.shell);
 
+    intro("Portal Quickstart");
+    const action = new PortalQuickstartAction(this.getConfigDir(), commandMetadata);
     const result = await action.execute();
+    outro(result);
+
+    // TODO: Remove this, find a solution for tracking.
     await result.mapAll(
-      async (buildDirectoryPath) => {
-        await telemetryService.trackEvent(new QuickstartCompletedEvent(), commandMetadata.shell);
-        prompts.displayOutroMessage(buildDirectoryPath!);
-      },
-      async (message) => prompts.logError(message),
-      async (message) => prompts.logError(message)
+      async () => await telemetryService.trackEvent(new QuickstartCompletedEvent(), commandMetadata.shell),
+      () => new Promise(() => {}),
+      () => new Promise(() => {})
     );
   }
 
diff --git a/src/commands/portal/recipe/new.ts b/src/commands/portal/recipe/new.ts
index 4193257b0..00879b9b7 100644
--- a/src/commands/portal/recipe/new.ts
+++ b/src/commands/portal/recipe/new.ts
@@ -1,59 +1,68 @@
 import { Command, Flags } from "@oclif/core";
 import { PortalRecipeAction } from "../../../actions/portal/recipe/new-recipe.js";
-import { PortalRecipePrompts } from "../../../prompts/portal/recipe/new-recipe.js";
-import { getMessageInRedColor } from "../../../utils/utils.js";
 import { TelemetryService } from "../../../infrastructure/services/telemetry-service.js";
 import { RecipeCreationFailedEvent } from "../../../types/events/recipe-creation-failed.js";
 import { DirectoryPath } from "../../../types/file/directoryPath.js";
 import { FlagsProvider } from "../../../types/flags-provider.js";
 import { CommandMetadata } from "../../../types/common/command-metadata.js";
+import { format, intro, outro } from "../../../prompts/format.js";
 
 const DEFAULT_WORKING_DIRECTORY = "./";
 
 export default class PortalRecipeNew extends Command {
-  static override summary = "Add an API Recipe to your API Documentation portal.";
+  static summary = "Add an API Recipe to your API documentation portal.";
 
-  static override description =
-    "To learn more about API Recipes, visit: https://docs.apimatic.io/platform-api/#/http/guides/generating-on-prem-api-portal/api-recipes";
+  static description = `This command adds a new API Recipe file to your documentation portal.
 
-  static override examples = [
-    `apimatic portal recipe new`,
-    `apimatic portal recipe new --name="My API Recipe" --input="./"`
-  ];
-  static override flags = {
+To learn more about API Recipes, visit:
+${format.link(
+  "https://docs.apimatic.io/platform-api/#/http/guides/generating-on-prem-api-portal/api-recipes"
+)}`;
+
+  static flags = {
     name: Flags.string({ description: "name for the recipe" }),
-    ...FlagsProvider.input
+    ...FlagsProvider.input,
+    ...FlagsProvider.force
   };
 
-  public async run(): Promise<void> {
-    const { flags } = await this.parse(PortalRecipeNew);
+  static readonly cmdTxt = format.cmd("apimatic", "portal", "recipe", "new");
+  static readonly examples = [
+    `${this.cmdTxt}`,
+    `${this.cmdTxt} ${format.flag("name", '"My API Recipe"')} ${format.flag("input", '"./"')}`
+  ];
+
+  async run(): Promise<void> {
+    const {
+      flags: { name, input, force }
+    } = await this.parse(PortalRecipeNew);
+
+    const workingDirectory = new DirectoryPath(input ?? DEFAULT_WORKING_DIRECTORY);
+    const buildDirectory = input ? new DirectoryPath(input, "src") : workingDirectory.join("src");
+
     const commandMetadata: CommandMetadata = {
       commandName: PortalRecipeNew.id,
       shell: this.config.shell
     };
-    const telemetryService = new TelemetryService(this.getConfigDir());
-    const portalRecipeAction = new PortalRecipeAction(this.getConfigDir(), commandMetadata);
-    const portalRecipePrompts = new PortalRecipePrompts();
-
-    const workingDirectory = new DirectoryPath(flags.input ?? DEFAULT_WORKING_DIRECTORY);
-    const buildDirectory = flags.input ? new DirectoryPath(flags.input, "src") : workingDirectory.join("src");
-
-    const createRecipeResult = await portalRecipeAction.createRecipe(buildDirectory, flags.name);
-
-    //TODO: Add a mapper for automatically mapping events to logger and telemetry service.
-    if (createRecipeResult.isFailed()) {
-      await telemetryService.trackEvent(
-        new RecipeCreationFailedEvent(createRecipeResult.error!, commandMetadata.commandName, flags),
-        commandMetadata.shell
-      );
-      portalRecipePrompts.logError(getMessageInRedColor(createRecipeResult.error!));
-    }
-    if (createRecipeResult.isCancelled()) {
-      portalRecipePrompts.logError(getMessageInRedColor(createRecipeResult.value!));
-    }
-  }
 
-  private getConfigDir(): DirectoryPath {
-    return new DirectoryPath(this.config.configDir);
+    intro("New Recipe");
+    const action = new PortalRecipeAction(new DirectoryPath(this.config.configDir), commandMetadata);
+    const result = await action.execute(buildDirectory, name);
+    outro(result);
+
+    result.mapAll(
+      () => {},
+      async () => {
+        const telemetryService = new TelemetryService(new DirectoryPath(this.config.configDir));
+        await telemetryService.trackEvent(
+          new RecipeCreationFailedEvent("error", PortalRecipeNew.id, {
+            name,
+            input,
+            force
+          }),
+          commandMetadata.shell
+        );
+      },
+      () => {}
+    );
   }
 }
diff --git a/src/commands/portal/serve.ts b/src/commands/portal/serve.ts
index cb9bb8efa..848b97e24 100644
--- a/src/commands/portal/serve.ts
+++ b/src/commands/portal/serve.ts
@@ -1,99 +1,67 @@
-import { Command, Config, Flags } from "@oclif/core";
-import { PortalServePrompts } from "../../prompts/portal/serve.js";
-import { ServeFlags, ServePaths } from "../../types/portal/serve.js";
+import { Command, Flags } from "@oclif/core";
 import { PortalServeAction } from "../../actions/portal/serve.js";
-import { getMessageInRedColor } from "../../utils/utils.js";
-import { ServeHandler } from "../../application/portal/serve/serve-handler.js";
-import { PortalService } from "../../infrastructure/services/portal-service.js";
-import { GenerateAction } from "../../actions/portal/generate.js";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { FlagsProvider } from "../../types/flags-provider.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { format, intro, outro } from "../../prompts/format.js";
 
 const DEFAULT_WORKING_DIRECTORY = "./";
 
 export default class PortalServe extends Command {
-  static description = "Generate and deploy a Docs as Code portal with hot reload.";
+  static summary = "Generate and serve an API Documentation Portal with hot reload.";
+
+  static description =
+    "Requires an input directory with API specifications, a config file, and optionally markdown guides. Supports disabling hot reload and opening the portal in the default browser.";
 
   static flags = {
     port: Flags.integer({
       char: "p",
-      description: "[default: 3000] port to serve the portal."
+      description: "port to serve the portal.",
+      default: 3000,
+      helpValue: "3000"
     }),
     ...FlagsProvider.input,
     ...FlagsProvider.destination("portal", "portal"),
     open: Flags.boolean({
       char: "o",
-      description: "Open the portal in the default browser.",
+      description: "open the portal in the default browser.",
       default: false
     }),
     "no-reload": Flags.boolean({
-      description: "Disable hot reload.",
+      description: "disable hot reload.",
       default: false
     }),
     ...FlagsProvider.authKey
   };
 
-  private readonly prompts: PortalServePrompts;
-
-  constructor(argv: string[], config: Config) {
-    super(argv, config);
-    this.prompts = new PortalServePrompts();
-  }
-
+  static cmdTxt = format.cmd("apimatic", "portal", "serve");
   static examples = [
-    "apimatic portal serve",
-    'apimatic portal serve --input="./" --destination="./portal" --port=3000 --open --no-reload'
+    this.cmdTxt,
+    `${this.cmdTxt} ` +
+      `${format.flag("input", './')} ` +
+      `${format.flag("destination", './portal')} ` +
+      `${format.flag("port", "3000")} ` +
+      `${format.flag("open")} ` +
+      `${format.flag("no-reload")}`
   ];
 
   public async run() {
-    const { flags } = await this.parse(PortalServe);
-    const portalServePrompts = new PortalServePrompts();
-    const portalServeAction = new PortalServeAction(portalServePrompts, new ServeHandler(), new PortalService());
-
-    const workingDirectory = new DirectoryPath(flags.input ?? DEFAULT_WORKING_DIRECTORY);
-    const buildDirectory = flags.input ? new DirectoryPath(flags.input, "src") : workingDirectory.join("src");
-    const portalDirectory = flags.destination ? new DirectoryPath(flags.destination) : workingDirectory.join("portal");
+    const {
+      flags: { input, destination, port, open, "no-reload": noReload, "auth-key": authKey }
+    } = await this.parse(PortalServe);
 
+    const workingDirectory = new DirectoryPath(input ?? DEFAULT_WORKING_DIRECTORY);
+    const buildDirectory = input ? new DirectoryPath(input, "src") : workingDirectory.join("src");
+    const portalDirectory = destination ? new DirectoryPath(destination) : workingDirectory.join("portal");
     const commandMetadata: CommandMetadata = {
       commandName: PortalServe.id,
       shell: this.config.shell
     };
 
-    const generatePortalAction = new GenerateAction(this.getConfigDir(), commandMetadata, flags["auth-key"]);
-
-    const serveFlags: ServeFlags = {
-      input: buildDirectory.toString(),
-      destination: portalDirectory.toString(),
-      "auth-key": flags["auth-key"],
-      port: flags.port,
-      open: flags.open,
-      "no-reload": flags["no-reload"]
-    };
-
-    const servePaths: ServePaths = {
-      sourceDirectoryPath: buildDirectory.toString(),
-      destinationDirectoryPath: portalDirectory.toString()
-    };
-
-    const servePortalResult = await portalServeAction.servePortal(serveFlags, servePaths, generatePortalAction.execute);
-    //TODO: Convert below statements to result.mapAll after changing servePortalResult to ActionResult.
-    if (servePortalResult.isFailed()) {
-      portalServePrompts.logError(getMessageInRedColor(servePortalResult.error!));
-    }
-
-    if (servePortalResult.isCancelled()) {
-      portalServePrompts.logError(getMessageInRedColor(servePortalResult.value!));
-    }
-
-    if (servePortalResult.isSuccess()) {
-      this.prompts.displayOutroMessage(
-        buildDirectory.toString(),
-        portalDirectory.toString(),
-        servePortalResult.value!,
-        flags["no-reload"]
-      );
-    }
+    intro("Portal Serve");
+    const portalServeAction = new PortalServeAction(this.getConfigDir(), commandMetadata, authKey);
+    const result = await portalServeAction.execute(buildDirectory, portalDirectory, port, open, !noReload);
+    outro(result);
   }
 
   private getConfigDir(): DirectoryPath {
diff --git a/src/commands/portal/toc/new.ts b/src/commands/portal/toc/new.ts
index 708274532..b58a7bed8 100644
--- a/src/commands/portal/toc/new.ts
+++ b/src/commands/portal/toc/new.ts
@@ -1,10 +1,11 @@
-import { Command, Config, Flags } from "@oclif/core";
+import { Command, Flags } from "@oclif/core";
 import { PortalNewTocAction } from "../../../actions/portal/toc/new-toc.js";
 import { TelemetryService } from "../../../infrastructure/services/telemetry-service.js";
 import { TocCreationFailedEvent } from "../../../types/events/toc-creation-failed.js";
 import { DirectoryPath } from "../../../types/file/directoryPath.js";
 import { FlagsProvider } from "../../../types/flags-provider.js";
 import { CommandMetadata } from "../../../types/common/command-metadata.js";
+import { format, intro, outro } from "../../../prompts/format.js";
 
 const DEFAULT_WORKING_DIRECTORY = "./";
 
@@ -17,72 +18,71 @@ generation of your API documentation portal.
 The output is a YAML file with the .yml extension.
 
 To learn more about the TOC file and APIMatic build directory structure, visit:
-https://docs.apimatic.io/platform-api/#/http/guides/generating-on-prem-api-portal/overview-generating-api-portal`;
+${format.link(
+  "https://docs.apimatic.io/platform-api/#/http/guides/generating-on-prem-api-portal/overview-generating-api-portal"
+)}`;
 
   static flags = {
-    ...FlagsProvider.destination("src/content", `'toc.yml'`),
+    ...FlagsProvider.destination("src/content", `toc.yml`),
     ...FlagsProvider.input,
     ...FlagsProvider.force,
     "expand-endpoints": Flags.boolean({
       default: false,
-      description:
-        "include individual entries for each endpoint in the generated 'toc.yml'. Requires a valid API specification in the working directory."
+      description: `include individual entries for each endpoint in the generated ${format.var(
+        "toc.yml"
+      )}. Requires a valid API specification in the working directory.`
     }),
     "expand-models": Flags.boolean({
       default: false,
-      description:
-        "include individual entries for each model in the generated 'toc.yml'. Requires a valid API specification in the working directory."
+      description: `include individual entries for each model in the generated ${format.var(
+        "toc.yml"
+      )}. Requires a valid API specification in the working directory.`
     })
   };
 
+  static cmdTxt = format.cmd("apimatic", "portal", "toc", "new");
   static examples = [
-    `apimatic portal toc new --destination="./src/content/"`,
-    `apimatic portal toc new --input="./"`,
-    `apimatic portal toc new --input="./" --destination="./src/content/"`
+    `${this.cmdTxt} ${format.flag("destination", './src/content/')}`,
+    `${this.cmdTxt} ${format.flag("input", './')}`,
+    `${this.cmdTxt} ${format.flag("input", './')} ${format.flag("destination", './src/content/')}`
   ];
 
-  constructor(argv: string[], config: Config) {
-    super(argv, config);
-  }
-
   async run(): Promise<void> {
-    const { flags } = await this.parse(PortalTocNew);
+    const {
+      flags: { input, destination, force, "expand-endpoints": expandEndpoints, "expand-models": expandModels }
+    } = await this.parse(PortalTocNew);
+
+    const workingDirectory = new DirectoryPath(input ?? DEFAULT_WORKING_DIRECTORY);
+    const buildDirectory = input ? new DirectoryPath(input, "src") : workingDirectory.join("src");
+    const tocDirectory = destination ? new DirectoryPath(destination) : undefined;
+
     const commandMetadata: CommandMetadata = {
       commandName: PortalTocNew.id,
       shell: this.config.shell
     };
 
-    const telemetryService = new TelemetryService(this.getConfigDir());
-    const portalNewTocAction = new PortalNewTocAction(this.getConfigDir(), commandMetadata);
-
-    const workingDirectory = new DirectoryPath(flags.input ?? DEFAULT_WORKING_DIRECTORY);
-    const buildDirectory = flags.input ? new DirectoryPath(flags.input, "src") : workingDirectory.join("src");
-
-    let tocDirectory: DirectoryPath | undefined;
-
-    if (flags.destination) {
-      tocDirectory = new DirectoryPath(flags.destination);
-    }
-
-    const result = await portalNewTocAction.createToc(
-      buildDirectory,
-      tocDirectory,
-      flags.force,
-      flags["expand-endpoints"],
-      flags["expand-models"]
+    intro("New TOC");
+    const action = new PortalNewTocAction(new DirectoryPath(this.config.configDir), commandMetadata);
+    const result = await action.execute(buildDirectory, tocDirectory, force, expandEndpoints, expandModels);
+    outro(result);
+
+    result.mapAll(
+      () => {},
+      async () => {
+        const telemetryService = new TelemetryService(new DirectoryPath(this.config.configDir));
+        await telemetryService.trackEvent(
+          // TODO: fix Toc error message
+          new TocCreationFailedEvent("error", PortalTocNew.id, {
+            input,
+            destination,
+            force,
+            "expand-endpoints": expandEndpoints,
+            "expand-models": expandModels
+          }),
+          commandMetadata.shell
+        );
+      },
+      () => {}
     );
-
-    //TODO: Add a mapper for automatically mapping events to logger and telemetry service.
-    if (result.isFailed()) {
-      await telemetryService.trackEvent(
-        new TocCreationFailedEvent(result.error!, PortalTocNew.id, flags),
-        commandMetadata.shell
-      );
-      this.error(result.error!);
-    }
-  }
-
-  private getConfigDir(): DirectoryPath {
-    return new DirectoryPath(this.config.configDir);
   }
 }
diff --git a/src/commands/sdk/generate.ts b/src/commands/sdk/generate.ts
index 4f7350962..2bbfc47c2 100644
--- a/src/commands/sdk/generate.ts
+++ b/src/commands/sdk/generate.ts
@@ -1,45 +1,52 @@
 import { Command, Flags } from "@oclif/core";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { FlagsProvider } from "../../types/flags-provider.js";
-import { SdkGeneratePrompts } from "../../prompts/sdk/generate.js";
 import { GenerateAction } from "../../actions/sdk/generate.js";
 import { Language } from "../../types/sdk/generate.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { format, intro, outro } from "../../prompts/format.js";
 
 const DEFAULT_WORKING_DIRECTORY = "./";
 
 export default class SdkGenerate extends Command {
-  static description = "Generate an SDK for your API";
+  static readonly summary = "Generate an SDK for your API";
+
+  static readonly description = `Generate Software Development Kits (SDKs) from API specifications.
+Supports multiple programming languages including Java, C#, Python, JavaScript, and more.`;
+
+  static readonly cmdTxt = format.cmd("apimatic", "sdk", "generate");
+
   static flags = {
     language: Flags.string({
       char: "l",
       required: true,
-      options: Object.values(Language).map((p) => p.toString()),
-      description: `language for which the sdk will be generated.`
+      description: "Programming language for SDK generation",
+      options: Object.values(Language).map((p) => p.valueOf()),
     }),
     spec: Flags.string({
-      description: "path to the folder containing the API specification file.",
+      description: "Path to the folder containing the API specification file",
       default: "./src/spec"
     }),
     destination: Flags.string({
       char: "d",
-      description: `[default: ./sdk/<language>] path where the sdk will be generated.`
+      description: "Directory where the SDK will be generated"
     }),
     ...FlagsProvider.force,
     zip: Flags.boolean({
       default: false,
-      description: "download the generated SDK as a .zip archive."
+      description: "Download the generated SDK as a .zip archive"
     }),
     ...FlagsProvider.authKey
   };
 
   static examples = [
-    `apimatic sdk generate --language=java`,
-    `apimatic sdk generate --language=csharp --spec="./src/spec"`
+    `${SdkGenerate.cmdTxt} ${format.flag("language", "java")}`,
+    `${SdkGenerate.cmdTxt} ${format.flag("language", "csharp")} ${format.flag("spec", "./src/spec")}`,
+    `${SdkGenerate.cmdTxt} ${format.flag("language", "python")} ${format.flag("destination", "./sdk")} ${format.flag(
+      "zip"
+    )}`
   ];
 
-  private readonly prompts: SdkGeneratePrompts = new SdkGeneratePrompts();
-
   async run() {
     const {
       flags: { language, spec, destination, force, zip: zipSdk, "auth-key": authKey }
@@ -47,24 +54,20 @@ export default class SdkGenerate extends Command {
 
     const workingDirectory = new DirectoryPath(DEFAULT_WORKING_DIRECTORY);
     const specDirectory = new DirectoryPath(spec);
-
-    const sdkDirectory = destination ? new DirectoryPath(destination) : workingDirectory.join("sdk").join(language);
+    const sdkDirectory = destination ? new DirectoryPath(destination) : workingDirectory.join("sdk");
 
     const commandMetadata: CommandMetadata = {
       commandName: SdkGenerate.id,
       shell: this.config.shell
     };
 
-    var action = new GenerateAction(this.getConfigDir(), commandMetadata, authKey);
+    intro("Generate SDK");
+    const action = new GenerateAction(this.getConfigDir(), commandMetadata, authKey);
     const result = await action.execute(specDirectory, sdkDirectory, language as Language, force, zipSdk);
-    result.mapAll(
-      () => this.prompts.displayOutroMessage(sdkDirectory),
-      (message) => this.prompts.logError(message),
-      (message) => this.prompts.logError(message)
-    );
+    outro(result);
   }
 
-  private getConfigDir = () => {
+  private readonly getConfigDir = () => {
     return new DirectoryPath(this.config.configDir);
   };
 }
diff --git a/src/controllers/api/transform.ts b/src/controllers/api/transform.ts
deleted file mode 100644
index f0333369b..000000000
--- a/src/controllers/api/transform.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { ux } from "@oclif/core";
-import fsExtra from "fs-extra";
-
-import { writeFileUsingReadableStream } from "../../utils/utils.js";
-import {
-  DownloadTransformationParams,
-  TransformationData,
-  TransformationFormats,
-  TransformationIdParams
-} from "../../types/api/transform.js";
-import {
-  ApiResponse,
-  ContentType,
-  ExportFormats,
-  FileWrapper,
-  Transformation,
-  TransformationController,
-  TransformViaUrlRequest
-} from "@apimatic/sdk";
-
-export const getTransformationId = async (
-  { file, url, format }: TransformationIdParams,
-  transformationController: TransformationController
-): Promise<Transformation> => {
-  ux.action.start("Transforming API specification");
-
-  let generation: ApiResponse<Transformation>;
-  if (file) {
-    const fileDescriptor = new FileWrapper(fsExtra.createReadStream(file));
-    generation = await transformationController.transformViaFile(
-      ContentType.EnumMultipartformdata,
-      fileDescriptor,
-      format as ExportFormats
-    );
-  } else if (url) {
-    const body: TransformViaUrlRequest = {
-      url: url,
-      exportFormat: format as ExportFormats
-    };
-    generation = await transformationController.transformViaUrl(body);
-  } else {
-    throw new Error("Please provide a specification file");
-  }
-  ux.action.stop();
-  return generation.result;
-};
-
-export const downloadTransformationFile = async ({
-  id,
-  destinationFilePath,
-  transformationController
-}: DownloadTransformationParams): Promise<string> => {
-  ux.action.start("Downloading Transformed file");
-
-  const { result }: TransformationData = await transformationController.downloadTransformedFile(id);
-
-  if ((result as NodeJS.ReadableStream).readable) {
-    await writeFileUsingReadableStream(result as NodeJS.ReadableStream, destinationFilePath);
-  } else {
-    throw new Error("Couldn't save transformation file");
-  }
-  ux.action.stop();
-  return destinationFilePath;
-};
-// Get valid platform from user's input, convert simple platform to valid Platforms enum value
-export const getValidFormat = (format: string) => {
-  const key = Object.keys(TransformationFormats).find((value) => value === format) as
-    | keyof typeof TransformationFormats
-    | undefined;
-  if (key) {
-    const transformationFormat = TransformationFormats[key] as keyof typeof ExportFormats;
-    return ExportFormats[transformationFormat];
-  } else {
-    const formats = Object.keys(TransformationFormats).join("|");
-    throw new Error(`Please provide a valid platform, e.g. ${formats}`);
-  }
-};
diff --git a/src/controllers/api/validate.ts b/src/controllers/api/validate.ts
deleted file mode 100644
index 6351ed067..000000000
--- a/src/controllers/api/validate.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import fsExtra from "fs-extra";
-import { ApiResponse, ApiValidationExternalApisController, ApiValidationSummary, ContentType, FileWrapper } from "@apimatic/sdk";
-import { GetValidationParams } from "../../types/api/validate.js";
-import { createTempDirectory, deleteFile, zipDirectory } from "../../utils/utils.js";
-
-export const getValidationSummary = async (
-  { file, url }: GetValidationParams,
-  apiValidationController: ApiValidationExternalApisController
-): Promise<ApiValidationSummary> => {
-  let validation: ApiResponse<ApiValidationSummary>;
-
-  if (file) {
-    const fileStatus = fsExtra.statSync(file);
-    if (fileStatus.isDirectory()) {
-      const tempDir = await createTempDirectory();
-      const zipPath = await zipDirectory(file, tempDir);
-      const zipFile = new FileWrapper(fsExtra.createReadStream(zipPath));
-      validation = await apiValidationController.validateApiViaFile(ContentType.EnumMultipartformdata, zipFile);
-
-      await deleteFile(zipPath);
-
-      await fsExtra.remove(tempDir);
-    } else {
-      const fileDescriptor = new FileWrapper(fsExtra.createReadStream(file));
-      validation = await apiValidationController.validateApiViaFile(ContentType.EnumMultipartformdata, fileDescriptor);
-    }
-  } else if (url) {
-    validation = await apiValidationController.validateApiViaUrl(url);
-  } else {
-    throw new Error("Please provide a specification file");
-  }
-
-  return validation.result;
-};
diff --git a/src/hooks/not-found.ts b/src/hooks/not-found.ts
index b7d55d7ec..b2cd7a4ce 100644
--- a/src/hooks/not-found.ts
+++ b/src/hooks/not-found.ts
@@ -15,12 +15,12 @@ const hook: Hook.CommandNotFound = async function (opts) {
 
   let binHelp = `${opts.config.bin} help`;
   const idSplit = opts.id.split(":");
-  if (opts.config.findTopic(idSplit[0])) {    
+  if (opts.config.findTopic(idSplit[0])) {
     binHelp = `${binHelp} ${idSplit[0]}`;
   }
-  
+
   let suggestion: string | null;
-  if (/:?help:?/.test(opts.id)) {  
+  if (/:?help:?/.test(opts.id)) {
     suggestion = ["help", ...opts.id.split(":").filter((cmd) => cmd !== "help")].join(":");
   } else {
     suggestion = utils.closest(opts.id, commandIDs);
@@ -30,14 +30,14 @@ const hook: Hook.CommandNotFound = async function (opts) {
 
   const originalCmd = toConfiguredId(opts.id, this.config);
   this.warn(`${yellow(originalCmd)} is not a ${opts.config.bin} command.`);
-  
+
   if (!process.stdin.isTTY || !suggestion) {
     this.error(`Run ${cyan.bold(binHelp)} for a list of available commands.`, {
       exit: 127
     });
   }
 
-  let response = false;
+  let response: boolean;
   try {
     response = await utils.getConfirmation(readableSuggestion!);
   } catch {
diff --git a/src/infrastructure/api-utils.ts b/src/infrastructure/api-utils.ts
index 2849526ff..342b66808 100644
--- a/src/infrastructure/api-utils.ts
+++ b/src/infrastructure/api-utils.ts
@@ -1,7 +1,5 @@
 import axios from "axios";
-import fsExtra from "fs-extra";
-import { Result } from "../types/common/result.js";
-import { FilePath } from "../types/file/filePath.js";
+import { format as f } from "../prompts/format.js";
 
 export const enum ServiceError {
   NotFound = "NOT_FOUND",
@@ -21,7 +19,7 @@ export function getErrorMessage(error: ServiceError): string {
     case ServiceError.ServerError:
     case ServiceError.InvalidResponse:
     default:
-      return "An unexpected error occurred, please try again later. If the problem persists, please reach out to our team at support@apimatic.io";
+      return `An unexpected error occurred, please try again later. If the problem persists, please reach out to our team at ${f.var('support@apimatic.io')}`;
   }
 }
 
@@ -36,34 +34,9 @@ export function handleServiceError(error: unknown): ServiceError {
     if (error.response?.status === 500) {
       return ServiceError.ServerError;
     }
-    if (error.code === "ECONNABORTED" || error.code === "ECONNREFUSED") {
+    if (error.code === "ECONNABORTED" || error.code === "ECONNREFUSED" || error.code === "ENOTFOUND") {
       return ServiceError.NetworkError;
     }
   }
   return ServiceError.ServerError;
 }
-
-export async function validateFileInputParams(
-  file: FilePath | undefined,
-  url: string | undefined
-): Promise<Result<string, string>> {
-  if (!file && !url) {
-    return Result.failure("Please provide either a specification file or URL");
-  }
-
-  if (file && url) {
-    return Result.failure("Please provide either a file or URL, not both");
-  }
-
-  if (file) {
-    if (!(await fsExtra.pathExists(file.toString()))) {
-      return Result.failure(`Validation file: ${file} does not exist`);
-    }
-    const fileStatus = await fsExtra.stat(file.toString());
-    if (fileStatus.isDirectory()) {
-      return Result.failure("The provided path is a directory. Please provide a valid specification file.");
-    }
-  }
-
-  return Result.success("");
-}
diff --git a/src/application/portal/serve/watcher-handler.ts b/src/infrastructure/debounce-service.ts
similarity index 88%
rename from src/application/portal/serve/watcher-handler.ts
rename to src/infrastructure/debounce-service.ts
index f628764bd..3f483771b 100644
--- a/src/application/portal/serve/watcher-handler.ts
+++ b/src/infrastructure/debounce-service.ts
@@ -1,4 +1,6 @@
-export class WatcherHandler {
+import { clearTimeout, setTimeout } from "timers";
+
+export class DebounceService {
   private isProcessing = false;
   private latestHandler: (() => Promise<void>) | null = null;
   private debounceTimer: NodeJS.Timeout | null = null;
@@ -8,7 +10,7 @@ export class WatcherHandler {
     this.debounceMs = debounceMs;
   }
 
-  async execute(handler: () => Promise<void>): Promise<void> {
+  async batchSingleRequest(handler: () => Promise<void>): Promise<void> {
     // Always store the latest handler
     this.latestHandler = handler;
 
@@ -49,11 +51,11 @@ export class WatcherHandler {
   }
 
   // Method to clear any pending execution.
-  public cancel(): void {
+  public close(): void {
     if (this.debounceTimer) {
       clearTimeout(this.debounceTimer);
       this.debounceTimer = null;
     }
     this.latestHandler = null;
   }
-}
\ No newline at end of file
+}
diff --git a/src/infrastructure/file-service.ts b/src/infrastructure/file-service.ts
index d2ad66612..cd11b73ba 100644
--- a/src/infrastructure/file-service.ts
+++ b/src/infrastructure/file-service.ts
@@ -1,10 +1,12 @@
 import fs from "fs";
 import fsExtra from "fs-extra";
 import * as path from "path";
-import { FilePath } from "../types/file/filePath.js";
-import { DirectoryPath } from "../types/file/directoryPath.js";
 import { pipeline } from "stream";
 import { promisify } from "util";
+import { FilePath } from "../types/file/filePath.js";
+import { DirectoryPath } from "../types/file/directoryPath.js";
+import { Directory } from "../types/file/directory.js";
+import { FileName } from "../types/file/fileName.js";
 
 export class FileService {
   public async fileExists(file: FilePath): Promise<boolean> {
@@ -39,8 +41,20 @@ export class FileService {
     await fsExtra.emptyDir(dir.toString()); // removes everything inside, keeps the dir
   }
 
-  public async copyDirectory(source: DirectoryPath, destination: DirectoryPath) {
-    await fsExtra.copy(source.toString(), destination.toString());
+  public async createDirectoryIfNotExists(dir: DirectoryPath): Promise<void> {
+    await fsExtra.ensureDir(dir.toString());
+  }
+
+  public async getDirectory(directoryPath: DirectoryPath): Promise<Directory> {
+    const entries = await fsExtra.readdir(directoryPath.toString());
+    const results = await Promise.all(
+      entries.map(async (entry) => {
+        const fullPath = path.join(directoryPath.toString(), entry);
+        const stat = await fsExtra.stat(fullPath);
+        return stat.isDirectory() ? await this.getDirectory(new DirectoryPath(fullPath)) : new FileName(entry);
+      })
+    );
+    return new Directory(directoryPath, results);
   }
 
   public async copyDirectoryContents(source: DirectoryPath, destination: DirectoryPath) {
@@ -68,6 +82,19 @@ export class FileService {
     }
   }
 
+  public getRelativePath(filePath: FilePath, basePath: DirectoryPath): string {
+    const filePathStr = filePath.toString();
+    const basePathStr = basePath.toString();
+
+    if (filePathStr.startsWith(basePathStr)) {
+      const relativePath = filePathStr.substring(basePathStr.length).replace(/^[/\\]/, "");
+      return relativePath.replace(/\\/g, "/");
+    }
+
+    // Normalize the full path if it doesn't start with basePath
+    return filePathStr.replace(/\\/g, "/");
+  }
+
   public async getStream(filePath: FilePath) {
     return fs.createReadStream(filePath.toString());
   }
@@ -81,6 +108,10 @@ export class FileService {
     await streamPipeline(stream, writeStream);
   }
 
+  public async ensurePathExists(filePath: FilePath) {
+    await fsExtra.ensureFile(filePath.toString());
+  }
+
   public async writeContents(filePath: FilePath, contents: string) {
     await fsExtra.writeFile(filePath.toString(), contents, "utf-8");
   }
@@ -88,6 +119,21 @@ export class FileService {
   public async copy(source: FilePath, destination: FilePath) {
     await fsExtra.copyFile(source.toString(), destination.toString());
   }
+
+  public async isZipFile(filePath: FilePath): Promise<boolean> {
+    try {
+      const buffer = await fsExtra.readFile(filePath.toString());
+      return (
+        buffer.length >= 4 &&
+        buffer[0] === 0x50 && // P
+        buffer[1] === 0x4b && // K
+        buffer[2] === 0x03 && // \x03
+        buffer[3] === 0x04
+      ); // \x04
+    } catch {
+      return false;
+    }
+  }
 }
 
 const streamPipeline = promisify(pipeline);
diff --git a/src/infrastructure/launcher-service.ts b/src/infrastructure/launcher-service.ts
index 5570f8be6..d333d6b59 100644
--- a/src/infrastructure/launcher-service.ts
+++ b/src/infrastructure/launcher-service.ts
@@ -2,6 +2,8 @@ import { FilePath } from "../types/file/filePath.js";
 import { execa } from "execa";
 import os from "os";
 import { spawn } from "child_process";
+import open from "open";
+import { UrlPath } from "../types/file/urlPath.js";
 
 export class LauncherService {
 
@@ -47,4 +49,8 @@ export class LauncherService {
       // Silently ignore errors
     }
   }
+
+  public openUrlInBrowser(url: UrlPath) {
+    return open(url.toString());
+  }
 }
diff --git a/src/infrastructure/network-service.ts b/src/infrastructure/network-service.ts
new file mode 100644
index 000000000..2f0050d33
--- /dev/null
+++ b/src/infrastructure/network-service.ts
@@ -0,0 +1,7 @@
+import getPort from "get-port";
+
+export class NetworkService {
+  public async getServerPort(preferredPorts: number[]): Promise<number> {
+    return await getPort({ port: preferredPorts });
+  }
+}
diff --git a/src/infrastructure/services/api-client-factory.ts b/src/infrastructure/services/api-client-factory.ts
index 57f69eaea..15f160bb6 100644
--- a/src/infrastructure/services/api-client-factory.ts
+++ b/src/infrastructure/services/api-client-factory.ts
@@ -23,5 +23,3 @@ export class ApiClientFactory {
 }
 
 export const apiClientFactory = new ApiClientFactory();
-
-export default ApiClientFactory;
diff --git a/src/infrastructure/services/file-download-service.ts b/src/infrastructure/services/file-download-service.ts
index f7d7c814e..9e1819004 100644
--- a/src/infrastructure/services/file-download-service.ts
+++ b/src/infrastructure/services/file-download-service.ts
@@ -2,14 +2,115 @@ import axios from "axios";
 import { UrlPath } from "../../types/file/urlPath.js";
 import { err, ok, Result } from "neverthrow";
 import { handleServiceError, ServiceError } from "../api-utils.js";
+import { FileName } from "../../types/file/fileName.js";
+
+export type FileDownloadResponse = {
+  stream: NodeJS.ReadableStream;
+  filename: FileName;
+};
 
 export class FileDownloadService {
-  public async downloadFile(url: UrlPath): Promise<Result<NodeJS.ReadableStream, ServiceError>> {
+  public async downloadFile(url: UrlPath): Promise<Result<FileDownloadResponse, ServiceError>> {
     try {
-      const response = await axios.get(url.toString(), { responseType: "stream" });
-      return ok(response.data as NodeJS.ReadableStream);
+      const response = await axios.get(url.toString(), {
+        responseType: "stream"
+      });
+
+      const contentDisposition = response.headers["content-disposition"];
+      let filename: FileName | undefined;
+
+      // Try to parse filename from Content-Disposition (supports filename* as per RFC 5987 and plain filename)
+      if (contentDisposition) {
+        const parsed = this.parseFilenameFromContentDisposition(contentDisposition);
+        if (parsed) {
+          filename = new FileName(parsed);
+        }
+      }
+
+      // ... existing code ...
+      // If no filename derived from headers, fallback to URL
+      if (!filename) {
+        const fromUrl = this.getFilenameFromUrl(url.toString());
+        if (fromUrl) {
+          filename = new FileName(fromUrl);
+        } else {
+          filename = new FileName("file");
+        }
+      }
+
+      // Basic guard — responseType: "stream" should always yield a stream
+      const data = response.data as unknown;
+      const isReadableStream = data && typeof (data as NodeJS.ReadableStream).pipe === "function";
+
+      if (!isReadableStream) {
+        return err(ServiceError.InvalidResponse);
+      }
+
+      return ok({
+        stream: response.data as NodeJS.ReadableStream,
+        filename
+      });
     } catch (error: unknown) {
       return err(handleServiceError(error));
     }
   }
+
+  private parseFilenameFromContentDisposition(headerValue: string): string | null {
+    // Try RFC 5987: filename*=UTF-8''encoded%20name.ext
+    const filenameStarMatch = headerValue.match(/filename\*\s*=\s*([^']*)''([^;]+)/i); // NOSONAR - safe regex for CLI use
+    if (filenameStarMatch) {
+      const encoded = filenameStarMatch[2].trim();
+      try {
+        const decoded = decodeURIComponent(encoded);
+        return this.sanitizeFilename(decoded);
+      } catch {
+        // fall through to other strategies
+      }
+    }
+
+    // Try plain: filename="name.ext" or filename=name.ext
+    const filenameMatch = headerValue.match(/filename\s*=\s*"?([^";]+)"?/i);
+    if (filenameMatch) {
+      return this.sanitizeFilename(filenameMatch[1]);
+    }
+
+    return null;
+  }
+
+  private getFilenameFromUrl(rawUrl: string): string | null {
+    try {
+      const u = new URL(rawUrl);
+      const last = u.pathname.split("/").filter(Boolean).pop();
+      if (!last) return null;
+
+      // Remove any spurious trailing spaces and decode
+      const decoded = this.safeDecodeURIComponent(last.trim());
+      return this.sanitizeFilename(decoded);
+    } catch {
+      // Fallback for non-URL-safe strings
+      const parts = rawUrl.split("/").filter(Boolean);
+      const last = parts.pop();
+      if (!last) return null;
+      return this.sanitizeFilename(this.safeDecodeURIComponent(last));
+    }
+  }
+
+  private safeDecodeURIComponent(value: string): string {
+    try {
+      return decodeURIComponent(value);
+    } catch {
+      return value;
+    }
+  }
+
+  private sanitizeFilename(name: string): string {
+    // Replace characters not allowed in common filesystems and trim dots/spaces
+    const sanitized = name
+      .replace('/[<>:"/\\|?*\x00-\x1F]/g', "_")
+      .replace(/\s+/g, " ")
+      .trim();
+    // Avoid names that are empty or only dots/spaces
+    const safe = sanitized.replace(/^[. ]+|[. ]+$/g, ""); // NOSONAR - safe regex for CLI use
+    return safe.length > 0 ? safe : "file";
+  }
 }
diff --git a/src/infrastructure/services/portal-scaffold-service.ts b/src/infrastructure/services/portal-scaffold-service.ts
deleted file mode 100644
index 134fc0534..000000000
--- a/src/infrastructure/services/portal-scaffold-service.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { FileName } from "../../types/file/fileName.js";
-import { DirectoryPath } from "../../types/file/directoryPath.js";
-import { FileService } from "../file-service.js";
-import { err, ok, Result } from "neverthrow";
-import { ResourceContext } from "../../types/resource-context.js";
-import { BuildContext } from "../../types/build-context.js";
-import { FilePath } from "../../types/file/filePath.js";
-
-export class PortalScaffoldService {
-  private readonly fileService: FileService = new FileService();
-  private readonly zipUrl = `https://github.com/apimatic/static-portal-workflow/archive/refs/heads/master.zip`;
-  private readonly repositoryFolderName = "static-portal-workflow-master" as const;
-  private readonly defaultSpecFileName = new FileName("openapi.json");
-
-  public async createBuildDirectory(
-    tempDirectory: DirectoryPath,
-    specDirectory: DirectoryPath,
-    selectedLanguages: string[]
-  ): Promise<Result<DirectoryPath, string>> {
-    try {
-      const resourceContext = new ResourceContext(tempDirectory);
-      const result = await resourceContext.resolveTo(this.zipUrl, this.repositoryFolderName);
-      if (result.isErr()) {
-        return err("Unable to setup the portal, please try again later.");
-      }
-      const extractedFolder = result.value.join(this.repositoryFolderName);
-      await this.fileService.deleteDirectory(extractedFolder.join(".github"));
-
-      // Setup spec.
-      const tempSpecDirectory = extractedFolder.join("spec");
-      // TODO: Replace this with SpecContext
-      await this.fileService.deleteFile(new FilePath(tempSpecDirectory, this.defaultSpecFileName));
-      await this.fileService.copyDirectory(specDirectory, tempSpecDirectory);
-
-      const buildContext = new BuildContext(extractedFolder);
-      const buildFile = await buildContext.getBuildFileContents();
-      buildFile.generatePortal!.languageConfig = selectedLanguages.reduce((config, lang) => {
-        config[lang] = {};
-        return config;
-      }, {} as { [key: string]: object });
-      await buildContext.updateBuildFileContents(buildFile);
-
-      return ok(extractedFolder);
-    } catch {
-      return err(
-        "There was an error setting up your portal. Please try again later. If the problem persists, please reach out to our team at support@apimatic.io "
-      );
-    }
-  }
-}
diff --git a/src/infrastructure/services/portal-service.ts b/src/infrastructure/services/portal-service.ts
index 1849d6a14..b88eb1a70 100644
--- a/src/infrastructure/services/portal-service.ts
+++ b/src/infrastructure/services/portal-service.ts
@@ -1,24 +1,23 @@
 import { ReadStream } from "fs";
 import {
+  Accept,
+  ApiError,
+  ApiResponse,
+  BadRequestResponseSdkError,
+  CodeGenerationExternalApisController,
   ContentType,
   DocsPortalManagementController,
   UnauthorizedResponseError,
   ProblemDetailsError,
   FileWrapper,
-  ApiResponse,
-  ApiError,
   TransformationController,
   Transformation,
   ExportFormats,
   InternalServerErrorResponseError,
-  CodeGenerationExternalApisController,
-  Platforms,
-  BadRequestResponseSdkError,
-  Accept
+  Platforms
 } from "@apimatic/sdk";
 import { AuthInfo, getAuthInfo } from "../../client-utils/auth-manager.js";
-import { Result } from "../../types/common/result.js";
-import { getMessageInRedColor, parseStreamBodyToJson } from "../../utils/utils.js";
+import { parseStreamBodyToJson } from "../../utils/utils.js";
 import { TransformationData } from "../../types/api/transform.js";
 import { Sdl } from "../../types/sdl/sdl.js";
 import { FilePath } from "../../types/file/filePath.js";
@@ -26,12 +25,15 @@ import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { FileService } from "../file-service.js";
 import { apiClientFactory } from "./api-client-factory.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
+import { err, ok, Result } from "neverthrow";
+import { Language } from "../../types/sdk/generate.js";
+import { handleServiceError, ServiceError } from "../api-utils.js";
 
 export class PortalService {
   private readonly CONTENT_TYPE = ContentType.EnumMultipartformdata;
   private readonly fileService = new FileService();
 
-  //TODO: Pass stream as parameter instead of file path.
+  // TODO: Pass stream as parameter instead of file path.
   public async generatePortal(
     buildPath: FilePath,
     configDir: DirectoryPath,
@@ -51,18 +53,18 @@ export class PortalService {
         file,
         this.createOriginQueryParameter(eventMetadata.commandName)
       );
-      return Result.success(response.result as NodeJS.ReadableStream);
+      return ok(response.result as NodeJS.ReadableStream);
     } catch (error) {
-      return Result.failure(await this.handlePortalGenerationErrors(error));
+      return err(await PortalService.handlePortalGenerationErrors(error));
     } finally {
       buildFileStream.close();
     }
   }
 
-  //TODO: Pass stream as parameter instead of file path.
+  // TODO: Pass stream as parameter instead of file path.
   public async generateSdk(
     specPath: FilePath,
-    sdkPlatform: Platforms,
+    language: Language,
     configDir: DirectoryPath,
     commandMetadata: CommandMetadata,
     authKey: string | null
@@ -78,13 +80,13 @@ export class PortalService {
       const response = await sdkGenerationController.generateSdkViaFile(
         Accept.EnumApplicationjson,
         file,
-        sdkPlatform,
+        this.languagePlatform[language],
         this.createOriginQueryParameter(commandMetadata.commandName)
       );
       const sdkResponse = await sdkGenerationController.downloadSdk(response.result.id);
-      return Result.success(sdkResponse.result as NodeJS.ReadableStream);
+      return ok(sdkResponse.result as NodeJS.ReadableStream);
     } catch (error) {
-      return Result.failure(await this.handleSdkGenerationErrors(error));
+      return err(await this.handleSdkGenerationErrors(error));
     } finally {
       specFileStream.close();
     }
@@ -94,7 +96,7 @@ export class PortalService {
     specFileStream: ReadStream,
     configDir: DirectoryPath,
     commandMetadata: CommandMetadata
-  ): Promise<Result<Sdl, string>> {
+  ): Promise<Result<Sdl, ServiceError>> {
     const file = new FileWrapper(specFileStream);
     const authInfo: AuthInfo | null = await getAuthInfo(configDir.toString());
     const authorizationHeader = this.createAuthorizationHeader(authInfo, null);
@@ -110,25 +112,21 @@ export class PortalService {
       );
 
       if (!generation.result.success) {
-        return this.createGenericErrorResult();
+        return err(ServiceError.InvalidResponse);
       }
 
       const transformationId = generation.result.id;
       const { result }: TransformationData = await transformationController.downloadTransformedFile(transformationId);
       if ((result as NodeJS.ReadableStream).readable) {
-        return Result.success((await parseStreamBodyToJson(result as NodeJS.ReadableStream)) as Sdl);
+        return ok((await parseStreamBodyToJson(result as NodeJS.ReadableStream)) as Sdl);
       } else {
-        return this.createGenericErrorResult();
+        return err(ServiceError.InvalidResponse);
       }
-    } catch {
-      return this.createGenericErrorResult();
+    } catch (error) {
+      return err(handleServiceError(error));
     }
   }
 
-  private createGenericErrorResult() {
-    return Result.failure<Sdl, string>("An unexpected error occurred");
-  }
-
   private createAuthorizationHeader = (authInfo: AuthInfo | null, overrideAuthKey: string | null): string => {
     const key = overrideAuthKey || authInfo?.authKey;
     return `X-Auth-Key ${key ?? ""}`;
@@ -140,33 +138,46 @@ export class PortalService {
     };
   };
 
-  private handlePortalGenerationErrors = async (error: unknown): Promise<string | NodeJS.ReadableStream> => {
+  private static handlePortalGenerationErrors = async (error: unknown): Promise<string | NodeJS.ReadableStream> => {
     if (error instanceof UnauthorizedResponseError) {
-      //401
-      const unAuthError = error as UnauthorizedResponseError;
-      return getMessageInRedColor(unAuthError.result?.message ?? "Authorization has been denied for this request.");
-    } else if (error instanceof ProblemDetailsError) {
-      //400 & 403
+      // 401
+      return error.result?.message ?? "Authorization has been denied for this request.";
+    }
+    if (error instanceof ProblemDetailsError) {
+      // 400 & 403
       const probDetailsError = error as ProblemDetailsError;
       const message = Object.values(probDetailsError.result!.errors as Record<string, string[]>)[0]?.[0] ?? null;
-      return getMessageInRedColor(probDetailsError.result!.title + "\n- " + message);
-    } else if (error instanceof ApiError && error.statusCode === 422) {
-      //422
+      return error.result!.title + "\n- " + message;
+    }
+    if (error instanceof ApiError && error.statusCode === 422) {
+      // 422
       return error.body as NodeJS.ReadableStream;
-    } else if (error instanceof InternalServerErrorResponseError) {
-      //500
-      const internalServerError = error as InternalServerErrorResponseError;
-      const message = internalServerError.result?.message;
-      return getMessageInRedColor(
-        `${
-          message ?? "An unkown error occurred."
-        } Please try again later or reach out to our team at support@apimatic.io for help if your problem persists.`
-      );
-    } else {
-      return getMessageInRedColor(
-        "An unexpected error occurred while generating the portal, please try again later. If the problem persists, please reach out to our team at support@apimatic.io"
-      );
     }
+    if (error instanceof InternalServerErrorResponseError) {
+      // 422
+      const message = error.result?.message;
+      return `${
+        message ?? "An unknown error occurred."
+      } Please try again later or reach out to our team at support@apimatic.io for help if your problem persists.`;
+    }
+    return "An unexpected error occurred while generating the portal, please try again later. If the problem persists, please reach out to our team at support@apimatic.io";
+  };
+
+  private handleSdkGenerationErrors = async (error: unknown): Promise<string> => {
+    if (error instanceof BadRequestResponseSdkError) {
+      //400
+      return this.parseBadRequestResponse(error.result?.message);
+    }
+    if (error instanceof UnauthorizedResponseError) {
+      //401
+      return error.result?.message ?? "Authorization has been denied for this request.";
+    }
+    if (error instanceof ProblemDetailsError) {
+      // 403
+      const message = (error.result!.errors as Record<string, string[]>)?.[""]?.[0];
+      return error.result!.title + "\n- " + message;
+    }
+    return "An unexpected error occurred while generating the portal, please try again later. If the problem persists, please reach out to our team at support@apimatic.io";
   };
 
   private parseBadRequestResponse(errorMessage: string | undefined): string {
@@ -177,38 +188,25 @@ export class PortalService {
     // Parse the JSON string
     const parsedResult = JSON.parse(errorMessage);
 
-    // Check if it has the expected structure with Errors array
+    // Check if it has the expected structure with Errors
     if (parsedResult.Errors && Array.isArray(parsedResult.Errors) && parsedResult.Errors.length > 0) {
       // Get the first error and clean it up
-      const firstError = parsedResult.Errors[0];
-      // Split on <br/> and take first part, then strip remaining HTML tags
-      const cleanError = firstError.split("<br/>")[0].replace(/<[^<>]*?>/g, "");
-      return cleanError;
+      return parsedResult.Errors[0].split(".")[0] + ".";
+      // Split on <br/> and take the first part, then strip remaining HTML tags
+      // return firstError.split("<br/>")[0].replace(/<[^<>]*?>/g, "");
     } else if (parsedResult.Success === false) {
       return "API definition file validation failed.";
     }
     return errorMessage;
   }
 
-  private handleSdkGenerationErrors = async (error: unknown): Promise<string> => {
-    if (error instanceof BadRequestResponseSdkError) {
-      //400
-      const badRequestError = error as BadRequestResponseSdkError;
-      const errorMessage = this.parseBadRequestResponse(badRequestError.result?.message);
-      return getMessageInRedColor(errorMessage);
-    } else if (error instanceof UnauthorizedResponseError) {
-      //401
-      const unAuthError = error as UnauthorizedResponseError;
-      return getMessageInRedColor(unAuthError.result?.message ?? "Authorization has been denied for this request.");
-    } else if (error instanceof ProblemDetailsError) {
-      // 403
-      const probDetailsError = error as ProblemDetailsError;
-      const message = (probDetailsError.result!.errors as Record<string, string[]>)?.[""]?.[0];
-      return getMessageInRedColor(probDetailsError.result!.title + "\n- " + message);
-    } else {
-      return getMessageInRedColor(
-        "An unexpected error occurred while generating the SDK, please try again later. If the problem persists, please reach out to our team at support@apimatic.io"
-      );
-    }
+  private readonly languagePlatform: Record<Language, Platforms> = {
+    [Language.CSHARP]: Platforms.CsNetStandardLib,
+    [Language.JAVA]: Platforms.JavaEclipseJreLib,
+    [Language.PHP]: Platforms.PhpGenericLibV2,
+    [Language.PYTHON]: Platforms.PythonGenericLib,
+    [Language.RUBY]: Platforms.RubyGenericLib,
+    [Language.TYPESCRIPT]: Platforms.TsGenericLib,
+    [Language.GO]: Platforms.GoGenericLib
   };
 }
diff --git a/src/infrastructure/services/transform-service.ts b/src/infrastructure/services/transformation-service.ts
similarity index 65%
rename from src/infrastructure/services/transform-service.ts
rename to src/infrastructure/services/transformation-service.ts
index 6dac3e51d..677aa186a 100644
--- a/src/infrastructure/services/transform-service.ts
+++ b/src/infrastructure/services/transformation-service.ts
@@ -12,23 +12,15 @@ import {
 
 import { AuthInfo, getAuthInfo } from "../../client-utils/auth-manager.js";
 import { TransformationData } from "../../types/api/transform.js";
-import { Result } from "../../types/common/result.js";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { apiClientFactory } from "./api-client-factory.js";
 import { FilePath } from "../../types/file/filePath.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
-
-export interface TransformViaUrlParams {
-  url: string;
-  format: string;
-  configDir: DirectoryPath;
-  commandMetadata: CommandMetadata;
-  authKey?: string | null;
-}
+import { err, ok, Result} from "neverthrow";
 
 export interface TransformViaFileParams {
   file: FilePath;
-  format: string;
+  format: ExportFormats;
   configDir: DirectoryPath;
   commandMetadata: CommandMetadata;
   authKey?: string | null;
@@ -42,39 +34,7 @@ export interface TransformationResultData {
 export class TransformationService {
   private readonly CONTENT_TYPE = ContentType.EnumMultipartformdata;
 
-  //TODO: we can remove this endpoint and use the transformViaFile in case url is given. We can download the file within the CLI from the url and pass it to the transformViaFile endpoint
-  async transformViaUrl({
-    url,
-    format,
-    configDir,
-    commandMetadata,
-    authKey
-  }: TransformViaUrlParams): Promise<Result<TransformationResultData, string>> {
-    const authInfo: AuthInfo | null = await getAuthInfo(configDir.toString());
-    const authorizationHeader = this.createAuthorizationHeader(authInfo, authKey ?? null);
-    const client = apiClientFactory.createApiClient(authorizationHeader, commandMetadata.shell);
-    const transformationController = new TransformationController(client);
-
-    try {
-      //TODO: Update spec to include origin query parameter.
-      const generation: ApiResponse<Transformation> = await transformationController.transformViaUrl({
-        url: url,
-        exportFormat: format as ExportFormats
-      });
-
-      const { id, apiValidationSummary } = generation.result;
-      const { result }: TransformationData = await transformationController.downloadTransformedFile(id);
-
-      return Result.success({
-        stream: result as NodeJS.ReadableStream,
-        apiValidationSummary
-      });
-    } catch (error) {
-      return Result.failure(await this.handleTransformationErrors(error));
-    }
-  }
-
-  async transformViaFile({
+  public async transformViaFile({
     file,
     format,
     configDir,
@@ -99,12 +59,12 @@ export class TransformationService {
       const { id, apiValidationSummary } = generation.result;
       const { result }: TransformationData = await transformationController.downloadTransformedFile(id);
 
-      return Result.success({
+      return ok({
         stream: result as NodeJS.ReadableStream,
         apiValidationSummary
       });
     } catch (error) {
-      return Result.failure(await this.handleTransformationErrors(error));
+      return err(await this.handleTransformationErrors(error));
     }
   }
 
@@ -113,7 +73,7 @@ export class TransformationService {
     return `X-Auth-Key ${key ?? ""}`;
   }
 
-  private createOriginQueryParameter = (commandName: string): Record<string, string> => {
+  private readonly createOriginQueryParameter = (commandName: string): Record<string, string> => {
     return {
       origin: `APIMATIC CLI ${commandName}`
     };
diff --git a/src/infrastructure/services/validation-service.ts b/src/infrastructure/services/validation-service.ts
index 405a07144..0df814c22 100644
--- a/src/infrastructure/services/validation-service.ts
+++ b/src/infrastructure/services/validation-service.ts
@@ -11,33 +11,27 @@ import {
 import { DirectoryPath } from "../../types/file/directoryPath.js";
 import { AuthInfo, getAuthInfo } from "../../client-utils/auth-manager.js";
 import { apiClientFactory } from "./api-client-factory.js";
-import { Result } from "../../types/common/result.js";
+import { err, ok, Result } from "neverthrow";
 import { FilePath } from "../../types/file/filePath.js";
 import { CommandMetadata } from "../../types/common/command-metadata.js";
 
 export interface ValidateViaFileParams {
   file: FilePath;
-  authKey?: string | null;
-}
-
-export interface ValidateViaUrlParams {
-  url: string;
+  commandMetadata: CommandMetadata;
   authKey?: string | null;
 }
 
 export class ValidationService {
-  private readonly configDirectory: DirectoryPath;
-  private readonly commandMetadata: CommandMetadata;
+  constructor(private readonly configDir: DirectoryPath) {}
 
-  constructor(configDirectory: DirectoryPath, commandMetadata: CommandMetadata) {
-    this.configDirectory = configDirectory;
-    this.commandMetadata = commandMetadata;
-  }
-
-  async validateViaFile({ file, authKey }: ValidateViaFileParams): Promise<Result<ApiValidationSummary, string>> {
-    const authInfo: AuthInfo | null = await getAuthInfo(this.configDirectory.toString());
+  async validateViaFile({
+    file,
+    commandMetadata,
+    authKey
+  }: ValidateViaFileParams): Promise<Result<ApiValidationSummary, string>> {
+    const authInfo: AuthInfo | null = await getAuthInfo(this.configDir.toString());
     const authorizationHeader = this.createAuthorizationHeader(authInfo, authKey ?? null);
-    const client = apiClientFactory.createApiClient(authorizationHeader, this.commandMetadata.shell);
+    const client = apiClientFactory.createApiClient(authorizationHeader, commandMetadata.shell);
     const controller = new ApiValidationExternalApisController(client);
 
     try {
@@ -48,24 +42,9 @@ export class ValidationService {
         fileDescriptor
       );
 
-      return Result.success(validation.result as ApiValidationSummary);
-    } catch (error) {
-      return Result.failure(await this.handleValidationErrors(error));
-    }
-  }
-
-  async validateViaUrl({ url, authKey }: ValidateViaUrlParams): Promise<Result<ApiValidationSummary, string>> {
-    const authInfo: AuthInfo | null = await getAuthInfo(this.configDirectory.toString());
-    const authorizationHeader = this.createAuthorizationHeader(authInfo, authKey ?? null);
-    const client = apiClientFactory.createApiClient(authorizationHeader, this.commandMetadata.shell);
-    const controller = new ApiValidationExternalApisController(client);
-
-    try {
-      //TODO: Update spec to include origin query parameter.
-      const validation: ApiResponse<ApiValidationSummary> = await controller.validateApiViaUrl(url);
-      return Result.success(validation.result as ApiValidationSummary);
+      return ok(validation.result as ApiValidationSummary);
     } catch (error) {
-      return Result.failure(await this.handleValidationErrors(error));
+      return err(await this.handleValidationErrors(error));
     }
   }
 
@@ -79,7 +58,7 @@ export class ValidationService {
       const apiError = error as ApiError;
 
       if (apiError.statusCode === 400) {
-        return "Your API Definition is invalid. Please check the errors and try again.";
+        return "Your API Definition is invalid. Please fix the issues and try again.";
       } else if (apiError.statusCode === 401) {
         return "You are not authorized to perform this action. Please run 'auth:login' or provide a valid auth key.";
       } else if (apiError.statusCode === 403) {
diff --git a/src/prompts/api/transform.ts b/src/prompts/api/transform.ts
index 984bcac50..2472bf475 100644
--- a/src/prompts/api/transform.ts
+++ b/src/prompts/api/transform.ts
@@ -1,27 +1,39 @@
-import { outro, spinner, log } from "@clack/prompts";
-import { getMessageInMagentaColor, getMessageInCyanColor, getMessageInRedColor } from "../../utils/utils.js";
+import { log, isCancel, confirm } from "@clack/prompts";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
+import { format as f, withSpinner } from "../format.js";
+import { Result } from "neverthrow";
+import { TransformationResultData } from "../../infrastructure/services/transformation-service.js";
+import { getErrorMessage, ServiceError } from "../../infrastructure/api-utils.js";
 
 export class ApiTransformPrompts {
-  private readonly spin = spinner();
+  public async overwriteApi(directory: DirectoryPath): Promise<boolean> {
+    const overwrite = await confirm({
+      message: `A specification file already exists at ${f.path(directory)}. Do you want to overwrite the existing file?`,
+      initialValue: false
+    });
 
-  displayApiTransformationMessage(): void {
-    this.spin.start(getMessageInMagentaColor("Transforming API"));
-  }
+    if (isCancel(overwrite)) {
+      return false;
+    }
 
-  displayApiTransformationSuccessMessage(): void {
-    this.spin.stop(getMessageInCyanColor(`API transformed successfully`));
+    return overwrite;
   }
 
-  displayApiTransformationFailureMessage(): void {
-    this.spin.stop(getMessageInRedColor("API transformation failed"));
+  public transformedApiAlreadyExists() {
+    const message = `Specification already exists.`;
+    log.error(message);
   }
 
-  displayOutroMessage(transformedApiPath: DirectoryPath): void {
-    outro(`The transformed API specification can be found at ${transformedApiPath}`);
+  public async transformApi(fn: Promise<Result<TransformationResultData, string>>) {
+    return withSpinner("Transforming API", "API transformed successfully.", "API transformation failed.", fn);
   }
 
-   logError(error: string): void {
+  logTransformationError(error: string): void {
     log.error(error);
   }
+
+  public networkError(serviceError: ServiceError): void {
+    const message = getErrorMessage(serviceError);
+    log.error(message);
+  }
 }
diff --git a/src/prompts/api/validate.ts b/src/prompts/api/validate.ts
index 5d6840b4f..2eeaf62b3 100644
--- a/src/prompts/api/validate.ts
+++ b/src/prompts/api/validate.ts
@@ -1,41 +1,49 @@
-import { outro, spinner, log } from "@clack/prompts";
-import { getMessageInCyanColor, getMessageInGreenColor, getMessageInRedColor, replaceHTML } from "../../utils/utils.js";
+import { log } from "@clack/prompts";
+import { replaceHTML } from "../../utils/utils.js";
 import { ValidationMessages } from "../../types/utils.js";
+import { Result } from "neverthrow";
+import { withSpinner } from "../format.js";
+import { ApiValidationSummary } from "@apimatic/sdk";
+import { getErrorMessage, ServiceError } from "../../infrastructure/api-utils.js";
+import { FilePath } from "../../types/file/filePath.js";
+import { format as f } from "../format.js";
 
 export class ApiValidatePrompts {
-  private readonly spin = spinner();
-
-  displayValidationStartMessage(): void {
-    this.spin.start(getMessageInCyanColor("🔍 Validating specification file..."));
-  }
-
-  displayValidationSuccessMessage(): void {
-    this.spin.stop(getMessageInGreenColor("Specification file provided is valid"));
-  }
-
-  displayValidationFailureMessage(): void {
-    this.spin.stop(getMessageInRedColor("Specification validation failed"));
+  public async validateApi(fn: Promise<Result<ApiValidationSummary, string>>) {
+    return withSpinner("Validating API", "API validation completed", "API validation failed", fn);
   }
 
   displayValidationMessages({ warnings, errors, messages }: ValidationMessages): void {
-    const singleError: string = errors.join("\n") || "";
-
-    messages.forEach((message) => {
-      log.message(getMessageInCyanColor(`ℹ️ ${replaceHTML(message)}`));
-    });
-    warnings.forEach((warning) => {
-      log.warn(`⚠️ ${replaceHTML(warning)}`);
-    });
+    if (messages.length > 0) {
+      log.info("Messages");
+      messages.forEach((msg) => {
+        log.message(`${replaceHTML(msg)}`);
+      });
+    }
+    if (warnings.length > 0) {
+      log.warning("Warnings");
+      warnings.forEach((war) => {
+        log.message(`${replaceHTML(war)}`);
+      });
+    }
     if (errors.length > 0) {
-      log.error(getMessageInRedColor(`❌ ${replaceHTML(singleError)}`));
+      log.error("Errors");
+      errors.forEach((err) => {
+        log.message(`${replaceHTML(err)}`);
+      });
     }
   }
 
-  displayOutroMessage(): void {
-    outro("Validation complete");
+  logValidationError(error: string): void {
+    log.error(error);
+  }
+
+  public networkError(serviceError: ServiceError): void {
+    const message = getErrorMessage(serviceError);
+    log.error(message);
   }
 
-  logError(error: string): void {
-    log.error(error);
+  public transformedApiSaved(filePath: FilePath): void {
+    log.info(`Transformed API has been saved to ${f.path(filePath)}.`);
   }
 }
diff --git a/src/prompts/auth/login.ts b/src/prompts/auth/login.ts
index 79ef7271a..1fe5bdb03 100644
--- a/src/prompts/auth/login.ts
+++ b/src/prompts/auth/login.ts
@@ -1,15 +1,34 @@
 import { log } from "@clack/prompts";
+import { getErrorMessage, ServiceError } from "../../infrastructure/api-utils.js";
+import { SubscriptionInfo } from "../../types/api/account.js";
+import { Result } from "neverthrow";
+import { withSpinner } from "../format.js";
 
 export class LoginPrompts {
-  logError(error: string) {
-    log.error(error);
-  }
-
-  loginSuccessful(email: string) {
+  public loginSuccessful(email: string) {
     log.success(`Successfully logged in as ${email}`);
   }
 
-  openBrowser() {
+  public openBrowser() {
     log.info("Please continue with authentication in the opened browser window.");
   }
+
+  public invalidKeyProvided(serviceError: ServiceError) {
+    const message =
+      serviceError === ServiceError.NetworkError ? "Invalid API key provided." : getErrorMessage(serviceError);
+    log.error(message);
+  }
+
+  public loginTimeout() {
+    log.error("Authentication timed out. Please try again.");
+  }
+
+  public accountInfoSpinner(fn: Promise<Result<SubscriptionInfo, ServiceError>>) {
+    return withSpinner(
+      "Retrieving your subscription info",
+      "Retrieved subscription info",
+      "Error retrieving subscription info",
+      fn
+    );
+  }
 }
diff --git a/src/prompts/auth/logout.ts b/src/prompts/auth/logout.ts
new file mode 100644
index 000000000..8646f428f
--- /dev/null
+++ b/src/prompts/auth/logout.ts
@@ -0,0 +1,9 @@
+import { log } from "@clack/prompts";
+
+
+export class LogoutPrompts {
+
+  public removeAuthInfo() {
+    log.info("Logged out successfully.");
+  }
+}
diff --git a/src/prompts/auth/status.ts b/src/prompts/auth/status.ts
new file mode 100644
index 000000000..eb3d08282
--- /dev/null
+++ b/src/prompts/auth/status.ts
@@ -0,0 +1,31 @@
+import { Result } from "neverthrow";
+import { SubscriptionInfo } from "../../types/api/account.js";
+import { getErrorMessage, ServiceError } from "../../infrastructure/api-utils.js";
+import { format, withSpinner } from "../format.js";
+import { log } from "@clack/prompts";
+import { mapLanguages } from "../../types/sdk/generate.js";
+
+export class StatusPrompts {
+  public accountInfoSpinner(fn: Promise<Result<SubscriptionInfo, ServiceError>>) {
+    return withSpinner(
+      "Retrieving your subscription info",
+      "Retrieved subscription info",
+      "Error retrieving subscription info",
+      fn
+    );
+  }
+
+  public invalidKeyProvided(serviceError: ServiceError) {
+    const message =
+      serviceError === ServiceError.UnAuthorized ? "Invalid API key provided." : getErrorMessage(serviceError);
+    log.error(message);
+  }
+
+  public showAccountInfo(info: SubscriptionInfo) {
+    const languages = mapLanguages(info.allowedLanguages);
+    const message = `Account Information:
+  Email: ${format.var(info.Email)}
+  Allowed Languages: ${languages.map((language) => format.var(language)).join(", ")}`;
+    log.info(`${message}`);
+  }
+}
diff --git a/src/prompts/format.ts b/src/prompts/format.ts
new file mode 100644
index 000000000..ede60b370
--- /dev/null
+++ b/src/prompts/format.ts
@@ -0,0 +1,143 @@
+import pc from "picocolors";
+import { Result } from "neverthrow";
+import { intro as i, outro as o, spinner } from '@clack/prompts';
+import { ActionResult } from "../actions/action-result.js";
+import { Directory } from "../types/file/directory.js";
+import { DirectoryPath } from "../types/file/directoryPath.js";
+import { FilePath } from "../types/file/filePath.js";
+
+export const format = {
+  // Core element types
+  var: (text: string) => pc.magenta(`'${text}'`),
+  path: (text: DirectoryPath | FilePath) => pc.cyan(`'${text}'`),
+  cmd: (cmd: string, ...args: string[]) => `${pc.blueBright(cmd)} ${args.map(arg => pc.dim(arg)).join(" ")}`,
+  cmdAlt: (cmd: string, ...args: string[]) => `${pc.blueBright(cmd)} ${args.map(arg => pc.blueBright(arg)).join(" ")}`,
+  link: (text: string) => pc.underline(pc.blueBright(text)),
+  description: (text: string) => pc.greenBright(`${text}`),
+  flag: (name: string, value: string | undefined = undefined) => {
+    if (value) {
+      return `${pc.green(`--${name}`)}=${pc.dim(value)}`;
+    }
+    return `${pc.green(`--${name}`)}`;
+  },
+
+  // Common message styles
+  success: (text: string) => pc.green(text),
+  error: (text: string) => pc.red(text),
+  info: (text: string) => pc.cyan(text),
+
+  intro: (text: string) => pc.bgCyan(text),
+  outroSuccess: (text: string) => pc.bgGreen(text),
+  outroFailure: (text: string) => pc.bgRed(text),
+  outroCancelled: (text: string) => pc.bgWhite(pc.blackBright(text)),
+};
+
+export function intro(text: string) {
+  i(format.intro(` ${text} `));
+}
+
+export function outro(result: ActionResult) {
+  const exitCode = result.getExitCode();
+  const message = result.getMessage();
+  const outroMessage = result.mapAll(
+    () => format.outroSuccess(message),
+    () => format.outroFailure(message),
+    () => format.outroCancelled(message)
+  );
+  o(outroMessage);
+  process.exitCode = exitCode;
+}
+
+export async function withSpinner<T, E>(intro: string, success: string, failure: string, fn: Promise<Result<T, E>>) {
+  const s = spinner({
+    cancelMessage: "cancelled",
+    errorMessage: "failed",
+    frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'],
+  });
+  s.start(intro);
+  const result = await fn;
+  result.match(
+    () => s.stop(success, 0),
+    () => s.stop(failure, 1)
+  );
+  return result;
+}
+
+export function getDirectoryTree(dir: Directory, prefix: string = "", isLast: boolean = true): string {
+  const folderDescription: Record<string, string> = {
+    spec: "# Contains all API definition files",
+    content: "# Includes custom documentation pages in Markdown",
+    static: "# Includes all static files, such as images, GIFs, and PDFs"
+  };
+
+  const fileDescriptions: Record<string, string> = {
+    "toc.yml": "# Controls the structure of the side navigation bar in the API portal",
+    "APIMATIC-BUILD.json": "# Defines all configurations for the API portal, including programming languages and themes"
+  };
+
+  const pointer = isLast ? "└─ " : "├─ ";
+  const folderName = dir.directoryPath.leafName();
+  const description = folderDescription[folderName] ? format.description(folderDescription[folderName]) : "";
+  let output = `${prefix}${pointer}${folderName}${description ? " " + description : ""}\n`;
+
+  const items = dir.items;
+  const newPrefix = prefix + (isLast ? "   " : "|  ");
+
+  items.forEach((item, index) => {
+    const last = index === items.length - 1;
+
+    if (item instanceof Directory) {
+      output += getDirectoryTree(item, newPrefix, last);
+    } else {
+      const filePointer = last ? "└─ " : "├─ ";
+      const fileName = item.toString();
+      const fileDescription = fileDescriptions[fileName] ? format.description(fileDescriptions[fileName]) : "";
+      output += `${newPrefix}${filePointer}${fileName}${fileDescription ? " " + fileDescription : ""}\n`;
+    }
+  });
+
+  return output;
+}
+
+
+export interface LeafNode {
+  name: string;
+  description?: string;
+}
+
+export interface TreeNode extends LeafNode {
+  items: Array<TreeNode | LeafNode>;
+}
+
+
+export function getTree(
+  dir: TreeNode,
+  prefix: string = "",
+  isLast: boolean = true
+): string {
+  const pointer = isLast ? "└─ " : "├─ ";
+  const folderName = dir.name;
+  const description = dir.description ? format.description(dir.description) : "";
+
+  let output = `${prefix}${pointer}${folderName}${description ? " " + description : ""}\n`;
+
+  const items = dir.items;
+  const newPrefix = prefix + (isLast ? "   " : "|  ");
+
+  items.forEach((item, index) => {
+    const last = index === items.length - 1;
+
+    if ('items' in item) {
+      output += getTree(item as TreeNode, newPrefix, last);
+    } else {
+      const filePointer = last ? "└─ " : "├─ ";
+      const fileName = item.name;
+      const fileDescription = item.description ? format.description(item.description) : "";
+      output += `${newPrefix}${filePointer}${fileName}${fileDescription ? " " + fileDescription : ""}\n`;
+    }
+  });
+
+  return output;
+}
+
+
diff --git a/src/prompts/portal/common/base-prompts.ts b/src/prompts/portal/common/base-prompts.ts
deleted file mode 100644
index b0e374ab5..000000000
--- a/src/prompts/portal/common/base-prompts.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { log, spinner } from "@clack/prompts";
-
-export abstract class BasePrompts {
-  protected readonly spin = spinner();
-
-  public startProgressIndicator(message: string): void {
-    this.spin.start(message);
-  }
-
-  public stopProgressIndicator(message: string, statusCode?: number): void {
-    this.spin.stop(message, statusCode);
-  }
-
-  public displayInfo(message: string): void {
-    log.step(message);
-  }
-
-  public displaySuccess(message: string): void {
-    log.success(message);
-  }
-
-  public logError(errorMessage: string): void {
-    log.error(errorMessage);
-  }
-}
diff --git a/src/prompts/portal/copilot.ts b/src/prompts/portal/copilot.ts
index cb8cb0251..cd25b94a1 100644
--- a/src/prompts/portal/copilot.ts
+++ b/src/prompts/portal/copilot.ts
@@ -1,16 +1,21 @@
-import { confirm, isCancel, log, outro, select, spinner } from "@clack/prompts";
-import { getMessageInCyanColor } from "../../utils/utils.js";
+import { confirm, isCancel, log, note, select } from "@clack/prompts";
 import { Result } from "neverthrow";
 import { SubscriptionInfo } from "../../types/api/account.js";
-import { ServiceError } from "../../infrastructure/api-utils.js";
+import { getErrorMessage, ServiceError } from "../../infrastructure/api-utils.js";
+import { DirectoryPath } from "../../types/file/directoryPath.js";
+import { format as f, withSpinner } from "../format.js";
 
 export class PortalCopilotPrompts {
+  public async displayApiCopilotKeyUsageWarning() {
+    log.warn(
+      "API Copilot can only be active on one Portal at a time. Configuring it on this Portal will disable it on any previously configured Portal."
+    );
+  }
+
   public openWelcomeMessageEditor() {
     log.step("Opening markdown editor for you to enter welcome message in...");
   }
-  public async displayApiCopilotKeyUsageWarning() {
-      log.warn('API Copilot can only be active on one Portal at a time. Configuring it on this Portal will disable it on any previously configured Portal.')
-  }
+
   public async selectCopilotKey(keys: string[]): Promise<string | null> {
     const selectedKey = await select({
       message: "Select the ID for the API Copilot you would like to add to this API Portal:",
@@ -29,17 +34,25 @@ export class PortalCopilotPrompts {
   }
 
   public copilotConfigured(status: boolean, copilotId: string): void {
-    outro(
+    log.info(
       `API Copilot configured successfully!
 
-    Copilot ID: ${getMessageInCyanColor(copilotId)}
-    Status: ${getMessageInCyanColor(status ? "Enabled" : "Disabled")}
+    Copilot ID: ${f.var(copilotId)}
+    Status: ${f.var(status ? "Enabled" : "Disabled")}
 
-  Configuration saved to: APIMATIC-BUILD.json
+  Configuration saved to: ${f.var("APIMATIC-BUILD.json")}`
+    );
 
-API Copilot will index your content the next time you run \`apimatic portal generate\` or \`apimatic portal serve\`. This process can take up to 10 minutes, depending on your API’s size.
+    note(
+      `API Copilot will index your content the next time you run
+'${f.cmdAlt("apimatic", "portal", "generate")}' or '${f.cmdAlt("apimatic", "portal", "serve")}'.
+This process can take up to 10 minutes, depending on your API’s size.
 
-To see your copilot: If your portal is already running, refresh the page. Otherwise, run \`apimatic portal serve\`, select any programming language in the Portal and look for the chat icon in the bottom-right corner.`
+To see your copilot: If your portal is already running, refresh the page.
+Otherwise, run '${f.cmdAlt("apimatic", "portal", "serve")}',
+select any programming language in the Portal and
+look for the chat icon in the bottom-right corner.`,
+      `Next Steps`
     );
   }
 
@@ -56,35 +69,20 @@ To see your copilot: If your portal is already running, refresh the page. Otherw
     return shouldOverwrite;
   }
 
-  public logError(error: string): void {
-    log.error(error);
-  }
-
-  public async spinnerAccountInfo(fn: () => Promise<Result<SubscriptionInfo, ServiceError>>) {
-    return this.withSpinner(
+  public async spinnerAccountInfo(fn: Promise<Result<SubscriptionInfo, ServiceError>>) {
+    return withSpinner(
       "Retrieving your subscription info",
-      "Retrieved subscription info",
-      "Error retrieving subscription info",
+      "Subscription info retrieved",
+      "Subscription info retrieval failed",
       fn
     );
   }
 
-  private async withSpinner<T, E>(intro: string, success: string, failure: string, fn: () => Promise<Result<T, E>>) {
-    const s = spinner();
-    s.start(intro);
-    const result = await fn();
-    result.match(
-      () => s.stop(success, 0),
-      () => s.stop(failure, 1)
-    );
-    return result;
-  }
-
   public async confirmSingleKeyUsage(apiCopilotKey: string) {
     const confirmKeyUsage = await confirm({
       message:
         "API Copilot can only be active on one Portal at a time. Configuring it on this Portal will disable it on any previously configured Portal.\n" +
-        `Do you want to use this key: '${apiCopilotKey}'?`,
+        `Do you want to use this key: ${f.var(apiCopilotKey)}?`,
       initialValue: true
     });
 
@@ -94,4 +92,27 @@ To see your copilot: If your portal is already running, refresh the page. Otherw
 
     return confirmKeyUsage;
   }
+
+  public srcDirectoryEmpty(directory: DirectoryPath) {
+    const message = `The ${f.var("src")} directory is either empty or invalid: ${f.path(directory)}`;
+    log.error(message);
+  }
+
+  public cancelled() {
+    log.warning("Exiting without making any change.");
+  }
+
+  public serviceError(serviceError: ServiceError) {
+    log.error(getErrorMessage(serviceError));
+  }
+
+  public noCopilotKeyFound() {
+    log.error(
+      `No copilot key found for the current subscription. Please contact support at ${f.var("support@apimatic.io")}.`
+    );
+  }
+
+  public noCopilotKeySelected() {
+    log.error("No API Copilot key was selected.");
+  }
 }
diff --git a/src/prompts/portal/generate.ts b/src/prompts/portal/generate.ts
index d7823c3c3..190a9a853 100644
--- a/src/prompts/portal/generate.ts
+++ b/src/prompts/portal/generate.ts
@@ -1,13 +1,13 @@
-import { outro, spinner, isCancel, confirm, log } from "@clack/prompts";
-import { getMessageInRedColor, getMessageInMagentaColor, getMessageInCyanColor } from "../../utils/utils.js";
+import { isCancel, confirm, log } from "@clack/prompts";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
+import { format as f, withSpinner } from "../format.js";
+import { Result } from "neverthrow";
+import { FilePath } from "../../types/file/filePath.js";
 
 export class PortalGeneratePrompts {
-  private readonly spin = spinner();
-
   public async overwritePortal(directory: DirectoryPath): Promise<boolean> {
     const overwrite = await confirm({
-      message: `The destination '${directory}' is not empty, do you want to overwrite?`,
+      message: `The destination ${f.path(directory)} is not empty, do you want to overwrite?`,
       initialValue: false
     });
 
@@ -18,33 +18,38 @@ export class PortalGeneratePrompts {
     return overwrite;
   }
 
-  displayPortalGenerationMessage(): void {
-    this.spin.start(getMessageInMagentaColor("Generating portal"));
+  public directoryCannotBeSame(directory: DirectoryPath) {
+    const message = `The ${f.var("src")} and ${f.var("portal")} directories must be different. Current value: ${f.path(
+      directory
+    )}`;
+    log.error(message);
   }
 
-  displayPortalGenerationSuccessMessage(): void {
-    this.spin.stop(getMessageInCyanColor("Portal generated successfully."));
-    this.cleanUpStandardInput();
+  public srcDirectoryEmpty(directory: DirectoryPath) {
+    const message = `The ${f.var("src")} directory is either empty or invalid: ${f.path(directory)}`;
+    log.error(message);
   }
 
-  displayPortalGenerationErrorMessage(): void {
-    this.spin.stop(getMessageInRedColor(`Portal Generation failed.`), 1);
-    this.cleanUpStandardInput();
+  public portalDirectoryNotEmpty() {
+    const message = `Please enter a different destination folder or remove the existing files and try again.`;
+    log.error(message);
   }
 
-  displayOutroMessage(generatedPortalPath: string): void {
-    outro(`The generated portal can be found at ${generatedPortalPath}`);
+  public generatePortal(fn: Promise<Result<NodeJS.ReadableStream, string | NodeJS.ReadableStream>>) {
+    return withSpinner("Generating portal", "Portal generated successfully.", "Portal Generation failed.", fn);
   }
 
-  logError(error: string): void {
+  public portalGenerationError(error: string) {
     log.error(error);
   }
 
-  //This clears the standard input to allow interrupts like CTRL+C to work properly.
-  private cleanUpStandardInput(): void {
-    if (process.stdin.isTTY) {
-      process.stdin.setRawMode(false);
-      process.stdin.pause();
-    }
+  portalGenerationErrorWithReport(reportPath: FilePath) {
+    const message = `An error occurred during portal generation.
+A report has been written at the destination path ${f.path(reportPath)}`;
+    log.error(message);
+  }
+
+  public portalGenerated(portal: DirectoryPath) {
+    log.info(`Portal artifacts can be found at ${f.path(portal)}.`);
   }
 }
diff --git a/src/prompts/portal/quickstart.ts b/src/prompts/portal/quickstart.ts
index 43d5d67be..75b9075ad 100644
--- a/src/prompts/portal/quickstart.ts
+++ b/src/prompts/portal/quickstart.ts
@@ -1,93 +1,55 @@
-import * as path from "path";
-import fs from "fs";
-import axios from "axios";
-import treeify from "treeify";
-import { intro, outro, text, select, multiselect, log, isCancel, cancel } from "@clack/prompts";
-import { getMessageInCyanColor, getMessageInGreenColor, getMessageInRedColor } from "../../utils/utils.js";
-import { BasePrompts } from "./common/base-prompts.js";
-import { DirectoryNode } from "../../types/portal/quickstart.js";
+import { Result } from "neverthrow";
+import { isCancel, log, multiselect, note, select, text } from "@clack/prompts";
 import { UrlPath } from "../../types/file/urlPath.js";
-
-export class PortalQuickstartPrompts extends BasePrompts {
-  private readonly vscodeExtensionUrl =
-    "\u001b[4mhttps://marketplace.visualstudio.com/items?itemName=apimatic-developers.apimatic-for-vscode\u001b[0m";
-  private readonly serverUrl = "\u001b[4mhttp://localhost:3000\u001b[0m";
-  private readonly referenceDocumentationUrl =
-    "\u001b[4mhttps://docs.apimatic.io/cli-getting-started/advanced-portal-setup\u001b[0m";
-  private readonly defaultPortalDirectoryPath = process.cwd();
-  private readonly descriptions: { [key: string]: string } = Object.entries({
-    "APIMATIC-BUILD.json":
-      "# Defines all configurations for the API portal, including programming languages and themes",
-    spec: "# Contains all API definition files",
-    content: "# Includes custom documentation pages in Markdown",
-    "content/toc.yml": "# Controls the structure of the side navigation bar in the API portal",
-    static: "# Includes all static files, such as images, GIFs, and PDFs"
-  }).reduce((acc, [key, value]) => {
-    acc[path.normalize(key)] = value;
-    return acc;
-  }, {} as { [key: string]: string });
-
-  public displayWelcomeMessage(): void {
-    intro(`Hello there 👋`);
-    log.message(
-      `This wizard will help you set up an API Portal via APIMatic's Docs as Code workflow in 4 simple steps.`
-    );
-    log.message(`Let's get started! 🚀`);
+import { format as f, getTree, withSpinner } from "../format.js";
+import { DirectoryPath } from "../../types/file/directoryPath.js";
+import { removeQuotes } from "../../utils/string-utils.js";
+import { getErrorMessage, ServiceError } from "../../infrastructure/api-utils.js";
+import { Directory } from "../../types/file/directory.js";
+import { createResourceInputFromInput, ResourceInput } from "../../types/file/resource-input.js";
+import { FileDownloadResponse } from "../../infrastructure/services/file-download-service.js";
+
+const vscodeExtensionUrl =
+  "https://marketplace.visualstudio.com/items?itemName=apimatic-developers.apimatic-for-vscode";
+const referenceDocumentationUrl = "https://docs.apimatic.io/cli-getting-started/advanced-portal-setup";
+const defaultPortalDirectoryPath = process.cwd();
+
+export class PortalQuickstartPrompts {
+  public welcomeMessage() {
+    log.info(`Welcome to the Portal Quickstart Wizard.`);
+    const message = `This wizard will help you set up an API Portal via APIMatic's Docs as Code workflow in 4 simple steps.
+
+Let's get started!`;
+    log.message(message);
+  }
+  public importSpecStep() {
+    log.info(`Step 1 of 4: Import your OpenAPI Definition`);
   }
 
-  //TODO: Very complex validation, needs to be improved.
-  public async specPathPrompt(defaultSpecUrl: UrlPath): Promise<string> {
-    while (true) {
-      const spec = await text({
-        message: `Provide a local path or a public URL for your OpenAPI definition file:`,
-        placeholder: "Provide absolute URL/local path or press Enter to use a sample OpenAPI file from APIMatic.",
-        defaultValue: defaultSpecUrl.toString(),
-        validate: (input) => {
-          if (!input) return;
-
-          const cleanedPath = this.removeQuotes(input.trim() ?? "");
-
-          if (!UrlPath.create(cleanedPath)) {
-            const dirPath = path.resolve(cleanedPath);
-
-            if (!fs.existsSync(dirPath)) {
-              return "The specified file does not exist. Please enter a valid file path.";
-            }
-
-            if (!fs.statSync(dirPath).isFile()) {
-              return "The specified path does not point to a valid API Definition file or a zip archive containing API definition files. Please try again.";
-            }
-          }
+  public async specPathPrompt(defaultSpecUrl: UrlPath): Promise<ResourceInput | undefined> {
+    const spec = await text({
+      message: `Provide a local path or a public URL for your OpenAPI definition file:`,
+      placeholder: "Provide absolute URL/local path or press Enter to use a sample OpenAPI file from APIMatic.",
+      defaultValue: defaultSpecUrl.toString(),
 
-          return; // pass sync validation
+      validate: (value) => {
+        if (value && !createResourceInputFromInput(value)) {
+          return "Please enter a valid file path or URL.";
         }
-      });
-
-      if (isCancel(spec)) {
-        cancel("Operation cancelled.");
-        process.exit(1);
       }
+    });
+    if (isCancel(spec)) {
+      return undefined;
+    }
+    return createResourceInputFromInput(spec);
+  }
 
-      const cleanedPath = this.removeQuotes(String(spec).trim());
-
-      // Async validation for URLs
-      if (UrlPath.create(cleanedPath)) {
-        try {
-          const response = await axios.head(cleanedPath);
-          const contentType = response.headers["content-type"];
-
-          if (contentType?.includes("text/html")) {
-            this.logError(`Invalid URL. Please check the URL and ensure it points to a valid OpenAPI definition.`);
-            continue; // re-prompt
-          }
-        } catch {
-          this.logError(`Failed to reach the URL. Please check your internet connection or the URL.`);
-          continue; // re-prompt
-        }
-      }
+  public specFileDoesNotExist() {
+    log.error("The specified file does not exist or is not a valid file. Please enter a valid file path.");
+  }
 
-      return cleanedPath; // valid local file or valid URL
-    }
+  public noSpecSpecified() {
+    log.error("No API definition was provided.");
   }
 
   public async useDefaultSpecPrompt(): Promise<boolean> {
@@ -96,24 +58,34 @@ export class PortalQuickstartPrompts extends BasePrompts {
       options: [
         {
           value: "no",
-          label: `1. Fix the issues using APIMatic's interactive VS Code Extension: ${this.vscodeExtensionUrl}`
+          label: `1. Fix the issues using APIMatic's interactive VS Code Extension: ${vscodeExtensionUrl}`
         },
         { value: "yes", label: `2. Use an example API spec instead (recommended)` }
       ]
     });
-
     if (isCancel(useDefaultSpec)) {
-      cancel("Operation cancelled.");
-      return process.exit(1);
+      return false;
     }
-
     return useDefaultSpec === "yes";
   }
 
-  async selectLanguagesPrompt(): Promise<string[]> {
+  public fixYourSpec() {
+    const message = `Good luck fixing your API definition! Feel free to run this command again once you're done.`;
+    log.info(message);
+  }
+
+  public validateSpecStep() {
+    log.info(`Step 2 of 4: Validate and Lint your OpenAPI file`);
+  }
+
+  public selectLanguagesStep() {
+    log.info(`Step 3 of 4: Select programming languages`);
+  }
+
+  public async selectLanguagesPrompt(): Promise<string[] | undefined> {
     const languages = (await multiselect({
       message:
-        "💻 Your API Portal will contain SDKs and SDK Documentation in the following Languages. Press enter to continue with all languages, or use the arrow keys and spacebar to customize your selection:",
+        "Your API Portal will contain SDKs and SDK Documentation in the following Languages. Press enter to continue with all languages, or use the arrow keys and space to customize your selection:",
       options: [
         { label: "Typescript", value: "typescript" },
         { label: "Ruby", value: "ruby" },
@@ -127,126 +99,88 @@ export class PortalQuickstartPrompts extends BasePrompts {
     })) as string[];
 
     if (isCancel(languages)) {
-      cancel("Operation cancelled.");
-      return process.exit(1);
+      return undefined;
     }
 
     return ["http", ...languages];
   }
 
-  async inputDirectoryPathPrompt(): Promise<string> {
-    const directory = await text({
-      message: "Enter the directory path where you would like to setup the API Portal (Requires an empty directory):",
-      placeholder: "Provide absolute path to the directory or press Enter to use the current directory.",
-      defaultValue: "./",
-      validate: (input) => {
-        const cleanedPath = this.removeQuotes(input?.trim() ?? "");
-        const dirPath = path.resolve(cleanedPath);
+  public noLanguagesSelected() {
+    log.error("No programming languages were selected.");
+  }
 
-        if (!fs.existsSync(dirPath) && dirPath != this.defaultPortalDirectoryPath) {
-          return getMessageInRedColor("Error: The specified directory path does not exist. Please try again.");
-        }
+  public selectInputDirectoryStep() {
+    log.info(`Step 4 of 4: Generate source files for Docs as Code`);
+  }
 
-        if (dirPath !== this.defaultPortalDirectoryPath) {
-          const files = fs.readdirSync(dirPath).filter((item) => !item.startsWith("."));
-          if (files.length > 0) {
-            return getMessageInRedColor(
-              "Error: The target directory is not empty. Please provide a path to an empty directory or clear its contents."
-            );
-          }
-        } else if (fs.existsSync(dirPath)) {
-          // For ignoring hidden files and folders in the current directory in MacOS.
-          const files = fs.readdirSync(dirPath).filter((item) => !item.startsWith("."));
-          if (files.length > 0) {
-            return getMessageInRedColor(
-              "Error: The target directory is not empty. Please provide a path to an empty directory or clear its contents."
-            );
-          }
-        }
-      }
+  public async inputDirectoryPathPrompt(): Promise<DirectoryPath | undefined> {
+    const inputDirectory = await text({
+      message: "Enter the directory path where you would like to setup the API Portal (Requires an empty directory):",
+      placeholder: "Provide absolute path to the directory or press Enter to use the current directory.",
+      defaultValue: "./"
     });
 
-    if (isCancel(directory)) {
-      cancel("Operation cancelled.");
-      return process.exit(1);
+    if (isCancel(inputDirectory)) {
+      return undefined;
     }
 
-    if (directory === "./") {
-      return this.defaultPortalDirectoryPath;
+    const cleanedPath = removeQuotes((inputDirectory as string)?.trim() ?? "");
+    const directoryPath = new DirectoryPath(cleanedPath);
+
+    if (inputDirectory === "./") {
+      return new DirectoryPath(defaultPortalDirectoryPath);
     } else {
-      return this.removeQuotes(String(directory).trim());
+      return directoryPath;
     }
   }
 
-  public displayBuildDirectoryAsTree(buildDirectory: string): void {
-    const structuredBuildDirectory = this.convertDirectoryStructureToJson(buildDirectory) as treeify.TreeObject;
-
-    const tree = treeify.asTree(structuredBuildDirectory, true, true);
-
-    const coloredLogString = tree
-      .split("\n")
-      .map((line) => line.replace(/#.*/, (match) => getMessageInGreenColor(match)))
-      .join("\n");
-
-    log.step(coloredLogString);
+  public inputDirectoryPathDoesNotExist(inputDirectory: DirectoryPath) {
+    log.error(`The specified directory path ${f.path(inputDirectory)} does not exist.`);
   }
 
-  public displayOutroMessage(buildDirectory: string): void {
-    log.step(
-      getMessageInCyanColor(`📢  Your API Portal is live at: ${this.serverUrl}\n`) +
-        getMessageInCyanColor(
-          `Hot reload enabled! Edit files in ${buildDirectory} to see changes instantly reflected in your API Portal.\n`
-        ) +
-        getMessageInCyanColor(`Press CTRL+C to stop the server.`)
-    );
-    outro(
-      getMessageInCyanColor(`What's next?\n`) +
-        getMessageInCyanColor(`- Use the API Playground or an SDK to call your API.\n`) +
-        getMessageInCyanColor(
-          `- Customize the Portal theme, add API recipes and enable AI features: ${this.referenceDocumentationUrl}`
-        )
+  public inputDirectoryNotEmpty(inputDirectory: DirectoryPath) {
+    log.error(
+      `The target directory ${f.path(
+        inputDirectory
+      )} is not empty. Please provide a path to an empty directory or clear its contents.`
     );
   }
 
-  private removeQuotes(str: string): string {
-    const quotes = ['"', "'"];
-
-    for (const quote of quotes) {
-      if (str.startsWith(quote) && str.endsWith(quote) && str.length > 1) {
-        return this.removeQuotes(str.slice(1, -1)); // Recursive call
-      }
-    }
-    return str;
+  public noInputDirectoryProvided() {
+    log.error("No source directory was provided.");
   }
 
-  private convertDirectoryStructureToJson(dirPath: string, parentPath = ""): DirectoryNode {
-    const directoryStructure: DirectoryNode = {};
-
-    const items = fs.readdirSync(dirPath);
-    items.forEach((item) => {
-      if (item === ".git") return; // Skip .git directory
+  public downloadBuildDirectory(fn: Promise<Result<FileDownloadResponse, ServiceError>>) {
+    return withSpinner(
+      "Setting up source directory",
+      `Source directory set up successfully`,
+      "Unable to set up source directory",
+      fn
+    );
+  }
 
-      const itemPath = path.join(dirPath, item);
-      const relativePath = path.join(parentPath, item);
-      const stats = fs.statSync(itemPath);
+  public downloadSpecFile(fn: Promise<Result<FileDownloadResponse, ServiceError>>) {
+    return withSpinner("Downloading Spec file", `Spec file downloaded`, "Unable to download spec file", fn);
+  }
 
-      if (stats.isDirectory()) {
-        const subdirectoryStructure = this.convertDirectoryStructureToJson(itemPath, relativePath);
+  public nextSteps(): void {
+    const message = `- Use the API Playground or an SDK to call your API.
+- Customize the Portal theme, add API recipes and enable AI features
+  ${f.link(referenceDocumentationUrl)}`;
+    note(message, "Next steps");
+  }
 
-        const folderName = this.descriptions[path.normalize(relativePath)]
-          ? `${item} : ${this.descriptions[path.normalize(relativePath)]}`
-          : item;
+  public serviceError(error: ServiceError) {
+    log.error(getErrorMessage(error));
+  }
 
-        directoryStructure[folderName] = subdirectoryStructure;
-      } else {
-        directoryStructure[
-          this.descriptions[path.normalize(relativePath)]
-            ? `${item} : ${this.descriptions[path.normalize(relativePath)]}`
-            : item
-        ] = null;
-      }
-    });
+  public printDirectoryStructure(inputDirectory: DirectoryPath, directory: Directory) {
+    const heading = `${f.var('src')} directory containing source files created at ${f.path(inputDirectory)}\n`;
+    const message = getTree(directory.toTreeNode());
+    log.info(heading + message);
+  }
 
-    return directoryStructure;
+  public specValidationFailed() {
+    log.error(`Oops, it looks like there are some errors in your API Definition`);
   }
 }
diff --git a/src/prompts/portal/recipe/new-recipe.ts b/src/prompts/portal/recipe/new-recipe.ts
index e9bc161dd..e31e61d37 100644
--- a/src/prompts/portal/recipe/new-recipe.ts
+++ b/src/prompts/portal/recipe/new-recipe.ts
@@ -1,28 +1,41 @@
-import * as fs from "fs";
-import * as path from "path";
-import treeify from "treeify";
-import { intro, spinner, select, text, cancel, isCancel, outro, log, autocomplete } from "@clack/prompts";
-import { getMessageInGreenColor } from "../../../utils/utils.js";
-import { SdlEndpoint } from "../../../types/sdl/sdl.js";
+import { select, text, isCancel, log, autocomplete, confirm, note } from "@clack/prompts";
+import { Sdl, SdlEndpoint } from "../../../types/sdl/sdl.js";
+import { DirectoryPath } from "../../../types/file/directoryPath.js";
+import { format as f, getTree, TreeNode, withSpinner } from "../../format.js";
+import { StepType } from "../../../types/recipe/recipe.js";
+import { getErrorMessage, ServiceError } from "../../../infrastructure/api-utils.js";
+import { Result } from "neverthrow";
 
 export class PortalRecipePrompts {
-  private readonly spin = spinner();
-
   public displayWelcomeMessage(): void {
-    intro(`Welcome to the API Recipe Generation Wizard. 🪄`);
-    log.step(`This wizard will guide you through the process of creating an API Recipe.`);
-    log.message(
-      `An API Recipe is a collection of steps that allows you to define a single use case for your API Documentation portal.`
-    );
-    log.message(
-      `ℹ️  Learn more: https://docs.apimatic.io/platform-api/#/http/guides/generating-on-prem-api-portal/api-recipes`
-    );
-    log.message(`Let's get started! 🚀`);
+    log.step(`Welcome to the API Recipe Generation Wizard.`);
+    const message = `This wizard will guide you through the process of creating an API Recipe.
+
+An API Recipe is a collection of steps that allows you to define a single use case for your API Documentation portal.
+Learn more: ${f.link("https://docs.apimatic.io/platform-api/#/http/guides/generating-on-prem-api-portal/api-recipes")}
+
+Let's get started!`;
+    log.info(message);
+  }
+
+  public recipeNameEmpty() {
+    const message = "No recipe name provided";
+    log.error(message);
+  }
+
+  public contentFolderNotFound() {
+    const message = "Content folder not found.";
+    log.error(message);
+  }
+
+  public specFileEmptyInvalid() {
+    const message = "Spec file is empty or invalid.";
+    log.error(message);
   }
 
-  public async recipeNamePrompt(): Promise<string> {
+  public async recipeNamePrompt(): Promise<string | undefined> {
     const recipeName = await text({
-      message: `📘 Enter a name for your API Recipe:`,
+      message: `Enter a name for your API Recipe:`,
       placeholder: "This name will be displayed in your API Documentation portal sidebar.",
       validate: (name) => {
         if (!name) {
@@ -32,55 +45,13 @@ export class PortalRecipePrompts {
     });
 
     if (isCancel(recipeName)) {
-      cancel("Operation cancelled.");
-      return process.exit(0);
+      return undefined;
     }
 
     return (recipeName as string).trim();
   }
-  //Todo: Find a better place for this function
-  removeQuotes(str: string): string {
-    const quotes = ['"', "'"];
-
-    for (const quote of quotes) {
-      if (str.startsWith(quote) && str.endsWith(quote) && str.length > 1) {
-        return this.removeQuotes(str.slice(1, -1)); // Recursive call
-      }
-    }
-    return str;
-  }
-  public async buildConfigFilePathPrompt(buildDirectoryPath: string): Promise<string> {
-    const buildConfigFilePath = await text({
-      message: `⚠️  APIMATIC-BUILD.json is required and was not found in "${buildDirectoryPath}".\nPlease enter the path to your build config file (relative to this directory):`,
-      validate: (filePath) => {
-        if (!filePath) {
-          return "Build config file path cannot be empty. Please provide a valid file path.";
-        }
-        const cleanedPath = this.removeQuotes(filePath.trim());
-        const resolvedPath = path.resolve(buildDirectoryPath, cleanedPath);
-        
-        if (!resolvedPath.endsWith(".json")) {
-          return "The content file must be a JSON (.json) file. Please provide a valid file path.";
-        }
-
-      
-        if (fs.existsSync(resolvedPath) && fs.statSync(resolvedPath).isFile()) {
-          return;
-        }
 
-        return "The specified path is either not a valid relative file path or it doesn't exist. Please provide a valid relative file path.";
-      }
-    });
-
-    if (isCancel(buildConfigFilePath)) {
-      cancel("Operation cancelled.");
-      return process.exit(0);
-    }
-
-    return path.resolve(buildDirectoryPath, this.removeQuotes((buildConfigFilePath as string).trim()));
-  }
-
-  public async stepNamePrompt(defaultStepName: string): Promise<string> {
+  public async stepNamePrompt(defaultStepName: string): Promise<string | undefined> {
     const stepName = await text({
       message: `Enter a name for the step:`,
       defaultValue: defaultStepName,
@@ -88,46 +59,37 @@ export class PortalRecipePrompts {
     });
 
     if (isCancel(stepName)) {
-      cancel("Operation cancelled.");
-      return process.exit(0);
+      return undefined;
     }
 
     return (stepName as string).trim();
   }
 
   public displayStepsInformation(): void {
-    log.step(`🔧 Add Steps to your API Recipe:`);
-    log.message(`You can add:`)
-    log.message(
-      `1. 📄 Content Step: Display custom content, such as instructions or information related to your API.`
-    );
-    log.message(`2. 🔗 Endpoint Step: Display an API endpoint, its playground and other relevant details.`);
-    log.message(`💡 Steps appear in the order you add them.`);
-    log.message(`📝 Let's proceed to adding steps to your API Recipe. `);
+    log.step(`Add Steps to your API Recipe:`);
+    const message = `You can add:
+1. Content Step: Display custom content, such as instructions or information related to your API.
+2. Endpoint Step: Display an API endpoint, its playground and other relevant details.
+Steps appear in the order you add them.
+Let's proceed to adding steps to your API Recipe.`;
+    log.message(message);
   }
 
-  public async stepTypeSelectionPrompt(): Promise<string> {
+  public async stepTypeSelectionPrompt(): Promise<StepType | undefined> {
     const stepType = await select({
-      message: `➕ Select the type of step you want to add:`,
+      message: `Select the type of step you want to add:`,
       options: [
         { value: "content", label: "Content Step", hint: "For displaying custom content" },
         { value: "endpoint", label: "Endpoint Step", hint: "For displaying an API endpoint with its details" }
       ]
     });
-
     if (isCancel(stepType)) {
-      cancel("Operation cancelled.");
-      return process.exit(0);
+      return undefined;
     }
-
-    return stepType as string;
-  }
-
-  public displayContentStepInfo(): void {
-    log.step("📝 Opening markdown editor for you to add content in...");
+    return stepType as StepType;
   }
 
-  public async endpointGroupNamePrompt(endpointGroups: Map<string, SdlEndpoint[]>): Promise<string> {
+  public async endpointGroupNamePrompt(endpointGroups: Map<string, SdlEndpoint[]>): Promise<string | undefined> {
     const groupNames = Array.from(endpointGroups.keys()).map((name) => ({
       value: name,
       label: name
@@ -139,14 +101,16 @@ export class PortalRecipePrompts {
     });
 
     if (isCancel(endpointGroupName)) {
-      cancel("Operation cancelled.");
-      return process.exit(0);
+      return undefined;
     }
 
     return (endpointGroupName as string).trim();
   }
 
-  public async endpointNamePrompt(endpointGroups: Map<string, SdlEndpoint[]>, endpointGroupName: string): Promise<string> {
+  public async endpointNamePrompt(
+    endpointGroups: Map<string, SdlEndpoint[]>,
+    endpointGroupName: string
+  ): Promise<string | undefined> {
     const endpoints = endpointGroups.get(endpointGroupName);
     const endpointName = await autocomplete({
       message: `Select the name of the endpoint:`,
@@ -158,15 +122,13 @@ export class PortalRecipePrompts {
     });
 
     if (isCancel(endpointName)) {
-      cancel("Operation cancelled.");
-      return process.exit(0);
+      return undefined;
     }
 
     return (endpointName as string).trim();
   }
 
-  public async endpointDescriptionPrompt(endpointGroups: Map<string, SdlEndpoint[]>, endpointGroupName: string, endpointName: string): Promise<string> {
-    const defaultDescription = endpointGroups.get(endpointGroupName)!.find((e) => e.Name === endpointName)!.Description;
+  public async endpointDescriptionPrompt(defaultDescription: string): Promise<string | undefined> {
     const endpointDescription = await text({
       message: `Enter a description for the endpoint:`,
       placeholder: `Optional. Leave this empty to use the endpoint description defined in the API Specification`,
@@ -174,79 +136,74 @@ export class PortalRecipePrompts {
     });
 
     if (isCancel(endpointDescription)) {
-      cancel("Operation cancelled.");
-      return process.exit(0);
+      return undefined;
     }
 
     return (endpointDescription as string).trim();
   }
 
   public async addAnotherStepSelectionPrompt(): Promise<boolean> {
-    const addAnotherStep = await select({
+    const addAnotherStep = await confirm({
       message: `Do you want to add another step?`,
-      options: [
-        { value: "yes", label: "Yes" },
-        { value: "no", label: "No" }
-      ],
-      initialValue: "yes"
+      initialValue: true
     });
 
     if (isCancel(addAnotherStep)) {
-      cancel("Operation cancelled.");
-      return process.exit(0);
+      return false;
     }
-
-    return addAnotherStep === "yes";
+    return addAnotherStep;
   }
 
-  public async overwriteApiRecipeInTocPrompt(): Promise<boolean> {
-    const overwriteApiRecipeInToc = await select({
-      message: `⚠️  An API Recipe with this name already exists. Do you want to overwrite it?`,
-      options: [
-        { value: "yes", label: "Yes" },
-        { value: "no", label: "No" }
-      ]
+  public async overwriteApiRecipeInTocPrompt(name: string): Promise<boolean> {
+    const overwrite = await confirm({
+      message: `An API Recipe with name ${f.var(name)} already exists. Do you want to overwrite it?`,
+      initialValue: false
     });
 
-    if (isCancel(overwriteApiRecipeInToc)) {
-      cancel("Operation cancelled.");
-      return process.exit(0);
+    if (isCancel(overwrite)) {
+      return false;
     }
-
-    return overwriteApiRecipeInToc === "yes";
+    return overwrite;
   }
 
   public displayStepAddedSuccessfullyMessage() {
     log.step(`Step has been added successfully.`);
   }
 
-  public displayRecipeGenerationSuccessMessage(buildDirectoryPath: string) {
-    log.message(`🎉 Your new API Recipe has been added to the source directory at: ${buildDirectoryPath}`);
-    outro(
-      `▶ Run the command \`apimatic portal serve\` to preview your documentation portal.`
-    );
+  public invalidBuildDirectory(directory: DirectoryPath) {
+    const message = `The ${f.var("src")} directory is either empty or invalid: ${f.path(directory)}`;
+    log.error(message);
   }
 
-  public startProgressIndicatorWithMessage(message: string): void {
-    this.spin.start(message);
+  public serviceError(serviceError: ServiceError) {
+    log.error(getErrorMessage(serviceError));
   }
 
-  public stopProgressIndicatorWithMessage(message: string): void {
-    this.spin.stop(message);
+  public openRecipeMarkdownEditor() {
+    log.step("Opening markdown editor for you to enter recipe content...");
   }
 
-  public displayBuildDirectoryStructureAsTree(buildDirectoryTreeObject: treeify.TreeObject) {
-    const tree = treeify.asTree(buildDirectoryTreeObject, true, true);
+  public displayRecipeStructure(tocStructure: TreeNode) {
+    const heading = `You can edit the following files to customize your API Recipe:\n`;
+    const message  = getTree(tocStructure);
+    log.info(heading + message);
+  }
 
-    const coloredLogString = tree
-      .split("\n")
-      .map((line: string) => line.replace(/#.*/, (match: string) => getMessageInGreenColor(match)))
-      .join("\n");
+  public nextSteps() {
+    const message = `Run the command '${f.cmdAlt(`apimatic`, 'portal', 'serve')}' to preview your documentation portal`;
+    note(message, "Next Steps");
+  }
 
-    log.step(`🛠️  You can edit the following files to customize your API Recipe :\n\n` + coloredLogString);
+  public generateSdl(fn: Promise<Result<Sdl, ServiceError>>) {
+    return withSpinner(
+      "Extracting endpoints",
+      "Endpoints extracted",
+      "Endpoints extraction failed",
+      fn
+    );
   }
 
-  public logError(error: string): void {
-    outro(error);
+  public recipeCreated() {
+    log.info(`A new API Recipe has been created successfully.`);
   }
 }
diff --git a/src/prompts/portal/serve.ts b/src/prompts/portal/serve.ts
index d5d6305a4..67dc90120 100644
--- a/src/prompts/portal/serve.ts
+++ b/src/prompts/portal/serve.ts
@@ -1,19 +1,44 @@
-import { log, outro } from "@clack/prompts";
-import { BasePrompts } from "./common/base-prompts.js";
+import { log, note } from "@clack/prompts";
+import { format as f } from "../format.js";
+import { UrlPath } from "../../types/file/urlPath.js";
+import { once } from "events";
+import { DirectoryPath } from "../../types/file/directoryPath.js";
 
-export class PortalServePrompts extends BasePrompts {
-  public displayOutroMessage(
-    buildDirectory: string,
-    portalDirectory: string,
-    port: string,
-    hotReloadDisabled: boolean
-  ): void {
-    log.message(`The generated portal can be found at ${portalDirectory}`);
-    log.message(`Server started at http://localhost:${port}`);
-    if (!hotReloadDisabled) {
-      log.message(`🔍 Hot reload enabled. Watching the following build folder for any changes:`);
-      log.message(`${buildDirectory}`);
-    }
-    outro(`Press CTRL+C to stop the server.`);
+export class PortalServePrompts {
+  public usingFallbackPort(currentPort: number, availablePort: number) {
+    const message = `Port ${f.var(currentPort.toString())} is already in use. Available port ${f.var(
+      availablePort.toString()
+    )} will be used.`;
+    log.step(message);
+  }
+
+  public portalServed(urlPath: UrlPath) {
+    const message = `The portal is running at ${f.link(urlPath.toString())}`;
+    log.message(message);
+  }
+
+  public promptForExit() {
+    const message = "Press CTRL+C to stop the server.";
+    log.message(message);
+  }
+
+  public changesDetected() {
+    const message = "Changes detected...";
+    log.info(message);
+  }
+
+  public watcherError() {
+    const message =
+      `An unexpected error occurred while watching your build folder for changes. Please try again later. If the issue persists, contact our team at ${f.var('support@apimatic.io')}`;
+    log.error(message);
+  }
+
+  public async blockExecution() {
+    await Promise.race([once(process, "SIGINT"), once(process, "SIGTERM")]);
+  }
+
+  public hotReloadEnabled(srcDirectory: DirectoryPath) {
+    note(`Hot reload is enabled.
+Watching the directory ${f.path(srcDirectory)} for any changes`, `Note`);
   }
 }
diff --git a/src/prompts/portal/toc/new-toc.ts b/src/prompts/portal/toc/new-toc.ts
index 5999c94e7..3441cc175 100644
--- a/src/prompts/portal/toc/new-toc.ts
+++ b/src/prompts/portal/toc/new-toc.ts
@@ -1,48 +1,56 @@
-import { cancel, outro, confirm, spinner, isCancel, log } from "@clack/prompts";
+import { confirm, isCancel, log } from "@clack/prompts";
 import { FilePath } from "../../../types/file/filePath.js";
+import { Result } from "neverthrow";
+import { format as f, withSpinner } from "../../format.js";
+import { DirectoryPath } from "../../../types/file/directoryPath.js";
+import { ServiceError } from "../../../infrastructure/api-utils.js";
+import { Sdl } from "../../../types/sdl/sdl.js";
 
 export class PortalNewTocPrompts {
-  private readonly spin = spinner();
-
-  async overwriteExistingTocPrompt(tocPath: FilePath): Promise<boolean> {
+  public async overwriteToc(tocPath: FilePath): Promise<boolean> {
     const overwrite = await confirm({
-      message: `⚠️ The destination file '${tocPath}' already exists, do you want to overwrite it?`,
+      message: `The destination file ${f.path(tocPath)} already exists, do you want to overwrite it?`,
       initialValue: false
     });
 
     if (isCancel(overwrite)) {
-      cancel("Operation cancelled.");
       return false;
     }
 
-    if (!overwrite) {
-      log.error("Please enter a different destination path or delete the existing toc.yml file and try again.");
-    }
-
     return overwrite;
   }
 
-  startProgressIndicatorWithMessage(message: string): void {
-    this.spin.start(message);
+  public fallingBackToDefault() {
+    log.warn(`Falling back to the default TOC structure.`);
+  }
+
+  public tocFileAlreadyExists() {
+    log.error(`Please enter a different destination path or delete the existing toc.yml file and try again.`);
   }
 
-  stopProgressIndicatorWithMessage(message: string): void {
-    this.spin.stop(message);
+  public logError(message: string) {
+    log.error(message);
   }
 
-  displayOutroMessage(tocPath: FilePath): void {
-    outro(`toc.yml file successfully created at: ${tocPath}`);
+  public contentDirectoryNotFound(contentFolderPath: DirectoryPath) {
+    log.error(`Content folder not found at: ${contentFolderPath}`);
   }
 
-  logError(error: string): void {
-    outro(error);
+  public invalidBuildDirectory(directory: DirectoryPath) {
+    const message = `The ${f.var("src")} directory is either empty or invalid: ${f.path(directory)}`;
+    log.error(message);
   }
 
-  displayWarning(message: string): void {
-    log.warning(message);
+  public extractEndpointGroupsAndModels(fn: Promise<Result<Sdl, ServiceError>>) {
+    return withSpinner(
+      "Extracting endpoint groups and models",
+      "Endpoint groups and models extracted",
+      "Endpoint groups and models extraction failed",
+      fn
+    );
   }
 
-  displayInfo(message: string): void {
-    log.step(message);
+  public tocCreated(tocPath: FilePath) {
+    log.info(`The TOC file successfully created at: ${f.path(tocPath)}`);
   }
 }
diff --git a/src/prompts/sdk/generate.ts b/src/prompts/sdk/generate.ts
index b5a34b531..b00ddfdb9 100644
--- a/src/prompts/sdk/generate.ts
+++ b/src/prompts/sdk/generate.ts
@@ -1,13 +1,12 @@
-import { outro, spinner, isCancel, confirm, log } from "@clack/prompts";
-import { getMessageInRedColor, getMessageInMagentaColor, getMessageInCyanColor } from "../../utils/utils.js";
+import { isCancel, confirm, log } from "@clack/prompts";
 import { DirectoryPath } from "../../types/file/directoryPath.js";
+import { format as f, withSpinner } from "../format.js";
+import { Result } from "neverthrow";
 
 export class SdkGeneratePrompts {
-  private readonly spin = spinner();
-
   public async overwriteSdk(directory: DirectoryPath): Promise<boolean> {
     const overwrite = await confirm({
-      message: `The destination '${directory}' is not empty, do you want to overwrite?`,
+      message: `The destination ${f.path(directory)} is not empty, do you want to overwrite?`,
       initialValue: false
     });
 
@@ -18,33 +17,31 @@ export class SdkGeneratePrompts {
     return overwrite;
   }
 
-  displaySdkGenerationMessage(): void {
-    this.spin.start(getMessageInMagentaColor("Generating SDK"));
+  public sameSpecAndSdkDir(directory: DirectoryPath) {
+   const message = `The ${f.var("src")} and ${f.var("portal")} directories must be different. Current value: ${f.path(
+      directory
+    )}`;    this.logGenerationError(message);
   }
 
-  displaySdkGenerationSuccessMessage(): void {
-    this.spin.stop(getMessageInCyanColor("SDK generated successfully."));
-    this.cleanUpStandardInput();
+  public invalidSpecDirectory(directory: DirectoryPath) {
+    const message = `The ${f.var("src")} directory is either empty or invalid: ${f.path(directory)}`;
+    this.logGenerationError(message);
   }
 
-  displaySdkGenerationErrorMessage(): void {
-    this.spin.stop(getMessageInRedColor(`SDK Generation failed.`), 1);
-    this.cleanUpStandardInput();
+  public destinationDirNotEmpty() {
+    const message = `Please enter a different destination folder or remove the existing files and try again.`;
+    this.logGenerationError(message);
   }
 
-  displayOutroMessage(generatedSdkPath: DirectoryPath): void {
-    outro(`The generated SDK can be found at ${generatedSdkPath}`);
+  public generateSDK(fn: Promise<Result<NodeJS.ReadableStream, string>>) {
+    return withSpinner("Generating SDK", "SDK generated successfully.", "SDK Generation failed.", fn);
   }
 
-  logError(error: string): void {
+  public logGenerationError(error: string): void {
     log.error(error);
   }
 
-  //This clears the standard input to allow interrupts like CTRL+C to work properly.
-  private cleanUpStandardInput(): void {
-    if (process.stdin.isTTY) {
-      process.stdin.setRawMode(false);
-      process.stdin.pause();
-    }
+  public sdkGenerated(sdk: DirectoryPath) {
+    log.info(`Generated SDK can be found at ${f.path(sdk)}.`);
   }
 }
diff --git a/src/types/api/account.ts b/src/types/api/account.ts
index 47bd7439c..1c33c5abf 100644
--- a/src/types/api/account.ts
+++ b/src/types/api/account.ts
@@ -4,7 +4,7 @@ export interface SubscriptionInfo {
   FullName: string;
   SecurityStamp: string;
   tenantId: string;
-  allowedLanguages: string; // might be a comma-separated string or code — clarify if needed
+  allowedLanguages: number; // might be a comma-separated string or code — clarify if needed
   isPackagePublishingAllowed: boolean;
   ApiCopilotKeys: string[];
 }
diff --git a/src/types/api/transform.ts b/src/types/api/transform.ts
index 4cb0b40fa..9d8b80871 100644
--- a/src/types/api/transform.ts
+++ b/src/types/api/transform.ts
@@ -1,16 +1,3 @@
-import { TransformationController } from "@apimatic/sdk";
-
-export type TransformationIdParams = {
-  file: string;
-  url: string;
-  format: string;
-};
-
-export type DownloadTransformationParams = {
-  id: string;
-  destinationFilePath: string;
-  transformationController: TransformationController;
-};
 
 export type TransformationData = {
   result: NodeJS.ReadableStream | Blob;
@@ -25,26 +12,26 @@ export const DestinationFormats = {
   Swagger10: "json",
   Swagger20: "json",
   SwaggerYaml: "yaml",
-  RAML: "yaml",
-  RAML10: "yaml",
+  RAML: "raml",
+  RAML10: "raml",
   Postman10: "json",
   Postman20: "json",
   GraphQlSchema: "json"
 };
 
 export enum TransformationFormats {
-  APIMATIC = 'Apimatic',
-  WADL2009 = 'Wadl2009',
-  WSDL = 'Wsdl',
-  SWAGGER10 = 'Swagger10',
-  SWAGGER20 = 'Swagger20',
-  SWAGGERYAML = 'Swaggeryaml',
-  OAS3 = 'Oas3',
-  OPENAPI3YAML = 'Openapi3Yaml',
-  APIBLUEPRINT = 'Apiblueprint',
-  RAML = 'Raml',
-  RAML10 = 'Raml10',
-  POSTMAN10 = 'Postman10',
-  POSTMAN20 = 'Postman20',
-  GRAPHQLSCHEMA = 'Graphqlschema',
+  apimatic = 'Apimatic',
+  wadl2009 = 'Wadl2009',
+  wsdl = 'Wsdl',
+  swagger10 = 'Swagger10',
+  swagger20 = 'Swagger20',
+  swaggeryaml = 'Swaggeryaml',
+  oas3 = 'Oas3',
+  openapi3yaml = 'Openapi3Yaml',
+  apiblueprint = 'Apiblueprint',
+  raml = 'Raml',
+  raml10 = 'Raml10',
+  postman10 = 'Postman10',
+  postman20 = 'Postman20',
+  graphqlschema = 'Graphqlschema',
 }
diff --git a/src/types/api/validate.ts b/src/types/api/validate.ts
deleted file mode 100644
index 3309d44e8..000000000
--- a/src/types/api/validate.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export type GetValidationParams = {
-  file: string;
-  url: string;
-};
-
-export type APIValidateError = {
-  modelState: {
-    "exception Error": string[];
-  };
-};
-export type AuthorizationError = {
-  body: string;
-};
diff --git a/src/types/build-context.ts b/src/types/build-context.ts
index 5746cdbcb..9ad5aea08 100644
--- a/src/types/build-context.ts
+++ b/src/types/build-context.ts
@@ -3,25 +3,31 @@ import { DirectoryPath } from "./file/directoryPath.js";
 import { FilePath } from "./file/filePath.js";
 import { FileName } from "./file/fileName.js";
 import { BuildConfig } from "./build/build.js";
+import { ZipService } from "../infrastructure/zip-service.js";
 
 export class BuildContext {
   private readonly fileService = new FileService();
   private readonly buildDirectory: DirectoryPath;
+  private readonly zipService = new ZipService();
 
   constructor(buildDirectory: DirectoryPath) {
     this.buildDirectory = buildDirectory;
   }
 
-  public get BuildFile(): FilePath {
+  private get buildFile(): FilePath {
     // TODO: add checks for build file path
     return new FilePath(this.buildDirectory, new FileName("APIMATIC-BUILD.json"));
   }
 
+  private get specDirectory(): DirectoryPath {
+    return this.buildDirectory.join("spec");
+  }
+
   public async validate(): Promise<boolean> {
     // TODO: add more checks here
     if (!(await this.fileService.directoryExists(this.buildDirectory))) return false;
 
-    return await this.fileService.fileExists(this.BuildFile);
+    return await this.fileService.fileExists(this.buildFile);
   }
 
   public async exists(): Promise<boolean> {
@@ -29,12 +35,25 @@ export class BuildContext {
   }
 
   public async getBuildFileContents(): Promise<BuildConfig> {
-    const buildFileContent = await this.fileService.getContents(this.BuildFile);
+    const buildFileContent = await this.fileService.getContents(this.buildFile);
     return JSON.parse(buildFileContent) as BuildConfig;
   }
 
   public async updateBuildFileContents(buildJson: BuildConfig) {
-    await this.fileService.writeContents(this.BuildFile, JSON.stringify(buildJson, null, 2));
+    await this.fileService.writeContents(this.buildFile, JSON.stringify(buildJson, null, 2));
+  }
+
+  public async replaceDefaultSpec(specPath: FilePath) {
+    await this.fileService.deleteFile(new FilePath(this.specDirectory, new FileName("openapi.json")));
+    if (await this.fileService.isZipFile(specPath)) {
+      await this.zipService.unArchive(specPath, this.specDirectory);
+    } else {
+      await this.fileService.copy(specPath, specPath.replaceDirectory(this.specDirectory));
+    }
+  }
+
+  public async deleteWorkflowDir() {
+    await this.fileService.deleteDirectory(this.buildDirectory.join(".github"));
   }
 }
 
diff --git a/src/types/build/build.ts b/src/types/build/build.ts
index 8edad27f8..693eec046 100644
--- a/src/types/build/build.ts
+++ b/src/types/build/build.ts
@@ -1,3 +1,5 @@
+import { DirectoryPath } from "../file/directoryPath.js";
+
 export interface BuildConfig {
   generatePortal?: PortalConfig;
   apiCopilotConfig?: CopilotConfig;
@@ -8,6 +10,7 @@ export interface PortalConfig {
   contentFolder?: string;
   languageConfig: { [key: string]: object };
   [key: string]: unknown;
+  apiSpecPath?: DirectoryPath;
 }
 
 export interface CopilotConfig {
@@ -15,3 +18,10 @@ export interface CopilotConfig {
   key: string;
   welcomeMessage: string;
 }
+
+export function getLanguagesConfig(selectedLanguages: string[]) {
+  return selectedLanguages.reduce((config, lang) => {
+    config[lang] = {};
+    return config;
+  }, {} as { [key: string]: object });
+}
diff --git a/src/types/common/result.ts b/src/types/common/result.ts
deleted file mode 100644
index f93572f22..000000000
--- a/src/types/common/result.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-export class Result<T, TError> {
-  private constructor(
-    private readonly Status: ResultStatus,
-    public readonly value?: T,
-    public readonly error?: TError
-  ) {}
-
-  public static success<T, TError>(value: T): Result<T, TError> {
-    return new Result<T, TError>(ResultStatus.Success, value, undefined);
-  }
-
-  public static failure<T, TError>(error: TError): Result<T, TError> {
-    return new Result<T, TError>(ResultStatus.Failed, undefined, error);
-  }
-
-  public static cancelled<T, TError>(value: T): Result<T, TError> {
-    return new Result<T, TError>(ResultStatus.Cancelled, value, undefined);
-  }
-
-  public isFailed(): boolean {
-    return this.Status == ResultStatus.Failed;
-  }
-
-  public isCancelled(): boolean {
-    return this.Status == ResultStatus.Cancelled;
-  }
-
-  public isSuccess(): boolean {
-    return this.Status == ResultStatus.Success;
-  }
-}
-
-export enum ResultStatus {
-  Success,
-  Failed,
-  Cancelled
-}
diff --git a/src/types/events/domain-event.ts b/src/types/events/domain-event.ts
index affc0cc7e..e2ab6037c 100644
--- a/src/types/events/domain-event.ts
+++ b/src/types/events/domain-event.ts
@@ -4,7 +4,7 @@ export abstract class DomainEvent {
   private readonly commandName: string;
   private readonly flags: string[];
 
-  constructor(message: string, commandName: string, flags: Record<string, unknown>) {
+  protected constructor(message: string, commandName: string, flags: Record<string, unknown>) {
     this.message = message;
     this.commandName = commandName;
     this.flags = this.extractFlagKeys(flags);
diff --git a/src/types/events/recipe-creation-failed.ts b/src/types/events/recipe-creation-failed.ts
index 5e1b5d7c7..39c29dbd2 100644
--- a/src/types/events/recipe-creation-failed.ts
+++ b/src/types/events/recipe-creation-failed.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from "../../types/events/domain-event.js";
+import { DomainEvent } from "./domain-event.js";
 
 export class RecipeCreationFailedEvent extends DomainEvent {
   protected readonly eventName = RecipeCreationFailedEvent.name;
diff --git a/src/types/events/toc-creation-failed.ts b/src/types/events/toc-creation-failed.ts
index 450867825..10b9664ef 100644
--- a/src/types/events/toc-creation-failed.ts
+++ b/src/types/events/toc-creation-failed.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from "../../types/events/domain-event.js";
+import { DomainEvent } from "./domain-event.js";
 
 export class TocCreationFailedEvent extends DomainEvent {
   protected readonly eventName = TocCreationFailedEvent.name;
diff --git a/src/types/file/directory.ts b/src/types/file/directory.ts
new file mode 100644
index 000000000..ef1c43e08
--- /dev/null
+++ b/src/types/file/directory.ts
@@ -0,0 +1,109 @@
+import { DirectoryPath } from "./directoryPath.js";
+import { FileName } from "./fileName.js";
+import { TocCustomPage, TocGroup } from "../toc/toc.js";
+import { FilePath } from "./filePath.js";
+import { TreeNode } from "../../prompts/format.js";
+import { FileService } from "../../infrastructure/file-service.js";
+
+export type DirectoryItem = FileName | Directory;
+
+export class Directory {
+  public readonly directoryPath: DirectoryPath;
+  public readonly items: DirectoryItem[];
+  private readonly fileService = new FileService();
+
+  public constructor(directoryPath: DirectoryPath, filePaths: DirectoryItem[]) {
+    this.directoryPath = directoryPath;
+    this.items = filePaths;
+  }
+
+  private static readonly folderDescriptions: Record<string, string> = {
+    spec: "# Contains all API definition files",
+    content: "# Includes custom documentation pages in Markdown",
+    static: "# Includes all static files, such as images, GIFs, and PDFs"
+  };
+
+  private static readonly fileDescriptions: Record<string, string> = {
+    "toc.yml": "# Controls the structure of the side navigation bar in the API portal",
+    "APIMATIC-BUILD.json": "# Defines all configurations for the API portal, including programming languages and themes"
+  };
+
+  public toTreeNode(): TreeNode {
+    const folderName = this.directoryPath.leafName();
+    const folderDescription = Directory.folderDescriptions[folderName];
+
+    return {
+      name: folderName,
+      description: folderDescription,
+      items: this.items.map((item) => {
+        if (item instanceof Directory) {
+          return item.toTreeNode();
+        }
+
+        // file case
+        const fileName = item.toString();
+        const fileDescription = Directory.fileDescriptions[fileName];
+        return {
+          name: fileName,
+          description: fileDescription
+        };
+      })
+    };
+  }
+
+  public async parseContentFolder(baseContentPath: DirectoryPath): Promise<TocGroup[]> {
+    const groups: TocGroup[] = [];
+    const pages: TocCustomPage[] = [];
+
+    for (const item of this.items) {
+      if (item instanceof Directory) {
+        const subGroups = await item.parseContentFolder(baseContentPath);
+
+        if (subGroups.length > 0) {
+          const directoryName = item.directoryPath.leafName();
+          groups.push({
+            group: directoryName,
+            items: subGroups
+          });
+        }
+      } else {
+        if (item.isMarkDown()) {
+          const currentFilePath = new FilePath(this.directoryPath, item);
+          const relativeFilePath = this.fileService.getRelativePath(currentFilePath, baseContentPath);
+
+          pages.push({
+            page: this.getPageName(item),
+            file: relativeFilePath
+          });
+        }
+      }
+    }
+
+    const allItems: (TocGroup | TocCustomPage)[] = [...pages, ...groups];
+
+    if (allItems.length === 0) {
+      return [];
+    }
+
+    if (this.isRootContentDirectory(baseContentPath)) {
+      return [
+        {
+          group: "Custom Content",
+          items: allItems
+        }
+      ];
+    }
+
+    // For subdirectories, return the items directly
+    return allItems as TocGroup[];
+  }
+
+  private getPageName(fileName: FileName): string {
+    const fileNameStr = fileName.toString();
+    return fileNameStr.replace(/\.md$/, "");
+  }
+
+  private isRootContentDirectory(baseContentPath: DirectoryPath): boolean {
+    return this.directoryPath.toString() === baseContentPath.toString();
+  }
+}
diff --git a/src/types/file/directoryPath.ts b/src/types/file/directoryPath.ts
index 09c5e3cf8..49b84b8fb 100644
--- a/src/types/file/directoryPath.ts
+++ b/src/types/file/directoryPath.ts
@@ -12,11 +12,18 @@ export class DirectoryPath {
     return this.directoryPath;
   }
 
-  public join(subPath: string) {
-    return new DirectoryPath(path.join(this.directoryPath, subPath));
+  public join(...subPath: string[]) {
+    return new DirectoryPath(path.join(this.directoryPath, ...subPath));
+  }
+
+  public joinWith(other: DirectoryPath) {
+    return new DirectoryPath(path.join(this.directoryPath, other.toString()));
   }
 
   public isEqual(other: DirectoryPath) {
     return this.directoryPath === other.directoryPath;
   }
+  public leafName() {
+    return path.basename(this.directoryPath);
+  }
 }
diff --git a/src/types/file/fileName.ts b/src/types/file/fileName.ts
index 91f67b9b1..ee204cd52 100644
--- a/src/types/file/fileName.ts
+++ b/src/types/file/fileName.ts
@@ -1,5 +1,3 @@
-import path from "path";
-
 export class FileName {
   private readonly name: string;
 
@@ -7,8 +5,18 @@ export class FileName {
     this.name = name;
   }
 
-  public isZipFile() {
-    return path.extname(this.name).toLowerCase() === ".zip";
+  public isMarkDown() {
+    return this.name.endsWith(".md");
+  }
+
+  public normalize(): FileName {
+    const nameWithoutExt = this.name.replace(/\.[^/.]+$/, "");
+    const normalized = nameWithoutExt
+      .toLowerCase()
+      .replace(/[^a-z0-9-]/g, "-")
+      .replace(/-+/g, "-")
+      .replace(/(^-|-$)/g, "");
+    return new FileName(normalized);
   }
 
   public toString(): string {
diff --git a/src/types/file/filePath.ts b/src/types/file/filePath.ts
index 0971ef19c..c7b8fdbf8 100644
--- a/src/types/file/filePath.ts
+++ b/src/types/file/filePath.ts
@@ -18,4 +18,21 @@ export class FilePath {
   public toString(): string {
     return path.join(this.directoryPath.toString(), this.fileName.toString());
   }
+
+  public static create(filePath: string): FilePath | undefined {
+    if (!filePath) {
+      return undefined;
+    }
+
+    try {
+      const normalizedPath = path.normalize(filePath);
+      const directory = path.dirname(normalizedPath);
+      const filename = path.basename(normalizedPath);
+      const directoryPath = new DirectoryPath(directory);
+      const fileName = new FileName(filename);
+      return new FilePath(directoryPath, fileName);
+    } catch {
+      return undefined;
+    }
+  }
 }
diff --git a/src/types/file/resource-input.ts b/src/types/file/resource-input.ts
new file mode 100644
index 000000000..2096c3ab4
--- /dev/null
+++ b/src/types/file/resource-input.ts
@@ -0,0 +1,45 @@
+import path from "path";
+import { DirectoryPath } from "./directoryPath.js";
+import { FileName } from "./fileName.js";
+import { FilePath } from "./filePath.js";
+import { UrlPath } from "./urlPath.js";
+import { removeQuotes } from "../../utils/string-utils.js";
+
+export type ResourceInput = FilePath | UrlPath;
+
+// Factory function to create the discriminated union
+export const createResourceInput = (file?: string, url?: string): ResourceInput => {
+  if (file && url) {
+    throw new Error("Cannot specify both file and url. Please provide only one.");
+  }
+  if (!file && !url) {
+    throw new Error("Must specify either file or url.");
+  }
+
+  if (file) {
+    if (!file.trim()) {
+      throw new Error("Invalid file path provided.");
+    }
+    return new FilePath(new DirectoryPath(path.dirname(file)), new FileName(path.basename(file)));
+  }
+  if (url) {
+    if (!url.trim()) {
+      throw new Error("Invalid URL provided.");
+    }
+    return new UrlPath(url);
+  }
+  throw new Error("Must specify either file or url.");
+};
+
+export function createResourceInputFromInput(path: string): ResourceInput | undefined {
+  const sanitizedPath = removeQuotes(path.trim() ?? "")
+  const urlPath = UrlPath.create(sanitizedPath);
+  if (urlPath) {
+    return urlPath;
+  }
+  const filePath = FilePath.create(sanitizedPath);
+  if (filePath) {
+    return filePath;
+  }
+  return undefined;
+}
diff --git a/src/types/file/urlPath.ts b/src/types/file/urlPath.ts
index 2f681064f..242143e7c 100644
--- a/src/types/file/urlPath.ts
+++ b/src/types/file/urlPath.ts
@@ -1,5 +1,3 @@
-import path from "path";
-import { FileName } from "./fileName.js";
 import { URL } from "url";
 
 export class UrlPath {
@@ -24,4 +22,4 @@ export class UrlPath {
   public toString(): string {
     return this.url;
   }
-}
+}
\ No newline at end of file
diff --git a/src/types/portal-context.ts b/src/types/portal-context.ts
index 5fe65d3f7..4744773ad 100644
--- a/src/types/portal-context.ts
+++ b/src/types/portal-context.ts
@@ -12,11 +12,17 @@ export class PortalContext {
   constructor(private readonly portalDirectory: DirectoryPath) {
   }
 
-  public get ZipPath(): FilePath {
+  private get ZipPath(): FilePath {
     // TODO: add checks for build file path
     return new FilePath(this.portalDirectory, new FileName("portal.zip"));
   }
 
+  private get reportPath(): FilePath {
+    // TODO: add checks for build file path
+    const debugPath = this.portalDirectory.join('apimatic-debug');
+    return new FilePath(debugPath, new FileName("apimatic-report.html"))
+  }
+
   public async exists() {
     return !await this.fileService.directoryEmpty(this.portalDirectory);
   }
@@ -29,4 +35,10 @@ export class PortalContext {
       await this.zipService.unArchive(tempPortalFilePath, this.portalDirectory);
     }
   }
+
+  public async saveError(tempErrorFilePath: FilePath) {
+    await this.fileService.cleanDirectory(this.portalDirectory);
+    await this.zipService.unArchive(tempErrorFilePath, this.portalDirectory);
+    return this.reportPath;
+  }
 }
diff --git a/src/types/portal/generate.ts b/src/types/portal/generate.ts
deleted file mode 100644
index 737f68cc8..000000000
--- a/src/types/portal/generate.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export interface GeneratePortalParams {
-  readonly sourceBuildInputZipFilePath: string;
-  readonly generatedPortalArtifactsFolderPath: string;
-  readonly generatedPortalArtifactsZipFilePath: string;
-  readonly overrideAuthKey: string | null;
-  readonly generateZipFile: boolean;
-};
-
-export interface ErrorResponse {
-  readonly title: string;
-  readonly detail?: string;
-  readonly errors: Record<string, string[]>;
-  readonly message?: string;
-}
diff --git a/src/types/portal/quickstart.ts b/src/types/portal/quickstart.ts
deleted file mode 100644
index 3d50da43e..000000000
--- a/src/types/portal/quickstart.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface DirectoryNode {
-  [key: string]: DirectoryNode | string | null | undefined;
-}
diff --git a/src/types/portal/serve.ts b/src/types/portal/serve.ts
deleted file mode 100644
index 0adb0d56f..000000000
--- a/src/types/portal/serve.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export interface ServeFlags {
-    readonly port: number | undefined,
-    readonly input: string;
-    readonly destination: string;
-    readonly open: boolean;
-    readonly "auth-key": string | undefined;
-    readonly "no-reload": boolean;
-}
-
-export interface ServePaths {
-  readonly sourceDirectoryPath: string;
-  readonly destinationDirectoryPath: string;
-}
diff --git a/src/types/recipe-context.ts b/src/types/recipe-context.ts
new file mode 100644
index 000000000..3b78a67ae
--- /dev/null
+++ b/src/types/recipe-context.ts
@@ -0,0 +1,25 @@
+import { toPascalCase } from "../utils/utils.js";
+import { FileName } from "./file/fileName.js";
+import { Toc } from "./toc/toc.js";
+
+export class RecipeContext {
+  constructor(private readonly recipeName: string) {}
+
+  getRecipeName(): FileName {
+    return new FileName(toPascalCase(this.recipeName.trim()) + `.js`);
+  }
+
+  exists(tocData: Toc, recipeName: string, recipeFileName: FileName): boolean {
+    let apiRecipesGroup = tocData.toc?.find((item) => "group" in item && item.group === "API Recipes");
+    if (!apiRecipesGroup || !("items" in apiRecipesGroup)) {
+      return false;
+    }
+
+    // Check if the recipe name or file name already exists
+    const existingRecipe = apiRecipesGroup.items.find(
+      (item) =>
+        "page" in item && "file" in item && (item.page === recipeName || item.file === `recipes/${recipeFileName}.md`)
+    );
+    return !!existingRecipe;
+  }
+}
diff --git a/src/types/recipe/recipe.ts b/src/types/recipe/recipe.ts
index 14364e414..2e294a0f5 100644
--- a/src/types/recipe/recipe.ts
+++ b/src/types/recipe/recipe.ts
@@ -3,25 +3,11 @@ export enum StepType {
   Endpoint = "endpoint"
 }
 
-export interface RecipeContext {
-  showContent(content: string): Promise<any>;
-  showEndpoint(config: EndpointConfig): Promise<any>;
-}
-
 export interface EndpointConfig {
   description: string;
   endpointPermalink: string;
 }
 
-export interface StepConfig {
-  name: string;
-  stepCallback: () => Promise<any>;
-}
-
-export interface RecipeDefinition {
-  [stepKey: string]: StepConfig;
-}
-
 export interface SerializableRecipe {
   name: string;
   steps: SerializableStep[];
@@ -30,7 +16,7 @@ export interface SerializableRecipe {
 export interface SerializableStep {
   key: string;
   name: string;
-  type: "content" | "endpoint";
+  type: StepType;
   config: ContentStepConfig | EndpointStepConfig;
 }
 
@@ -38,8 +24,4 @@ export interface ContentStepConfig {
   content: string;
 }
 
-export interface EndpointStepConfig extends EndpointConfig {}
-
-export interface DirectoryNode {
-  [key: string]: DirectoryNode | string | null | undefined;
-}
\ No newline at end of file
+export type EndpointStepConfig = EndpointConfig
diff --git a/src/types/resource-context.ts b/src/types/resource-context.ts
index 189428289..16369b149 100644
--- a/src/types/resource-context.ts
+++ b/src/types/resource-context.ts
@@ -6,40 +6,29 @@ import { DirectoryPath } from "./file/directoryPath.js";
 import { FileName } from "./file/fileName.js";
 import { FileDownloadService } from "../infrastructure/services/file-download-service.js";
 import { FileService } from "../infrastructure/file-service.js";
-import { ZipService } from "../infrastructure/zip-service.js";
+import { ResourceInput } from "./file/resource-input.js";
+import { ServiceError } from "../infrastructure/api-utils.js";
 
 export class ResourceContext {
   private readonly fileDownloadService = new FileDownloadService();
   private readonly fileService = new FileService();
-  private readonly zipService = new ZipService();
 
   constructor(private readonly tempDirectory: DirectoryPath) {}
 
-  public async resolveTo(resourcePath: string, destinationSubPath: string){
-    const urlPath = UrlPath.create(resourcePath);
-    const fileName =  new FileName(path.basename(resourcePath))
+  public async resolveTo(resourcePath: ResourceInput): Promise<Result<FilePath, ServiceError>> {
+    const fileName = new FileName(path.basename(resourcePath.toString()));
     const destinationFilePath = new FilePath(this.tempDirectory, fileName);
 
-    if (urlPath) {
-      const downloadFileResult = await this.fileDownloadService.downloadFile(urlPath);
+    if (resourcePath instanceof UrlPath) {
+      const downloadFileResult = await this.fileDownloadService.downloadFile(resourcePath);
       if (downloadFileResult.isErr()) {
-        // TODO: Update message here
-        return err("Unable to download the file. Please verify that the provided URL is correct and publicly accessible. ");
+        return err(downloadFileResult.error);
       }
-      await this.fileService.writeFile(destinationFilePath, downloadFileResult.value);
-    } else {
-      const directory = new DirectoryPath(path.dirname(resourcePath));
-      const sourceFilePath = new FilePath(directory, fileName);
-      await this.fileService.copy(sourceFilePath, destinationFilePath);
+      await this.fileService.writeFile(destinationFilePath, downloadFileResult.value.stream);
     }
-    const specDirectory = this.tempDirectory.join(destinationSubPath);
-    await this.fileService.cleanDirectory(specDirectory);
-
-    if (fileName.isZipFile()) {
-      await this.zipService.unArchive(destinationFilePath, specDirectory);
-    } else {
-      await this.fileService.copy(destinationFilePath, destinationFilePath.replaceDirectory(specDirectory));
+    if (resourcePath instanceof FilePath) {
+      await this.fileService.copy(resourcePath, destinationFilePath);
     }
-    return ok(specDirectory);
+    return ok(destinationFilePath);
   }
 }
diff --git a/src/types/sdk-context.ts b/src/types/sdk-context.ts
index 2af32ca67..8d6131025 100644
--- a/src/types/sdk-context.ts
+++ b/src/types/sdk-context.ts
@@ -6,28 +6,31 @@ import { ZipService } from "../infrastructure/zip-service.js";
 import { Language } from "./sdk/generate.js";
 
 export class SdkContext {
-
   private readonly fileService = new FileService();
   private readonly zipService = new ZipService();
 
-  constructor(private readonly sdkDirectory: DirectoryPath, 
-    private readonly platform: Language) {
+  constructor(private readonly sdkDirectory: DirectoryPath, private readonly language: Language) {
   }
 
-  public get ZipPath(): FilePath {
-    return new FilePath(this.sdkDirectory, new FileName(`${this.platform}.zip`));
+  private get zipPath(): FilePath {
+    return new FilePath(this.sdkLanguageDirectory, new FileName(`${this.language}.zip`));
+  }
+  
+  public get sdkLanguageDirectory(): DirectoryPath {
+    return this.sdkDirectory.join(this.language);
   }
 
   public async exists() {
-    return !await this.fileService.directoryEmpty(this.sdkDirectory);
+    return !(await this.fileService.directoryEmpty(this.sdkLanguageDirectory));
   }
 
   public async save(tempPortalFilePath: FilePath, zipPortal: boolean) {
-    await this.fileService.cleanDirectory(this.sdkDirectory);
+    await this.fileService.cleanDirectory(this.sdkLanguageDirectory);
     if (zipPortal) {
-      await this.fileService.copy(tempPortalFilePath, this.ZipPath);
+      await this.fileService.copy(tempPortalFilePath, this.zipPath);
     } else {
-      await this.zipService.unArchive(tempPortalFilePath, this.sdkDirectory);
+      await this.zipService.unArchive(tempPortalFilePath, this.sdkLanguageDirectory);
     }
+    return this.sdkLanguageDirectory;
   }
 }
diff --git a/src/types/sdk/generate.ts b/src/types/sdk/generate.ts
index d935e304a..7cd6cf382 100644
--- a/src/types/sdk/generate.ts
+++ b/src/types/sdk/generate.ts
@@ -7,3 +7,19 @@ export enum Language {
   TYPESCRIPT = "typescript",
   GO = "go"
 }
+
+const languageMap: { [key: number]: Language } = {
+  1: Language.CSHARP,
+  2: Language.GO,
+  4: Language.JAVA,
+  8: Language.PHP,
+  16: Language.PYTHON,
+  32: Language.RUBY,
+  128: Language.TYPESCRIPT,
+};
+
+export function mapLanguages(languageFlag: number): Language[] {
+  return Object.entries(languageMap)
+    .filter(([flag]) => (languageFlag & parseInt(flag)) !== 0)
+    .map(([, language]) => language);
+}
diff --git a/src/types/sdl/sdl.ts b/src/types/sdl/sdl.ts
index 12a951dc7..3ee71e95f 100644
--- a/src/types/sdl/sdl.ts
+++ b/src/types/sdl/sdl.ts
@@ -1,14 +1,82 @@
+import { TocEndpoint, TocModel } from "../toc/toc.js";
+export type EndpointGroup = Map<string, TocEndpoint[]>;
+export type SdlTocComponents = { endpointGroups: EndpointGroup; models: TocModel[] };
+
+
 export interface Sdl {
-  readonly Endpoints: SdlEndpoint[],
-  readonly CustomTypes: SdlModel[]
+  readonly Endpoints: SdlEndpoint[];
+  readonly CustomTypes: SdlModel[];
 }
 
 export interface SdlEndpoint {
-  readonly Name: string,
-  readonly Description: string,
-  readonly Group: string
+  readonly Name: string;
+  readonly Description: string;
+  readonly Group: string;
 }
 
 export interface SdlModel {
-  readonly Name: string
-}
\ No newline at end of file
+  readonly Name: string;
+}
+
+function extractEndpointGroupsForToc(sdl: Sdl): Map<string, TocEndpoint[]> {
+  const endpointGroups = new Map<string, TocEndpoint[]>();
+
+  const endpoints = sdl.Endpoints.map(
+    (e: SdlEndpoint): TocEndpoint => ({
+      generate: null,
+      from: "endpoint",
+      endpointName: e.Name,
+      endpointGroup: e.Group
+    })
+  );
+
+  endpoints.forEach((endpoint: TocEndpoint) => {
+    const group = endpoint.endpointGroup;
+    if (!endpointGroups.has(group)) {
+      endpointGroups.set(group, []);
+    }
+    endpointGroups.get(group)!.push(endpoint);
+  });
+
+  return endpointGroups;
+}
+
+function extractModelsForToc(sdl: Sdl): TocModel[] {
+  return sdl.CustomTypes.map(
+    (e: SdlModel): TocModel => ({
+      generate: null,
+      from: "model",
+      modelName: e.Name
+    })
+  );
+}
+
+export function getEndpointGroupsAndModels(sdl: Sdl): SdlTocComponents {
+  const endpointGroups = extractEndpointGroupsForToc(sdl);
+  const models = extractModelsForToc(sdl);
+  return { endpointGroups, models };
+}
+
+export function getEndpointDescription(
+  endpointGroups: Map<string, SdlEndpoint[]>,
+  endpointGroupName: string,
+  endpointName: string
+): string {
+  return endpointGroups.get(endpointGroupName)!.find((e) => e.Name === endpointName)!.Description;
+}
+
+export function getEndpointGroupsFromSdl(sdl: Sdl): Map<string, SdlEndpoint[]> {
+  const endpointGroups = new Map<string, SdlEndpoint[]>();
+  for (const endpoint of sdl.Endpoints) {
+  if (!endpointGroups.has(endpoint.Group)) {
+    endpointGroups.set(endpoint.Group, []);
+  }
+
+  endpointGroups.get(endpoint.Group)!.push({
+    Name: endpoint.Name,
+    Description: endpoint.Description,
+    Group: endpoint.Group
+  });
+}
+return endpointGroups;
+}
diff --git a/src/types/spec-context.ts b/src/types/spec-context.ts
index 4cf704d5a..ac8127b88 100644
--- a/src/types/spec-context.ts
+++ b/src/types/spec-context.ts
@@ -1,5 +1,8 @@
 import { FileService } from "../infrastructure/file-service.js";
 import { DirectoryPath } from "./file/directoryPath.js";
+import { FilePath } from "./file/filePath.js";
+import { FileName } from "./file/fileName.js";
+
 
 export class SpecContext {
   private readonly fileService = new FileService();
@@ -10,8 +13,12 @@ export class SpecContext {
   }
 
   public async validate(): Promise<boolean> {
-    // TODO: add more checks here
-    return await this.fileService.directoryExists(this.specDirectory)
+    return !(await this.fileService.directoryEmpty(this.specDirectory));
   }
-}
 
+  async save(stream: NodeJS.ReadableStream, fileName: FileName): Promise<FilePath> {
+    const filePath = new FilePath(this.specDirectory, fileName);
+    await this.fileService.writeFile(filePath, stream);
+    return filePath;
+  }
+}
diff --git a/src/types/temp-context.ts b/src/types/temp-context.ts
new file mode 100644
index 000000000..6ee3d21d0
--- /dev/null
+++ b/src/types/temp-context.ts
@@ -0,0 +1,30 @@
+import { FileService } from "../infrastructure/file-service.js";
+import { ZipService } from "../infrastructure/zip-service.js";
+import { DirectoryPath } from "./file/directoryPath.js";
+import { FilePath } from "./file/filePath.js";
+import { FileName } from "./file/fileName.js";
+import { randomUUID } from "crypto";
+
+export class TempContext {
+  private readonly fileService = new FileService();
+  private readonly zipService = new ZipService();
+
+  constructor(private readonly tempDirectory: DirectoryPath) {}
+
+  private get getTempFileName(): FilePath {
+    const uuid = randomUUID();
+    return new FilePath(this.tempDirectory, new FileName(`${uuid}`));
+  }
+
+  async zip(buildDirectory: DirectoryPath): Promise<FilePath> {
+    const tempFile = this.getTempFileName;
+    await this.zipService.archive(buildDirectory, tempFile);
+    return tempFile;
+  }
+
+  async save(portalStream: NodeJS.ReadableStream): Promise<FilePath> {
+    const tempFile = this.getTempFileName;
+    await this.fileService.writeFile(tempFile, portalStream);
+    return tempFile;
+  }
+}
diff --git a/src/types/toc-context.ts b/src/types/toc-context.ts
new file mode 100644
index 000000000..8ff519996
--- /dev/null
+++ b/src/types/toc-context.ts
@@ -0,0 +1,34 @@
+import { FileService } from "../infrastructure/file-service.js";
+import { DirectoryPath } from "./file/directoryPath.js";
+import { FilePath } from "./file/filePath.js";
+import { FileName } from "./file/fileName.js";
+import { Toc } from "./toc/toc.js";
+import { parse } from "yaml";
+
+export class TocContext {
+  private readonly fileService = new FileService();
+  private readonly tocFilePath: FilePath;
+
+  constructor(tocDirectory: DirectoryPath) {
+    this.tocFilePath = new FilePath(tocDirectory, new FileName("toc.yml"));
+  }
+
+  public get tocPath(): FilePath {
+    return this.tocFilePath;
+  }
+
+  public async exists() {
+    return await this.fileService.fileExists(this.tocFilePath);
+  }
+
+  public async parseTocData(): Promise<Toc> {
+    const tocContent = await this.fileService.getContents(this.tocFilePath);
+    return parse(tocContent) as Toc;
+  }
+
+  public async save(contents: string) {
+    await this.fileService.ensurePathExists(this.tocFilePath);
+    await this.fileService.writeContents(this.tocFilePath, contents);
+    return this.tocPath;
+  }
+}
diff --git a/src/types/transform-context.ts b/src/types/transform-context.ts
new file mode 100644
index 000000000..4485350b8
--- /dev/null
+++ b/src/types/transform-context.ts
@@ -0,0 +1,41 @@
+import { ExportFormats } from "@apimatic/sdk";
+import { FileService } from "../infrastructure/file-service.js";
+import { getFileNameFromPath } from "../utils/utils.js";
+import { DestinationFormats } from "./api/transform.js";
+import { DirectoryPath } from "./file/directoryPath.js";
+import { FileName } from "./file/fileName.js";
+import { FilePath } from "./file/filePath.js";
+
+export class TransformContext {
+  private readonly fileService = new FileService();
+
+  private readonly transformedApi: FileName;
+
+  constructor(specFilePath: FilePath,
+              format: ExportFormats,
+              private readonly destinationDirectory: DirectoryPath ) {
+    this.transformedApi = this.parseFileName(format, specFilePath);
+  }
+
+  private get specPath(): FilePath {
+    return new FilePath(this.destinationDirectory, this.transformedApi);
+  }
+
+  public async exists(): Promise<boolean> {
+    const transformedApiPath = new FilePath(this.destinationDirectory, this.transformedApi);
+    return await this.fileService.fileExists(transformedApiPath);
+
+  }
+
+  public async save(stream: NodeJS.ReadableStream): Promise<FilePath> {
+    await this.fileService.createDirectoryIfNotExists(this.destinationDirectory);
+    await this.fileService.writeFile(this.specPath, stream);
+    return this.specPath;
+  }
+
+  private parseFileName(format: string, file: FilePath): FileName {
+    const destinationFileExt: string = DestinationFormats[format as keyof typeof DestinationFormats];
+    const destinationFilePrefix = getFileNameFromPath(file.toString());
+    return new FileName(`${destinationFilePrefix}_${format}.${destinationFileExt}`);
+  }
+}
diff --git a/src/types/utils.ts b/src/types/utils.ts
index 0618f5c95..9cef57d53 100644
--- a/src/types/utils.ts
+++ b/src/types/utils.ts
@@ -3,14 +3,3 @@ export type ValidationMessages = {
   warnings: string[];
   errors: string[];
 };
-
-export type loggers = {
-  log: (message: string) => void;
-  warn: (message: string) => void;
-  error: (message: string) => void;
-};
-
-export type AuthenticationError = {
-  statusCode: number;
-  body: string;
-};
diff --git a/src/utils/string-utils.ts b/src/utils/string-utils.ts
new file mode 100644
index 000000000..65ea078ee
--- /dev/null
+++ b/src/utils/string-utils.ts
@@ -0,0 +1,10 @@
+export const removeQuotes = (input: string): string => {
+  const quotes = ['"', "'"];
+
+  for (const quote of quotes) {
+    if (input.startsWith(quote) && input.endsWith(quote) && input.length > 1) {
+      return removeQuotes(input.slice(1, -1)); // Recursive call
+    }
+  }
+  return input;
+};
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 517f07075..43b605f8b 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -1,66 +1,6 @@
 import * as path from "path";
-import fs from "fs";
-import fsExtra from "fs-extra";
-import os from "os";
 import { Buffer } from "buffer";
-import archiver from "archiver";
 import stripTags from "striptags";
-import colors from "picocolors";
-
-import { loggers, ValidationMessages } from "../types/utils.js";
-
-export const createTempDirectory = async () => {
-  return fs.mkdtempSync(path.join(os.tmpdir(), "apimatic-cli-"));
-};
-
-export const deleteFile = async (filePath: string) => {
-  return await fsExtra.remove(filePath);
-};
-
-export const writeFileUsingReadableStream = (stream: NodeJS.ReadableStream, destinationPath: string) => {
-  return new Promise((resolve) => {
-    const writeStream = fs.createWriteStream(destinationPath);
-    stream.pipe(writeStream);
-    writeStream.on("close", () => {
-      resolve("Zipped");
-    });
-  });
-};
-
-/**
- * Packages local files into a ZIP archive
- *
- * @param {docsPortalFolderPath} path to portal directory.
- * @param {destinationZipPath} path to generated zip
- * return {string}
- */
-export const zipDirectory = async (sourcePath: string, destinationPath: string): Promise<string> => {
-  // Check if the directory exists for the user or not
-  await fsExtra.ensureDir(sourcePath);
-
-  const zipPath = path.join(destinationPath, ".target.zip");
-  const output = fs.createWriteStream(zipPath);
-  const archive = archiver("zip");
-
-  return new Promise((resolve, reject) => {
-    archive.on("error", (err: Error) => {
-      reject(new Error(err.message));
-    });
-
-    output.on("error", (err) => {
-      reject(new Error(err.message));
-    });
-    output.on("close", () => {
-      resolve(zipPath);
-    });
-
-    archive.pipe(output);
-
-    archive.directory(sourcePath, false);
-
-    archive.finalize().catch(reject);
-  });
-};
 
 export const replaceHTML = (string: string) => {
   return stripTags(string);
@@ -70,26 +10,7 @@ export const getFileNameFromPath = (filePath: string) => {
   return path.basename(filePath).split(".")[0];
 };
 
-export const printValidationMessages = (
-  { warnings, errors, messages }: ValidationMessages,
-  { log, warn, error }: loggers
-) => {
-  warnings = warnings || [];
-  messages = messages || [];
-  const singleError: string = errors.join("\n") || "";
-
-  messages.forEach((message) => {
-    log(`\nInfo: ${replaceHTML(message)}`);
-  });
-  warnings.forEach((warning) => {
-    warn(replaceHTML(warning));
-  });
-  if (errors.length > 0) {
-    error(replaceHTML(singleError));
-  }
-};
-
-export async function parseStreamBodyToJson(body: NodeJS.ReadableStream): Promise<any> {
+export async function parseStreamBodyToJson(body: NodeJS.ReadableStream): Promise<unknown> {
   const chunks: Buffer[] = [];
   for await (const chunk of body) {
     chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
@@ -98,26 +19,9 @@ export async function parseStreamBodyToJson(body: NodeJS.ReadableStream): Promis
   return JSON.parse(text);
 }
 
-export const getMessageInOrangeColor = (message: string) => {
-  return colors.yellow(message);
-};
-
-export const getMessageInBlueColor = (message: string) => {
-  return colors.blueBright(message);
-};
-
-export const getMessageInCyanColor = (message: string) => {
-  return colors.cyan(message);
-};
-
-export const getMessageInGreenColor = (message: string) => {
-  return colors.greenBright(message);
-};
-
-export const getMessageInMagentaColor = (message: string) => {
-  return colors.magentaBright(message);
-};
-
-export const getMessageInRedColor = (message: string) => {
-  return colors.redBright(message);
+export const toPascalCase = (str: string): string => {
+  return str
+    .split(" ")
+    .map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+    .join("");
 };
diff --git a/src/validators/common/directoryValidator.ts b/src/validators/common/directoryValidator.ts
deleted file mode 100644
index edf974c75..000000000
--- a/src/validators/common/directoryValidator.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import fsExtra from "fs-extra";
-import { readdirSync } from "fs";
-import { Result } from "../../types/common/result.js";
-
-export class DirectoryValidator {
-  public validateSourceDirectory(sourceDir: string): Result<string, string> {
-    if (!fsExtra.pathExistsSync(sourceDir)) {
-      return Result.failure(
-        `The specified source directory does not exist: ${sourceDir}. Please provide a valid source directory to continue.`
-      );
-    }
-
-    const sourceDirItems = this.getDirectoryItems(sourceDir);
-    if (sourceDirItems.length == 0) {
-      return Result.failure(
-        "The source directory is empty. Please ensure that the directory contains a valid build input."
-      );
-    }
-    if (!sourceDirItems.some((item) => item.endsWith("APIMATIC-BUILD.json"))) {
-      return Result.failure(
-        "The source directory is missing the 'APIMATIC-BUILD.json' file. Please add a valid build config file to continue."
-      );
-    }
-
-    return Result.success(`Source directory ${sourceDir} is valid.`);
-  }
-
-  private getDirectoryItems(directoryPath: string): string[] {
-    return readdirSync(directoryPath).filter((item) => !item.startsWith("."));
-  }
-}
diff --git a/src/validators/portal/serve-validator.ts b/src/validators/portal/serve-validator.ts
deleted file mode 100644
index 771c352c5..000000000
--- a/src/validators/portal/serve-validator.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Result } from "../../types/common/result.js";
-import { DirectoryValidator } from "../common/directoryValidator.js";
-
-export class PortalServeValidator {
-  private readonly directoryValidator: DirectoryValidator;
-
-  constructor() {
-    this.directoryValidator = new DirectoryValidator();
-  }
-
-  public async validateSourceDirectory(sourceDirectoryPath: string) : Promise<Result<string, string>> {
-    const sourceDirectoryValidationResult = this.directoryValidator.validateSourceDirectory(sourceDirectoryPath);
-    if (sourceDirectoryValidationResult.isFailed()) {
-      return Result.failure(sourceDirectoryValidationResult.error!);
-    }
-
-    return Result.success("Serve flags validated successfully.");
-  }
-}
diff --git a/test/validators/serve-validator.test.ts b/test/validators/serve-validator.test.ts
deleted file mode 100644
index 382ea04a9..000000000
--- a/test/validators/serve-validator.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import * as path from "path";
-import fsExtra from "fs-extra";
-import { expect } from "chai";
-import { dir as tmpDir, DirectoryResult } from "tmp-promise";
-import { PortalServeValidator } from "../../src/validators/portal/serve-validator.js";
-import { ServeFlags, ServePaths } from "../../src/types/portal/serve.js";
-
-describe("PortalServeValidator", () => {
-  let TEST_WORKING_DIR: string;
-  let TEST_DEST_DIR: string;
-  let validator: PortalServeValidator;
-  let tmpDirResult: DirectoryResult;
-
-  function getServeFlags(overrides: Partial<ServeFlags> = {}): ServeFlags {
-    return {
-      port: 3000,
-      folder: TEST_WORKING_DIR,
-      destination: TEST_DEST_DIR,
-      ignore: "",
-      open: false,
-      "auth-key": "",
-      "no-reload": false,
-      ...overrides
-    };
-  }
-
-  function getServePaths(flags: ServeFlags): ServePaths {
-    return {
-      sourceDirectoryPath: flags.folder,
-      destinationDirectoryPath: flags.destination,
-      generatedPortalArtifactsDirectoryPath: path.join(flags.destination, "generated_portal"),
-      generatedPortalArtifactsZipFilePath: path.join(flags.destination, ".generated_portal.zip")
-    };
-  }
-
-  beforeEach(async () => {
-    tmpDirResult = await tmpDir({ unsafeCleanup: true });
-    TEST_WORKING_DIR = tmpDirResult.path;
-    TEST_DEST_DIR = path.join(TEST_WORKING_DIR, "dest");
-    await fsExtra.ensureDir(TEST_WORKING_DIR);
-    await fsExtra.ensureDir(TEST_DEST_DIR);
-    await fsExtra.ensureDir(path.join(TEST_WORKING_DIR, "spec"))
-    await fsExtra.writeFile(path.join(TEST_WORKING_DIR, "APIMATIC-BUILD.json"), "{}", "utf8");
-    await fsExtra.writeFile(path.join(TEST_WORKING_DIR, "spec", "spec.json"), "{}", "utf8");
-    validator = new PortalServeValidator();
-  });
-
-  afterEach(async () => {
-    await tmpDirResult.cleanup();
-  });
-
-  it("should validate existing source directory", async () => {
-    const flags = getServeFlags();
-    const paths = getServePaths(flags);
-    const result = await validator.validateSourceDirectory(paths.sourceDirectoryPath);
-    expect(result.isSuccess()).to.be.true;
-  });
-
-  it("should validate non-existent source directory", async () => {
-    const nonExistentFolder = path.join(TEST_WORKING_DIR, "does-not-exist");
-    const flags = getServeFlags({ folder: nonExistentFolder });
-    const paths = getServePaths(flags);
-    const result = await validator.validateSourceDirectory(paths.sourceDirectoryPath);
-    expect(result.isFailed()).to.be.true;
-    expect(result.error).to.include("The specified source directory does not exist");
-  });
-
-  it("should fail if source directory is empty", async () => {
-    const src = path.join(TEST_WORKING_DIR, "no-buildfile-src");
-    const dest = path.join(TEST_WORKING_DIR, "no-buildfile-dest");
-    await fsExtra.ensureDir(src);
-    await fsExtra.ensureDir(dest);
-    const flags = getServeFlags({ folder: src, destination: dest });
-    const paths = getServePaths(flags);
-    const result = await validator.validateSourceDirectory(paths.sourceDirectoryPath);
-    expect(result.isFailed()).to.be.true;
-    expect(result.error).to.include("The source directory is empty.");
-    await fsExtra.remove(src);
-    await fsExtra.remove(dest);
-  });
-
-  it("should fail if APIMATIC-BUILD.json is missing", async () => {
-    const src = path.join(TEST_WORKING_DIR, "no-buildfile-src");
-    const dest = path.join(TEST_WORKING_DIR, "no-buildfile-dest");
-    await fsExtra.ensureDir(src);
-    await fsExtra.ensureDir(dest);
-    await fsExtra.ensureDir(path.join(src, "spec"));
-    await fsExtra.writeFile(path.join(src, "spec", "spec.json"), "{}", "utf8");
-    const flags = getServeFlags({ folder: src, destination: dest });
-    const paths = getServePaths(flags);
-    const result = await validator.validateSourceDirectory(paths.sourceDirectoryPath);
-    expect(result.isFailed()).to.be.true;
-    expect(result.error).to.include("The source directory is missing the 'APIMATIC-BUILD.json' file.");
-    await fsExtra.remove(src);
-    await fsExtra.remove(dest);
-  });
-}); 
\ No newline at end of file