diff --git a/src/content/docs/cheerpj2/03-getting-started/applet-runner.mdx b/src/content/docs/cheerpj2/03-applet-runner.mdx
similarity index 97%
rename from src/content/docs/cheerpj2/03-getting-started/applet-runner.mdx
rename to src/content/docs/cheerpj2/03-applet-runner.mdx
index 1936e9fa..9ffca6f6 100644
--- a/src/content/docs/cheerpj2/03-getting-started/applet-runner.mdx
+++ b/src/content/docs/cheerpj2/03-applet-runner.mdx
@@ -3,7 +3,7 @@ title: CheerpJ Applet Runner
subtitle: Run Java applets without installing Java
---
-import LinkButton from "../../../../components/LinkButton.astro";
+import LinkButton from "../../../components/LinkButton.astro";
The CheerpJ Applet Runner is a browser extension that enables Java applets without requiring a local Java installation or to install deprecated plugins.
diff --git a/src/content/docs/cheerpj2/03-getting-started/00-Java-app.md b/src/content/docs/cheerpj2/03-getting-started/00-Java-app.md
new file mode 100644
index 00000000..cd4c8e6a
--- /dev/null
+++ b/src/content/docs/cheerpj2/03-getting-started/00-Java-app.md
@@ -0,0 +1,58 @@
+---
+title: Run a Java Application
+---
+
+CheerpJ can run a Java application in the browser with little to no modifications. This page will help you getting started with CheerpJ and running your first Java application in the browser.
+
+**To get started you will need:**
+
+- Your java application file(s)
+- An HTML file where your Java app will be wrapped
+- A simple HTTP server to test your webpage locally
+
+## 1. Create a basic HTML file
+
+Let's start by creating a simplet HTML file like the following example. Please notice the CheerpJ runtime environment has been integrated. In this example we are assuming your HTML file and your .jar files are under the same directory.
+
+```html title="index.html" {6, 9-16}
+
+
+
+
+ CheerpJ test
+
+
+
+
+
+```
+
+## 2. Host your page
+
+You can now serve this web page on a simple HTTP server, such as the http-server utility.
+
+```shell
+npm install http-server
+http-server [path] [options]
+```
+
+## What's going on?
+
+- CheerpJ loader is included from our cloud runtime as
+ ``.
+- CheerpJ runtime environment is initilized by `cheerpjInit()`.
+- `cheerpjCreateDisplay()` creates a graphical environment to contain all Java windows
+- `cheerpjRunMain()` executes the `main` method of `ChangeThisToYourClassName`. The second parameter is a `:` separated list of `.jar` files where application classes can be found (the classpath).
+- The `/app/` is a virtual file system mount point that reference the root of the web server this page is loaded from.
+
+## Further reading
+
+- [AOT optimization](/cheerpj2/guides/AOT-optimization)
+- [Runtime API](http://localhost:3000/cheerpj2/reference/Runtime-API)
diff --git a/src/content/docs/cheerpj2/03-getting-started/01-Getting-Started.md b/src/content/docs/cheerpj2/03-getting-started/01-Getting-Started.md
deleted file mode 100644
index 7a26adf7..00000000
--- a/src/content/docs/cheerpj2/03-getting-started/01-Getting-Started.md
+++ /dev/null
@@ -1,123 +0,0 @@
----
-title: Getting started
----
-
-This page will help you getting started with CheerpJ and converting your first Java application to JavaScript in no time.
-
-To start, make sure to download the latest available version of CheerpJ [here](https://leaningtech.com/download-cheerpj/). Decompress the CheerpJ 2.3 archive anywhere, for example in `~/cheerpj_2.3` or `/Applications/cheerpj_2.3/`.
-
-**Important:** Converting an applet is documented at the bottom of this page.
-
-## Converting from .jar to .jar.js
-
-### Converting a single .jar file
-
-`cheerpjfy.py` is an helper script that automatically takes care of unpacking, compiling and optimising a whole JAR archive. Using `cheerpjfy.py` is the recommended way of compiling applications and libraries using CheerpJ.
-
-The basic usage is very simple:
-
-```shell
-/Applications/cheerpj_2.3/cheerpjfy.py my_application_archive.jar
-```
-
-This command will generate a file called `my_application_archive.jar.js`, which needs to be deployed in the same folder of the original .JAR archive, and hosted on a web server. Instructions on how to serve the converted JavaScript on a web page are provided below.
-
-**Important:** The files _must_ be accessed through a Web server. Trying to open the HTML page directly from the disk is not supported. The URL must look like `http://127.0.0.1:8080/cheerpj_test.html`, if it looks like `file://c/users/Test/cheerpj_test.html` CheerpJ won't be able to start.
-
-**Note to Windows users:** You will need to have python3 installed on the system. Python provides a launcher called `py` that will automatically detect and use the right version of python for a given script. To use `cheerpjfy.py` on Windows you need to prefix all the commands with `py`, for example:
-
-```shell
-py c:\cheerpj_2.3\cheerpjfy.py application.jar
-```
-
-### Converting multiple .jar files
-
-If your JAR has any dependencies in the form of further JAR archives, the `cheerpjfy.py` command line must be modified as follows:
-
-```shell
-/Applications/cheerpj_2.3/cheerpjfy.py --deps my_dependency_archive.jar my_application_archive.jar
-```
-
-This command will generate `my_application_archive.jar.js` but **not** `my_dependency_archive.jar.js`. Each archive should be compiled separately by invoking `~/cheerpj_2.3/cheerpjfy.py my_dependency_archive.jar`.
-
-It is in general safe to put the target JAR in the `--deps` list, although it is not required. If you have an application composed of many JARs you can do something like this:
-
-```
-for f in one.jar two.jar three.jar
-do
- ~/cheerpj_2.3/cheerpjfy.py --deps one.jar:two.jar:three.jar $f
-done
-```
-
-## Basic HTML page for testing a Java application
-
-```html title="index.html"
-
-
-
-
- CheerpJ test
-
-
-
-
-
-```
-
-This page will initialize the CheerpJ system, create a graphical environment to contain all Java windows and then execute the `main` method of `ChangeThisToYourClassName`. The second parameter of cheerpjRunMain is a `:` separated list of JARs where application classes can be found (the classpath). The `/app/` is a virtual file system mount point that reference the root of the web server this page is loaded from.
-
-You can now serve this web page on a simple HTTP server, such as the http-server utility.
-
-```shell
-http-server [path] [options]
-```
-
-## Converting an applet
-
-Applets can be run by Chrome users using the [CheerpJ Applet Runner](https://chrome.google.com/webstore/detail/cheerpj-applet-runner-bet/bbmolahhldcbngedljfadjlognfaaein) Chrome extension. You can also compile the applet ahead of time using the method described above.
-
-To support all browsers, you can add the following tags to your page:
-
-```html
-
-
-```
-
-This should be sufficient to get the applet to run on any browser, with the pre-compiled JAR.JS's files deployed in the same directory of the original JAR files. The `cheerpjInit({enablePreciseAppletArchives:true});` call can be done during page initialization.
-
-To avoid potential conflicts with native Java we recommend replacing the original HTML tag with `cheerpj-` prefixed version. You should use ``, `` or `` depending on the original tag.
-
-## Basic HTML page for testing a Java applet
-
-```html title="index.html"
-
-
-
-
- CheerpJ applet test
-
-
-
-
-
- not able to load Java applet
-
-
-
-```
diff --git a/src/content/docs/cheerpj2/03-getting-started/01-Java-applet.mdx b/src/content/docs/cheerpj2/03-getting-started/01-Java-applet.mdx
new file mode 100644
index 00000000..173b3215
--- /dev/null
+++ b/src/content/docs/cheerpj2/03-getting-started/01-Java-applet.mdx
@@ -0,0 +1,92 @@
+---
+title: Run a Java Applet
+---
+
+import LinkButton from "../../../../components/LinkButton.astro";
+
+CheerpJ can run Java applets in the browser seamlessly. This page will help you getting started with CheerpJ for Java applets.
+
+**There are two different ways to run a Java Applet in the browser:**
+
+- Running your own Java applet using the CheerpJ runtime environment and the `` tag in your own webpage.
+- Running a public applet using the [CheerpJ Applet Runner](https://chrome.google.com/webstore/detail/cheerpj-applet-runner-bet/) Chrome extension for applets integrated with the applet tag `