diff --git a/spring-shell-docs/src/main/asciidoc/code/getting-started-run-interactive.out b/spring-shell-docs/modules/ROOT/examples/getting-started-run-interactive.out
similarity index 100%
rename from spring-shell-docs/src/main/asciidoc/code/getting-started-run-interactive.out
rename to spring-shell-docs/modules/ROOT/examples/getting-started-run-interactive.out
diff --git a/spring-shell-docs/src/main/asciidoc/code/getting-started-run-noninteractive.out b/spring-shell-docs/modules/ROOT/examples/getting-started-run-noninteractive.out
similarity index 100%
rename from spring-shell-docs/src/main/asciidoc/code/getting-started-run-noninteractive.out
rename to spring-shell-docs/modules/ROOT/examples/getting-started-run-noninteractive.out
diff --git a/spring-shell-docs/modules/ROOT/pages/getting-started.adoc b/spring-shell-docs/modules/ROOT/pages/getting-started.adoc
index 2b2dc448a..bc44c949f 100644
--- a/spring-shell-docs/modules/ROOT/pages/getting-started.adoc
+++ b/spring-shell-docs/modules/ROOT/pages/getting-started.adoc
@@ -77,12 +77,14 @@ Once compiled it can be run either in interactive mode:
[source, text, subs=attributes+]
----
+include::example$getting-started-run-interactive.out[]
----
Or in non-interactive mode:
[source, text, subs=attributes+]
----
+include::example$getting-started-run-noninteractive.out[]
----
TIP: Check out xref:using-shell-customization-logging.adoc[Logging] making logging to work
diff --git a/spring-shell-docs/src/main/asciidoc/images/component-confirmation-1.svg b/spring-shell-docs/src/main/asciidoc/images/component-confirmation-1.svg
deleted file mode 100644
index 32bd94cf1..000000000
--- a/spring-shell-docs/src/main/asciidoc/images/component-confirmation-1.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/spring-shell-docs/src/main/asciidoc/images/component-flow-conditional-1.svg b/spring-shell-docs/src/main/asciidoc/images/component-flow-conditional-1.svg
deleted file mode 100644
index 9cf2e97d5..000000000
--- a/spring-shell-docs/src/main/asciidoc/images/component-flow-conditional-1.svg
+++ /dev/null
@@ -1 +0,0 @@
-java-jarspring-shell-samples/target/spring-shell-samples-2.1.0-SNAPSHOT.jarmy-shell:>my-shell:>flowmy-shell:>flowconditional?Single1[Usearrowstomove],typetofilter>Field1Field2?Single1field1?Field1defaultField1Value?Single1field2?Field2defaultField2Valueorg.jline.reader.EndOfFileExceptionDetailsoftheerrorhavebeenomitted.Youcanusethestacktracecommandtoprintthefullstacktrace.my-shell:>fmy-shell:>flmy-shell:>flomy-shell:>flowcmy-shell:>flowcomy-shell:>flowcon?Field1[DefaultdefaultField1Value]Field1>Field2?Field2[DefaultdefaultField2Value]
\ No newline at end of file
diff --git a/spring-shell-docs/src/main/asciidoc/images/component-flow-showcase-1.svg b/spring-shell-docs/src/main/asciidoc/images/component-flow-showcase-1.svg
deleted file mode 100644
index 23363bb4a..000000000
--- a/spring-shell-docs/src/main/asciidoc/images/component-flow-showcase-1.svg
+++ /dev/null
@@ -1 +0,0 @@
-java-jarspring-shell-samples/target/spring-shell-samples-2.1.0-SNAPSHOT.jarmy-shell:>my-shell:>flowshowcase?Field1defaultField1Value?Field2hi?Confirmation1true>Pathok?Path1path?Single1[Usearrowstomove],typetofilter?Single1value2?Multi1[Usearrowstomove],typetofilter[]key2[]key3[x]key1>[]key2?Multi1value1?Field1[DefaultdefaultField1Value]?Field2?Field2h?Field2hi?Confirmation1(Y/n)?Path1?Path1p?Path1pa?Path1pat?Path1path>key1key2key1>key2>[]key1>[x]key1>[x]key2
\ No newline at end of file
diff --git a/spring-shell-docs/src/main/asciidoc/images/component-multi-select-1.svg b/spring-shell-docs/src/main/asciidoc/images/component-multi-select-1.svg
deleted file mode 100644
index a9928f51f..000000000
--- a/spring-shell-docs/src/main/asciidoc/images/component-multi-select-1.svg
+++ /dev/null
@@ -1 +0,0 @@
-java-jarspring-shell-samples/target/spring-shell-samples-2.1.0-SNAPSHOT.jarmy-shell:>my-shell:>componentmy-shell:>componentmulti?testSimple[Usearrowstomove],typetofilter>[]key1[]key2[]key3?testSimple[Usearrowstomove],filtering'k'?testSimple[Usearrowstomove],filtering'ke'?testSimple[Usearrowstomove],filtering'key'[x]key1>[]key2>[]key3>[x]key3?testSimplevalue1Gotvaluevalue1my-shell:>cmy-shell:>comy-shell:>commy-shell:>compmy-shell:>compomy-shell:>componmy-shell:>componemy-shell:>componenmy-shell:>componentmmy-shell:>componentmu?testSimple[Usearrowstomove],filtering'key1'>[x]key1my-shell:>my-shell:>
\ No newline at end of file
diff --git a/spring-shell-docs/src/main/asciidoc/images/component-path-input-1.svg b/spring-shell-docs/src/main/asciidoc/images/component-path-input-1.svg
deleted file mode 100644
index 54f764029..000000000
--- a/spring-shell-docs/src/main/asciidoc/images/component-path-input-1.svg
+++ /dev/null
@@ -1 +0,0 @@
-java-jarspring-shell-samples/target/spring-shell-samples-2.1.0-SNAPSHOT.jarmy-shell:>my-shell:>componentmy-shell:>componentpath>>>Directoryexists>Pathok?Entervalue/tmp/demoGotvalue/tmp/demomy-shell:>cmy-shell:>comy-shell:>commy-shell:>compmy-shell:>compomy-shell:>componmy-shell:>componemy-shell:>componenmy-shell:>componentpmy-shell:>componentpamy-shell:>componentpat?Entervalue?Entervalue/?Entervalue/t?Entervalue/tm?Entervalue/tmp?Entervalue/tmp/?Entervalue/tmp/d?Entervalue/tmp/de?Entervalue/tmp/dem?Entervalue/tmp/demomy-shell:>my-shell:>
\ No newline at end of file
diff --git a/spring-shell-docs/src/main/asciidoc/images/component-path-search-1.svg b/spring-shell-docs/src/main/asciidoc/images/component-path-search-1.svg
deleted file mode 100644
index 498b5be1f..000000000
--- a/spring-shell-docs/src/main/asciidoc/images/component-path-search-1.svg
+++ /dev/null
@@ -1 +0,0 @@
-java-jarspring-shell-samples/build/libs/spring-shell-samples.jarmy-shell:>my-shell:>componentpathsearch?Entervalue.ℹType'<path><pattern>'tosearch,20/27❯buildSrc/srcbuildSrc/src/mainbuildSrc/build.gradlebuildSrc/src/main/javabuildSrc/src/main/java/orgℹType'<path><pattern>'tosearch,19/27?Entervalue.gradle❯buildSrc/src/main/java/org/springframework/shell/gradlebuildSrc/src/main/java/org/springframework/shell/gradle/BomPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/DocsPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/SamplePlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/ModulePlugin.java?EntervaluebuildSrc/src/main/java/org/springframework/shell/gradleGotvaluebuildSrc/src/main/java/org/springframework/shell/gradle?EntervalueℹType'<path><pattern>'tosearch?Entervalue.g❯buildSrc/src/main/java/org/springframework/shell/gradlebuildSrc/src/main/java/org/springframework/shell/gradle/BomPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/DocsPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/RootPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/ModulePlugin.java?Entervalue.gr❯buildSrc/src/main/java/org/springframework/shell/gradlebuildSrc/src/main/java/org/springframework/shell/gradle/BomPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/RootPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/DocsPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/SamplePlugin.java?Entervalue.gra❯buildSrc/src/main/java/org/springframework/shell/gradlebuildSrc/src/main/java/org/springframework/shell/gradle/BomPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/RootPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/DocsPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/ModulePlugin.java?Entervalue.grad❯buildSrc/src/main/java/org/springframework/shell/gradlebuildSrc/src/main/java/org/springframework/shell/gradle/BomPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/DocsPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/ModulePlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/SamplePlugin.java?Entervalue.gradl❯buildSrc/src/main/java/org/springframework/shell/gradlebuildSrc/src/main/java/org/springframework/shell/gradle/BomPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/DocsPlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/SamplePlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle/ModulePlugin.javabuildSrc/src/main/java/org/springframework/shell/gradle❯buildSrc/src/main/java/org/springframework/shell/gradle/BomPlugin.javamy-shell:>my-shell:>
\ No newline at end of file
diff --git a/spring-shell-docs/src/main/asciidoc/images/component-single-select-1.svg b/spring-shell-docs/src/main/asciidoc/images/component-single-select-1.svg
deleted file mode 100644
index 42f461122..000000000
--- a/spring-shell-docs/src/main/asciidoc/images/component-single-select-1.svg
+++ /dev/null
@@ -1 +0,0 @@
-java-jarspring-shell-samples/target/spring-shell-samples-2.1.0-SNAPSHOT.jarmy-shell:>my-shell:>componentmy-shell:>componentsingle?testSimple[Usearrowstomove],typetofilter>key1key2key1>key2?testSimple[Usearrowstomove],filtering'k'?testSimple[Usearrowstomove],filtering'ke'?testSimple[Usearrowstomove],filtering'key'?testSimplevalue2Gotvaluevalue2my-shell:>cmy-shell:>comy-shell:>commy-shell:>compmy-shell:>compomy-shell:>componmy-shell:>componemy-shell:>componenmy-shell:>componentsmy-shell:>componentsimy-shell:>componentsin?testSimple[Usearrowstomove],filtering'key1'my-shell:>my-shell:>
\ No newline at end of file
diff --git a/spring-shell-docs/src/main/asciidoc/images/component-text-input-1.svg b/spring-shell-docs/src/main/asciidoc/images/component-text-input-1.svg
deleted file mode 100644
index 9f01dd37a..000000000
--- a/spring-shell-docs/src/main/asciidoc/images/component-text-input-1.svg
+++ /dev/null
@@ -1 +0,0 @@
-java-jarspring-shell-samples/target/spring-shell-samples-2.1.0-SNAPSHOT.jarmy-shell:>my-shell:>componentmy-shell:>componentstring?EntervaluehiGotvaluehimy-shell:>cmy-shell:>comy-shell:>commy-shell:>compmy-shell:>compomy-shell:>componmy-shell:>componemy-shell:>componenmy-shell:>componentsmy-shell:>componentstmy-shell:>componentstrmy-shell:>componentstrimy-shell:>componentstrin?Entervalue[Defaultmyvalue]?Entervalueh?Entervaluehimy-shell:>my-shell:>
\ No newline at end of file