diff --git a/.storybook/preview.js b/.storybook/preview.js
index e5e9a38c0..69cccf7ce 100755
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -29,7 +29,7 @@ async function run() {
       showRoots: true,
       storySort: sortEachDepth([
         ['Intro', 'Forms', 'Buttons', 'Overlays', 'Navigation', 'Localize', 'Icons', '...'],
-        ['Intro', 'Features Overview', '...', 'System'],
+        ['Intro', 'Features Overview', '...', 'Validation', 'System'],
         ['Overview', '...', '_internals'],
       ]),
     },
diff --git a/packages/validate/stories/02-ValidationExamples.stories.mdx b/packages/form-system/stories/17-Validation-Examples.stories.mdx
similarity index 91%
rename from packages/validate/stories/02-ValidationExamples.stories.mdx
rename to packages/form-system/stories/17-Validation-Examples.stories.mdx
index 77235d573..b6177d87e 100644
--- a/packages/validate/stories/02-ValidationExamples.stories.mdx
+++ b/packages/form-system/stories/17-Validation-Examples.stories.mdx
@@ -1,6 +1,6 @@
 import { Meta, Story, html } from '@open-wc/demoing-storybook';
 /* eslint-disable import/no-extraneous-dependencies */
-import { LionInput } from '@lion/input';
+import { LionInput } from '@lion/input/index.js';
 import '@lion/input-amount/lion-input-amount.js';
 import '@lion/input-date/lion-input-date.js';
 import '@lion/input-email/lion-input-email.js';
@@ -23,12 +23,15 @@ import {
   MinNumber,
   Required,
   Validator,
-} from '../index.js';
+} from '@lion/validate';
 
-<Meta title="Forms/Validation Examples" parameters={{ component: 'lion-input' }}/>
+<Meta title="Forms/Validation/Examples" parameters={{ component: 'lion-input' }}/>
 
 ## Required Validator
 
+The required validator can be put onto every form field element and will make sure that element is not empty.
+For an input that may mean that it is not an empty string while for a checkbox group it means at least one checkbox needs to be checked.
+
 <Story name="Required Validator">
   {html`
     <lion-input .validators=${[new Required()]} label="Required"></lion-input>
@@ -41,6 +44,8 @@ import {
 
 ## String Validators
 
+Useful on input elements it allows to define how many characters can be entered.
+
 <Story name="String Validators">
   {html`
     <lion-input
@@ -89,9 +94,11 @@ import {
 ></lion-input>
 ```
 
-
 ## Number Validators
 
+Number validations assume that it's modelValue is actually a number.
+Therefore it may only be used on input that have an appropriate parser/formatter like the input-amount.
+
 <Story name="Number Validators">
   {html`
   <lion-input-amount
@@ -142,6 +149,8 @@ import {
 
 ## Date Validators
 
+Date validators work with real javascript dates. Use them on input-date.
+
 <Story name="Date Validators">
   {() => {
     const today = new Date();
@@ -230,6 +239,9 @@ const tomorrow = new Date(year, month, day + 1);
 
 ## Validation Types
 
+When defining your own component you can decide to allow for multiple types of validation.
+By default only `error` is used however there are certainly use cases where warning or success messages make sense.
+
 <Story name="Validation Types">
   {() => {
     try {
@@ -287,16 +299,16 @@ const tomorrow = new Date(year, month, day + 1);
 </Story>
 
 ```js
-    try {
-      class MyTypesInput extends LionInput {
-        static get validationTypes() {
-          return ['error', 'warning', 'info', 'success'];
-        }
-      }
-      customElements.define('my-types-input', MyTypesInput);
-    } catch (err) {
-      // expected as it is a demo
+try {
+  class MyTypesInput extends LionInput {
+    static get validationTypes() {
+      return ['error', 'warning', 'info', 'success'];
     }
+  }
+  customElements.define('my-types-input', MyTypesInput);
+} catch (err) {
+  // expected as it is a demo
+}
 ```
 
 ```html
@@ -343,6 +355,9 @@ const tomorrow = new Date(year, month, day + 1);
 
 ## Custom Validators
 
+Here is an example how you can make your own validator and providing the error messages directly within.
+You can even hard code localization in there if needed or you can use a localization system.
+
 <Story name="Custom Validators">
   {() => {
     class MyValidator extends Validator {
@@ -404,6 +419,8 @@ class MyValidator extends Validator {
 
 ## Override default messages
 
+Oftern
+
 <Story name="Override default messages">
 {html`
   <lion-input
diff --git a/packages/validate/stories/01-ValidateSystemOverview.stories.mdx b/packages/validate/stories/Overview.stories.mdx
similarity index 99%
rename from packages/validate/stories/01-ValidateSystemOverview.stories.mdx
rename to packages/validate/stories/Overview.stories.mdx
index 7f5b4d56f..c9dd1c40b 100644
--- a/packages/validate/stories/01-ValidateSystemOverview.stories.mdx
+++ b/packages/validate/stories/Overview.stories.mdx
@@ -1,6 +1,6 @@
 import { Meta } from '@open-wc/demoing-storybook';
 
-<Meta title="Forms/System/Validate System" />
+<Meta title="Forms/Validation/Overview" />
 
 # Validation