diff --git a/README.md b/README.md
index fb116fc4..2f5169b6 100644
--- a/README.md
+++ b/README.md
@@ -101,13 +101,13 @@ mvn clean test
 > 
 > ![](illustrations/intellij-maven-runner-configuration.png)
 
-API Server
+API Server : [jsgenerator-api](./README.api.md)
 ```shell
 # After starting the server, visit http://localhost:8080
 mvn --also-make --projects jsgenerator-api clean spring-boot:run
 ```
 
-Command Line Interface (CLI)
+Command Line Interface (CLI) : [jsgenerator-cli](./README.cli.md)
 ```shell
 # After reading the help, play out with different CLI options
 mvn --also-make --projects jsgenerator-cli clean spring-boot:run -Dspring-boot.run.arguments=--help
@@ -121,9 +121,6 @@ mvn --also-make --projects :jsgenerator-cli clean spring-boot:run -Dspring-boot.
 ```shell
 # Will compile all the modules into JAR (or FAT JAR - see the table above)
 mvn clean package
-
-# Additionally, build CLI into native executable (require GraalVM - see requirements above)
-./cli-build.sh
 ```
 
 # Contribute
diff --git a/cli-build.sh b/cli-build.sh
deleted file mode 100755
index a9fca043..00000000
--- a/cli-build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env sh
-set -euxo
-
-_NATIVE_DIRECTORY="$(mktemp --directory --tmpdir="$(dirname "$(realpath "$0")")/jsgenerator-cli/target" native-XXXXXX)"
-cat "$(dirname "$(realpath "$0")")/jsgenerator-cli/target/"*.original > "${_NATIVE_DIRECTORY}/jsgenerator-cli.jar"
-
-unzip ./jsgenerator-cli/target/*.jar -d "${_NATIVE_DIRECTORY}/"
-_CLASSPATH="$(find "${_NATIVE_DIRECTORY}/BOOT-INF/lib" | tr '\n' ':')"
-_CLASSPATH="${_NATIVE_DIRECTORY}/jsgenerator-cli.jar:${_CLASSPATH}:${_NATIVE_DIRECTORY}/BOOT-INF/classes"
-
-cp -R "${_NATIVE_DIRECTORY}/META-INF" "${_NATIVE_DIRECTORY}/BOOT-INF/classes"
-native-image \
-  "-H:Name=${1:-jsgenerator}" \
-  --class-path "${_CLASSPATH}" \
-  --module-path "${_CLASSPATH}" \
-  --module com.osscameroon.jsgenerator.cli/com.osscameroon.jsgenerator.cli.JsGeneratorCli