diff --git a/README.md b/README.md
index ababe3c..bf69bb3 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 <div align="center">
  <h1>walt.id identity examples</h1>
- <p>This repository contains a few examples to quickly get you started with the waltid-identity code API.
+ <p>This repository contains a few examples to quickly get you started with the waltid-identity SDK.
 </p>
 
 <a href="https://walt.id/community">
@@ -30,22 +30,26 @@ For a selection of examples, please take a look at the following table:
 
 Follow the link to view the associated code example.
 
-You can also view samples in the test directories of the [identity repository](https://github.com/walt-id/waltid-identity).
+You can also view samples in the test directories of
+the [identity repository](https://github.com/walt-id/waltid-identity).
 
 ## Running the examples
 
 We're writing our projects with Gradle in mind; however, you can absolutely also use Apache Maven.
-Use the repository `https://maven.waltid.dev/releases`. For a web interface to list available artifacts and their current versions,
+Use the repository `https://maven.waltid.dev/releases`. For a web interface to list available artifacts and their
+current versions,
 visit https://maven.waltid.dev/#/releases/id/walt in your web browser.
 
 If you use Gradle with e.g., IntelliJ IDEA, you can simply run the examples by right-clicking them.
 
 ## Join the community
 
-* Connect and get the latest updates: <a href="https://discord.gg/AW8AgqJthZ">Discord</a> | <a href="https://walt.id/newsletter">
+* Connect and get the latest updates: <a href="https://discord.gg/AW8AgqJthZ">
+  Discord</a> | <a href="https://walt.id/newsletter">
   Newsletter</a> | <a href="https://www.youtube.com/channel/UCXfOzrv3PIvmur_CmwwmdLA">
   YouTube</a> | <a href="https://mobile.twitter.com/walt_id" target="_blank">Twitter</a>
-* Get help, request features and report bugs: <a href="https://github.com/walt-id/.github/discussions" target="_blank">GitHub
+* Get help, request features and report bugs: <a href="https://github.com/walt-id/.github/discussions" target="_blank">
+  GitHub
   Discussions</a>
 
 ## License
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 37f15e2..b01c612 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1 +1 @@
-rootProject.name = "identity-test"
+rootProject.name = "waltid-examples"
diff --git a/src/main/java/waltid/CustomKeyExample.java b/src/main/java/waltid/CustomKeyExample.java
index 4abcd7d..bd3d827 100644
--- a/src/main/java/waltid/CustomKeyExample.java
+++ b/src/main/java/waltid/CustomKeyExample.java
@@ -26,6 +26,23 @@ public CustomKeyExample(String xyz) {
         this._xyz = xyz;
     }
 
+    public static void runCustomKeyExample() {
+        var key = new CustomKeyExample("abc");
+        System.out.println("A type: " + key.getKeyType());
+
+        var plaintext = "plaintext".getBytes(StandardCharsets.UTF_8);
+        System.out.println("Plaintext: " + new String(plaintext, StandardCharsets.UTF_8));
+
+        var signed = (byte[]) key.javaSignRaw(plaintext);
+        System.out.println("Stub signed: " + new String(signed, StandardCharsets.UTF_8));
+
+        var verify = key.javaVerifyRaw(signed, plaintext);
+        System.out.println("Stub verified: " + new String(verify, StandardCharsets.UTF_8));
+    }
+
+    public static void main(String[] args) {
+        runCustomKeyExample();
+    }
 
     private byte[] reverseArray(byte[] arr) {
         for (int i = 0; i < arr.length / 2; i++) {
@@ -94,7 +111,7 @@ public String javaSignJws(@NotNull byte[] plaintext, @NotNull Map<String, String
 
         String myHeaders = base64.encodeToString("{\"my-headers\": \"xyz\"}".getBytes(StandardCharsets.UTF_8));
         String myPayload = base64.encodeToString("{\"my-payload\": \"xyz\"}".getBytes(StandardCharsets.UTF_8));
-        String mySignature = base64.encodeToString( javaSignRaw(plaintext));
+        String mySignature = base64.encodeToString(javaSignRaw(plaintext));
 
         return myHeaders + "." + myPayload + "." + mySignature;
     }
@@ -155,23 +172,5 @@ public KeyType javaGetKeyType() {
         };
     }
 
-    public static void main(String[] args) {
-        var key = new CustomKeyExample("abc");
-        System.out.println("A type: " + key.getKeyType());
-
-        var plaintext = "plaintext".getBytes(StandardCharsets.UTF_8);
-        System.out.println("Plaintext: " + new String(plaintext , StandardCharsets.UTF_8));
-
-        var signed = (byte[]) key.javaSignRaw(plaintext);
-        System.out.println("Stub signed: " + new String(signed , StandardCharsets.UTF_8));
-
-        var verify = key.javaVerifyRaw(signed, plaintext);
-        System.out.println("Stub verified: " + new String(verify , StandardCharsets.UTF_8));
-
-
-    }
-
-
-
 
 }
diff --git a/src/main/java/waltid/DidExamples.java b/src/main/java/waltid/DidExamples.java
index 59d1410..eb10d7d 100644
--- a/src/main/java/waltid/DidExamples.java
+++ b/src/main/java/waltid/DidExamples.java
@@ -9,9 +9,10 @@
 import id.walt.did.dids.registrar.dids.DidJwkCreateOptions;
 import id.walt.did.dids.registrar.dids.DidKeyCreateOptions;
 import id.walt.did.helpers.WaltidServices;
-import java.util.concurrent.ExecutionException;
 import kotlin.Result;
 
+import java.util.concurrent.ExecutionException;
+
 public class DidExamples {
 
     private static final DidService didService = DidService.INSTANCE;
@@ -19,7 +20,7 @@ public class DidExamples {
     public static String generateDidSync(Key key) {
         DidCreateOptions options = new DidJwkCreateOptions();
 
-        DidResult result =  didService.javaRegisterByKeyBlocking("jwk", key, options);
+        DidResult result = didService.javaRegisterByKeyBlocking("jwk", key, options);
 
         System.out.println("(sync) DID: " + result.getDid());
         System.out.println("(sync) DID document: " + result.getDidDocument());
@@ -42,7 +43,7 @@ private static void resolveDid(String did) throws ExecutionException, Interrupte
         System.out.println("Resolved: " + x);
     }
 
-    public static void main(String[] args) throws ExecutionException, InterruptedException {
+    public static void runDidExample() throws ExecutionException, InterruptedException {
         WaltidServices.INSTANCE.minimalInitBlocking();
         var key = JWKKey.Companion.generateBlocking(KeyType.Ed25519, null);
 
@@ -52,4 +53,8 @@ public static void main(String[] args) throws ExecutionException, InterruptedExc
         resolveDid(did);
     }
 
+    public static void main(String[] args) throws ExecutionException, InterruptedException {
+        runDidExample();
+    }
+
 }
diff --git a/src/main/java/waltid/KeysExamples.java b/src/main/java/waltid/KeysExamples.java
index c759c3d..677ccd7 100644
--- a/src/main/java/waltid/KeysExamples.java
+++ b/src/main/java/waltid/KeysExamples.java
@@ -3,11 +3,11 @@
 import id.walt.crypto.keys.Key;
 import id.walt.crypto.keys.KeyType;
 import id.walt.crypto.keys.jwk.JWKKey;
+import kotlin.Result;
+
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.concurrent.ExecutionException;
-import kotlin.Result;
 
 public class KeysExamples {
 
@@ -76,11 +76,16 @@ public static void importKey(String jwk) throws ExecutionException, InterruptedE
         System.out.println("Import result: " + keyImport);
     }
 
-    public static void main(String[] args) throws ExecutionException, InterruptedException {
+    public static void runKeyExample() throws ExecutionException, InterruptedException {
         KeysExamples.signAsync();
         KeysExamples.signBlocking();
 
         var jwk = exportKey();
         importKey(jwk);
     }
+
+
+    public static void main(String[] args) throws ExecutionException, InterruptedException {
+        runKeyExample();
+    }
 }
diff --git a/src/main/java/waltid/RunAll.java b/src/main/java/waltid/RunAll.java
new file mode 100644
index 0000000..2329e66
--- /dev/null
+++ b/src/main/java/waltid/RunAll.java
@@ -0,0 +1,17 @@
+package waltid;
+
+import java.util.concurrent.ExecutionException;
+
+import static waltid.CustomKeyExample.runCustomKeyExample;
+import static waltid.DidExamples.runDidExample;
+import static waltid.KeysExamples.runKeyExample;
+import static waltid.VcExamples.runVcExample;
+
+public class RunAll {
+    public static void main(String[] args) throws ExecutionException, InterruptedException {
+        runKeyExample();
+        runDidExample();
+        runVcExample();
+        runCustomKeyExample();
+    }
+}
diff --git a/src/main/java/waltid/VcExamples.java b/src/main/java/waltid/VcExamples.java
index fb6d270..a724f29 100644
--- a/src/main/java/waltid/VcExamples.java
+++ b/src/main/java/waltid/VcExamples.java
@@ -17,6 +17,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;
 
 public class VcExamples {
 
@@ -76,12 +77,13 @@ private static void verify(String signed) {
         }
     }
 
-
-    public static void main(String[] args) {
+    public static void runVcExample() {
         String signed = buildAndSignVC();
         verify(signed);
+    }
 
-
+    public static void main(String[] args) throws ExecutionException, InterruptedException {
+        runVcExample();
     }
 
 }
diff --git a/src/main/kotlin/RunAll.kt b/src/main/kotlin/RunAll.kt
index 0971a75..baf8531 100644
--- a/src/main/kotlin/RunAll.kt
+++ b/src/main/kotlin/RunAll.kt
@@ -1,24 +1,28 @@
-
 import crypto.create.create_ed25519
 import crypto.create.create_rsa
 import crypto.create.create_secp256k1
 import crypto.create.create_secp256r1
 import crypto.export_key.export_jwk
 import crypto.export_key.export_jwk_object
-import crypto.import_key.*
+import crypto.import_key.import_ed25519_jwk
+import crypto.import_key.import_rsa_jwk
+import crypto.import_key.import_secp256k1_jwk
+import crypto.import_key.import_secp256r1_jwk
 import vc.*
 
 
 suspend fun main() {
 
-    println("                _ _     _     _                                  _           \n" +
-            "               | | |   (_)   | |                                | |          \n" +
-            " __      ____ _| | |_   _  __| |   _____  ____ _ _ __ ___  _ __ | | ___  ___ \n" +
-            " \\ \\ /\\ / / _` | | __| | |/ _` |  / _ \\ \\/ / _` | '_ ` _ \\| '_ \\| |/ _ \\/ __|\n" +
-            "  \\ V  V / (_| | | |_ _| | (_| | |  __/>  < (_| | | | | | | |_) | |  __/\\__ \\\n" +
-            "   \\_/\\_/ \\__,_|_|\\__(_)_|\\__,_|  \\___/_/\\_\\__,_|_| |_| |_| .__/|_|\\___||___/\n" +
-            "                                                          | |                \n" +
-            "                                                          |_|    ")
+    println(
+        "                _ _     _     _                                  _           \n" +
+                "               | | |   (_)   | |                                | |          \n" +
+                " __      ____ _| | |_   _  __| |   _____  ____ _ _ __ ___  _ __ | | ___  ___ \n" +
+                " \\ \\ /\\ / / _` | | __| | |/ _` |  / _ \\ \\/ / _` | '_ ` _ \\| '_ \\| |/ _ \\/ __|\n" +
+                "  \\ V  V / (_| | | |_ _| | (_| | |  __/>  < (_| | | | | | | |_) | |  __/\\__ \\\n" +
+                "   \\_/\\_/ \\__,_|_|\\__(_)_|\\__,_|  \\___/_/\\_\\__,_|_| |_| |_| .__/|_|\\___||___/\n" +
+                "                                                          | |                \n" +
+                "                                                          |_|    "
+    )
 
     // Crypto
     println("create_ed25519() ----------------------------------------------------------------------------------------")
@@ -37,15 +41,15 @@ suspend fun main() {
     println("create_ed25519() ----------------------------------------------------------------------------------------")
     create_ed25519()
 
-    println("import_ed25519_jwk() ----------------------------------------------------------------------------------------")
+    println("import_ed25519_jwk() ------------------------------------------------------------------------------------")
     import_ed25519_jwk()
     println("import_rsa_jwk() ----------------------------------------------------------------------------------------")
     import_rsa_jwk()
     println("import_rsa_raw() ----------------------------------------------------------------------------------------")
     // FIXME import_rsa_raw()
-    println("import_secp256k1_jwk() ----------------------------------------------------------------------------------------")
+    println("import_secp256k1_jwk() ----------------------------------------------------------------------------------")
     import_secp256k1_jwk()
-    println("import_secp256r1_jwk() ----------------------------------------------------------------------------------------")
+    println("import_secp256r1_jwk() ----------------------------------------------------------------------------------")
     import_secp256r1_jwk()
 
     // DIDs