You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2021/09/23 14:44:20 UTC

[myfaces-tobago] 01/09: demo: Enhancements for Tobago 5.x

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git

commit 7e77757066c47ba4b5111f84d857c058551ea8a7
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Sep 23 11:56:47 2021 +0200

    demo: Enhancements for Tobago 5.x
    
    * Restructure the menu
    
    issue: TOBAGO-1843
---
 .../10-getting-started/Getting_Started.xhtml       |  0
 .../{10-intro => 000-intro}/20-docker/Docker.xhtml |  0
 .../30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml    |  0
 .../30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml    |  0
 .../30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml    |  0
 .../30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml    |  0
 .../30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml    |  0
 .../30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml    |  0
 .../30-whats-new/70-new-in-4-0/Tobago_4.xhtml      | 16 ++++++------
 .../30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml    |  0
 .../30-whats-new/80-new-in-3-0/Tobago_3.xhtml      | 28 ++++++++++----------
 .../30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml    |  0
 .../30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml    |  0
 .../30-whats-new/90-new-in-2-0/Tobago_2.xhtml      |  2 +-
 .../30-whats-new/What's_New.xhtml                  | 22 ++++++++--------
 .../50-migration/95-migration/4.0_to_5.0.xhtml     |  0
 .../95-migration/ConvertXmlToProperties.java       |  0
 .../50-migration/96-migration/3.0_to_4.0.xhtml     |  2 +-
 .../50-migration/96-migration/migrate4-layout.sh   |  0
 .../50-migration/97-migration/2.0_to_3.0.xhtml     |  4 +--
 .../50-migration/98-migration/1.5_to_2.0.xhtml     |  0
 .../50-migration/99-migration/1.0_to_1.5.xhtml     |  0
 .../50-migration/Migration.xhtml                   | 10 ++++----
 .../60-compatibility/Compatibility.xhtml           |  0
 .../{10-intro => 000-intro}/70-faq/FAQ.xhtml       |  0
 .../{10-intro => 000-intro}/80-api/API.xhtml       |  0
 .../85-download/Download.xhtml                     |  0
 .../90-release-checklist/Release_Checklist.xhtml   |  0
 .../90-release-checklist/drop-artifacts.sh         |  0
 .../90-release-checklist/release-artifacts.sh      |  0
 .../content/{10-intro => 000-intro}/Intro.test.js  |  0
 .../content/{10-intro => 000-intro}/Intro.xhtml    |  2 +-
 .../{20-component => }/010-input/10-in/In.test.js  |  0
 .../{20-component => }/010-input/10-in/In.xhtml    |  0
 .../010-input/20-suggest/Suggest.test.js           |  0
 .../010-input/20-suggest/Suggest.xhtml             |  0
 .../010-input/30-textarea/Textarea.xhtml           |  2 +-
 .../010-input/40-date/Date.test.js                 |  0
 .../010-input/40-date/Date.xhtml                   |  0
 .../010-input/45-range/Range.xhtml                 |  0
 .../010-input/50-input-group/Group.test.js         |  0
 .../010-input/50-input-group/Group.xhtml           |  0
 .../010-input/80-stars/5_Star_Rating.xhtml         |  0
 .../{20-component => }/010-input/Input.xhtml       |  0
 .../{20-component => }/020-output/10-out/Out.xhtml |  0
 .../020-output/20-label/Label.xhtml                |  0
 .../020-output/25-badge/Badge.xhtml                |  0
 .../020-output/40-image/Image.xhtml                |  0
 .../020-output/45-figure/Figure.xhtml              |  0
 .../020-output/50-progress/Progress.xhtml          |  0
 .../020-output/60-object/Object.xhtml              |  2 +-
 .../020-output/60-object/object.js                 |  0
 .../{20-component => }/020-output/Output.xhtml     |  0
 .../10-selectBooleanCheckbox/Checkbox.test.js      |  0
 .../10-selectBooleanCheckbox/Checkbox.xhtml        |  0
 .../15-selectBooleanToggle/Toggle.test.js          |  0
 .../030-select/15-selectBooleanToggle/Toggle.xhtml |  0
 .../030-select/20-selectOneChoice/Dropdown.test.js |  0
 .../030-select/20-selectOneChoice/Dropdown.xhtml   |  0
 .../030-select/30-selectOneRadio/Radio.test.js     |  0
 .../030-select/30-selectOneRadio/Radio.xhtml       |  0
 .../030-select/40-selectOneListbox/Listbox.test.js |  0
 .../030-select/40-selectOneListbox/Listbox.xhtml   |  0
 .../50-selectManyCheckbox/Multi_Checkbox.test.js   |  0
 .../50-selectManyCheckbox/Multi_Checkbox.xhtml     |  0
 .../60-selectManyListbox/Multi_Listbox.xhtml       |  0
 .../70-selectManyShuttle/Shuttle.test.js           |  0
 .../030-select/70-selectManyShuttle/Shuttle.xhtml  |  0
 .../{20-component => }/030-select/Select.xhtml     |  0
 .../00-button-link/Button_and_Link.xhtml           |  6 ++---
 .../040-command/00-button-link/sample.html         |  0
 .../040-command/00-button-link/sample_de.html      |  0
 .../040-command/10-default/Default_Command.xhtml   |  0
 .../040-command/20-buttons/Button_Group.test.js    |  0
 .../040-command/20-buttons/Button_Group.xhtml      |  0
 .../21-buttons-customizer/Customizer.xhtml         |  0
 .../x-buttons-item-delete.xhtml                    |  0
 .../x-buttons-item-edit.xhtml                      |  0
 .../21-buttons-customizer/x-buttons-item-new.xhtml |  0
 .../040-command/25-links/Link_Group.xhtml          |  0
 .../{20-component => }/040-command/Command.xhtml   |  0
 .../050-container/10-box/Box.test.js               |  0
 .../050-container/10-box/Box.xhtml                 |  0
 .../050-container/20-panel/Panel.xhtml             |  0
 .../050-container/30-separator/Separator.xhtml     |  0
 .../050-container/40-section/Section.test.js       |  0
 .../050-container/40-section/Section.xhtml         |  0
 .../50-header-footer/Header_and_Footer.xhtml       |  0
 .../50-header-footer/x-header-footer-example.xhtml |  0
 .../050-container/60-bar/Bar.xhtml                 | 30 +++++++++++-----------
 .../050-container/Container.xhtml                  |  0
 .../{20-component => }/060-popup/Popup.test.js     |  0
 .../{20-component => }/060-popup/Popup.xhtml       |  0
 .../070-tab/00-client/Tab_Client.xhtml             |  0
 .../070-tab/01-ajax/Tab_Ajax.xhtml                 |  0
 .../070-tab/02-server/Tab_Server.xhtml             |  0
 .../{20-component => }/070-tab/Tab_Group.test.js   |  0
 .../{20-component => }/070-tab/Tab_Group.xhtml     |  0
 .../080-sheet/10-sort/Sheet_Sorting.test.js        |  0
 .../080-sheet/10-sort/Sheet_Sorting.xhtml          |  0
 .../20-selector/Sheet_Column_Selector.xhtml        |  0
 .../080-sheet/30-event/Sheet_Event.test.js         |  0
 .../080-sheet/30-event/Sheet_Event.xhtml           |  0
 .../080-sheet/35-markup/Sheet_Markup.xhtml         |  0
 .../080-sheet/40-style/Sheet_Style.xhtml           |  0
 .../080-sheet/50-filter/Sheet_Filter.xhtml         |  0
 .../55-staticheader/Sheet_Static_Header.xhtml      |  2 +-
 .../60-multiheader/Sheet_Multi_Header.xhtml        |  0
 .../080-sheet/70-tree/Sheet_Tree.test.js           |  0
 .../080-sheet/70-tree/Sheet_Tree.xhtml             |  0
 .../080-sheet/80-editable/Sheet_Editable.xhtml     |  0
 .../080-sheet/90-lazy/Sheet_Lazy.xhtml             |  0
 .../{20-component => }/080-sheet/Sheet.xhtml       |  0
 .../080-sheet/x-sheet-nested.xhtml                 |  0
 .../090-tree/00-command/Tree_Command_Types.test.js |  0
 .../090-tree/00-command/Tree_Command_Types.xhtml   |  0
 .../090-tree/01-select/Tree_Select.test.js         |  0
 .../090-tree/01-select/Tree_Select.xhtml           |  0
 .../090-tree/02-editor/Tree_Editor.xhtml           |  0
 .../090-tree/03-menu/Tree_Menu.xhtml               |  0
 .../090-tree/04-listbox/Tree_Listbox.test.js       |  0
 .../090-tree/04-listbox/Tree_Listbox.xhtml         |  0
 .../content/{20-component => }/090-tree/Tree.xhtml |  4 +--
 .../100-upload/File_Upload.xhtml                   |  0
 .../110-wysiwyg/00-tinymce/TinyMCE.xhtml           |  2 +-
 .../110-wysiwyg/00-tinymce/init-tinymce.js         |  0
 .../110-wysiwyg/01-ckeditor/CKEditor.xhtml         |  2 +-
 .../110-wysiwyg/01-ckeditor/init-ckeditor.js       |  0
 .../110-wysiwyg/WYSIWYG_Editor.xhtml               |  0
 .../webapp/content/20-component/Component.xhtml    | 27 -------------------
 .../webapp/content/30-concept/08-form/Form.xhtml   |  2 +-
 .../content/30-concept/12-browser/Browser.xhtml    |  2 +-
 .../content/30-concept/30-behavior/Behavior.xhtml  |  2 +-
 .../00-collapsible-box/Collapsible_Box.xhtml       |  2 +-
 .../10-collapsible-popup/Collapsible_Popup.xhtml   |  2 +-
 .../20-collapsible-panel/Collapsible_Panel.xhtml   |  2 +-
 .../Collapsible_Section.xhtml                      |  2 +-
 .../30-concept/53-collapsible/Collapsible.xhtml    |  8 +++---
 .../content/40-test/9000-attribute/Attribute.xhtml |  2 +-
 .../src/main/webapp/content/40-test/Test.xhtml     |  2 +-
 140 files changed, 81 insertions(+), 108 deletions(-)

diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/Getting_Started.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/10-getting-started/Getting_Started.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/10-getting-started/Getting_Started.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/10-getting-started/Getting_Started.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/20-docker/Docker.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/20-docker/Docker.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/20-docker/Docker.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/20-docker/Docker.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml
similarity index 91%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml
index 59ca6c4..ad734e5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml
@@ -32,7 +32,7 @@
       In general, the step to version 4 is quite compatible,
       so the migration is easy. Please follow the
       <tc:link label="Migration from Tobago 3 to 4"
-               outcome="/content/10-intro/50-migration/96-migration/3.0_to_4.0.xhtml"/>
+               outcome="/content/000-intro/50-migration/96-migration/3.0_to_4.0.xhtml"/>
       guide.
     </p>
   </tc:section>
@@ -84,10 +84,10 @@
       <p><b>New components supported</b><br/>
         Styles can be used in:</p>
       <ul>
-        <li><tc:link label="&lt;tc:bar>" outcome="/content/20-component/050-container/60-bar/Bar.xhtml"/></li>
+        <li><tc:link label="&lt;tc:bar>" outcome="/content/050-container/60-bar/Bar.xhtml"/></li>
         <li><tc:link label="&lt;tc:link>"
-                     outcome="/content/20-component/040-command/00-button-link/Button_and_Link.xhtml"/></li>
-        <li><tc:link label="&lt;tc:tab>" outcome="/content/20-component/070-tab/Tab.xhtml"/></li>
+                     outcome="/content/040-command/00-button-link/Button_and_Link.xhtml"/></li>
+        <li><tc:link label="&lt;tc:tab>" outcome="/content/070-tab/Tab.xhtml"/></li>
       </ul>
     </tc:section>
 
@@ -97,9 +97,9 @@
 
       <p>New markups:</p>
       <ul>
-        <li><tc:link label="&lt;tc:bar>" outcome="/content/20-component/050-container/60-bar/Bar.xhtml"
+        <li><tc:link label="&lt;tc:bar>" outcome="/content/050-container/60-bar/Bar.xhtml"
                      fragment="page:mainForm:backgroundColor"/>: <code>light</code>, <code>dark</code></li>
-        <li><tc:link label="&lt;tc:button>" outcome="/content/20-component/040-command/00-button-link/Button_and_Link.xhtml"
+        <li><tc:link label="&lt;tc:button>" outcome="/content/040-command/00-button-link/Button_and_Link.xhtml"
                      fragment="page:mainForm:markup"/>:
           <code>primary</code>,
           <code>secondary</code>,
@@ -110,9 +110,9 @@
           <code>light</code>,
           <code>dark</code>,
           <code>none</code></li>
-        <li><tc:link label="&lt;tc:in>" outcome="/content/20-component/010-input/20-suggest/Suggest.xhtml"
+        <li><tc:link label="&lt;tc:in>" outcome="/content/010-input/20-suggest/Suggest.xhtml"
                      fragment="page:mainForm:localMenu"/> with &lt;tc:suggest>: <code>localMenu</code></li>
-        <li><tc:link label="&lt;tc:popup>" outcome="/content/20-component/060-popup/Popup.xhtml"
+        <li><tc:link label="&lt;tc:popup>" outcome="/content/060-popup/Popup.xhtml"
                      fragment="page:mainForm:markup"/>: <code>small</code>, <code>large</code></li>
       </ul>
     </tc:section>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml
similarity index 81%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml
index 5b7c6c4..2252b48 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml
@@ -29,7 +29,7 @@
     <tc:link label="Jira" image="bi-box-arrow-up-right" link="#{apiController.getJiraUrl('3.0.0')}"/>.
     and most of them are exclusive in this version.</p>
   <p>Please take also a look at the <tc:link label="Migration from Tobago 2.0 to 3.0"
-                                             outcome="/content/10-intro/50-migration/97-migration/2.0_to_3.0.xhtml"/> guide.</p>
+                                             outcome="/content/000-intro/50-migration/97-migration/2.0_to_3.0.xhtml"/> guide.</p>
 
   <tc:section label="Overview and History">
     <p>Until Tobago 2.0 the layout was computed on the server, to make advanced features available for comfortable web
@@ -61,43 +61,43 @@
     <b>New tags</b>
     <ul>
       <li><tc:link label="&lt;tc:section>"
-                   outcome="/content/20-component/050-container/40-section/Section.xhtml"/>
+                   outcome="/content/050-container/40-section/Section.xhtml"/>
       </li>
       <li><tc:link label="&lt;tc:header> &amp; &lt;tc:footer>"
-                   outcome="/content/20-component/050-container/50-header+footer/Header_and_Footer.xhtml"/>
+                   outcome="/content/050-container/50-header+footer/Header_and_Footer.xhtml"/>
       </li>
       <li><tc:link label="&lt;tc:figure>"
-                   outcome="/content/20-component/020-output/45-figure/Figure.xhtml"/></li>
+                   outcome="/content/020-output/45-figure/Figure.xhtml"/></li>
     </ul>
 
     <b>Improved tags</b>
     <ul>
       <li>The <code class="language-markup">&lt;tc:in/></code> tag may be extended to an
         <tc:link label="Input Group"
-                 outcome="/content/20-component/010-input/50-input-group/Group.xhtml"/>.
+                 outcome="/content/010-input/50-input-group/Group.xhtml"/>.
       </li>
       <li>A <code>size</code> attribute is added for
         <ul>
           <li><tc:link label="&lt;tc:selectOneListbox>"
-                       outcome="/content/20-component/030-select/40-selectOneListbox/Listbox.xhtml"/>,
+                       outcome="/content/030-select/40-selectOneListbox/Listbox.xhtml"/>,
           </li>
           <li><tc:link label="&lt;tc:selectManyListbox>"
-                       outcome="/content/20-component/030-select/60-selectManyListbox/Multi_Listbox.xhtml"/>,
+                       outcome="/content/030-select/60-selectManyListbox/Multi_Listbox.xhtml"/>,
           </li>
           <li><tc:link label="&lt;tc:selectManyShuffle>"
-                       outcome="/content/20-component/030-select/70-selectManyShuttle/Shuttle.xhtml"/> and
+                       outcome="/content/030-select/70-selectManyShuttle/Shuttle.xhtml"/> and
           </li>
           <li><tc:link label="&lt;tc:treeListbox>"
-                       outcome="/content/20-component/090-tree/04-listbox/Tree_Listbox.xhtml"/>.
+                       outcome="/content/090-tree/04-listbox/Tree_Listbox.xhtml"/>.
           </li>
         </ul>
       </li>
       <li>Only <code>disabled="true"</code> must be set to disable an
         <tc:link label="image"
-                 outcome="/content/20-component/020-output/40-image/Image.xhtml"/>.
+                 outcome="/content/020-output/40-image/Image.xhtml"/>.
       </li>
       <li><tc:link label="&lt;tc:sheet>"
-                   outcome="/content/20-component/080-sheet/Sheet.xhtml"/>
+                   outcome="/content/080-sheet/Sheet.xhtml"/>
         <ul>
           <li>Constraints are no longer needed to set a multi-line header.</li>
           <li>A width can be defined for columns which will influence the auto layout of the browser.</li>
@@ -130,14 +130,14 @@
       <li>ResourceBundles support parameters</li>
       <li>The <code>lang</code> attribute of the HTML root tag will be rendered now.</li>
       <li><tc:link label="Messages"
-                   outcome="/content/20-component/020-output/30-messages/Messages.xhtml"/>
+                   outcome="/content/020-output/30-messages/Messages.xhtml"/>
         are closeable now.
       </li>
       <li>Custom CSS classes can be added to a component.</li>
       <li>Support more units than 'px'. Now ex, em, mm, cm, in can be used as well.</li>
       <li>The <code>link</code> attribute of
         <tc:link label="Button and Link"
-                 outcome="/content/20-component/040-command/00-button-link/Button_and_Link.xhtml"/>
+                 outcome="/content/040-command/00-button-link/Button_and_Link.xhtml"/>
         does support rightClick -&gt; newTab.
       </li>
     </ul>
@@ -150,7 +150,7 @@
       <li>JSP support removed.</li>
       <li>The tag <code lang="language-markup">&lt;tc:time></code> is removed. Use
         <tc:link label="&lt;tc:date>"
-                 outcome="/content/20-component/010-input/40-date/Date.xhtml"/> instead.
+                 outcome="/content/010-input/40-date/Date.xhtml"/> instead.
       </li>
     </ul>
   </tc:section>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml
similarity index 98%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml
index 8e0c206..ffa2b01 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml
@@ -29,7 +29,7 @@
     and most of them are exclusive in this version.</p>
   <p>Please take also a look at the
     <tc:link label="Migration from Tobago 1.5 to 2.0"
-             outcome="/content/10-intro/50-migration/98-migration/1.5_to_2.0.xhtml"/>
+             outcome="/content/000-intro/50-migration/98-migration/1.5_to_2.0.xhtml"/>
     guide.</p>
   <tc:section label="Enhancements">
     <b>Date- and Time-Picker</b>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/What's_New.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/What's_New.xhtml
similarity index 66%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/What's_New.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/What's_New.xhtml
index a1792fc..cd6f663 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-whats-new/What's_New.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/What's_New.xhtml
@@ -28,47 +28,47 @@
   <ul>
     <li>
       <tc:link label="Tobago 5"
-               outcome="/content/10-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml"/>
+               outcome="/content/000-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml"/>
     </li>
     <li>
       <tc:link label="Tobago 4.5"
-               outcome="/content/10-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml"/>
+               outcome="/content/000-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml"/>
     </li>
     <li>
       <tc:link label="Tobago 4.4"
-               outcome="/content/10-intro/30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml"/>
+               outcome="/content/000-intro/30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml"/>
     </li>
     <li>
       <tc:link label="Tobago 4.3"
-               outcome="/content/10-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml"/>
+               outcome="/content/000-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml"/>
     </li>
     <li>
       <tc:link label="Tobago 4.2"
-               outcome="/content/10-intro/30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml"/>
+               outcome="/content/000-intro/30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml"/>
     </li>
     <li>
       <tc:link label="Tobago 4.1"
-               outcome="/content/10-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml"/>
+               outcome="/content/000-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml"/>
     </li>
     <li>
       <tc:link label="Tobago 4"
-               outcome="/content/10-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml"/>
+               outcome="/content/000-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml"/>
     </li>
     <li>
       <tc:link label="Tobago 3.1"
-               outcome="/content/10-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml"/>
+               outcome="/content/000-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml"/>
     </li>
     <li>
       <tc:link label="Tobago 3"
-               outcome="/content/10-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml"/>
+               outcome="/content/000-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml"/>
     </li>
     <li>
       <tc:link label="Tobago 2.2"
-               outcome="/content/10-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml"/>
+               outcome="/content/000-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml"/>
     </li>
     <li>
       <tc:link label="Tobago 2"
-               outcome="/content/10-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml"/>
+               outcome="/content/000-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml"/>
     </li>
   </ul>
   <p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/95-migration/4.0_to_5.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/95-migration/4.0_to_5.0.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/95-migration/4.0_to_5.0.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/95-migration/4.0_to_5.0.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/95-migration/ConvertXmlToProperties.java b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/95-migration/ConvertXmlToProperties.java
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/95-migration/ConvertXmlToProperties.java
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/95-migration/ConvertXmlToProperties.java
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/3.0_to_4.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/96-migration/3.0_to_4.0.xhtml
similarity index 99%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/3.0_to_4.0.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/96-migration/3.0_to_4.0.xhtml
index eef5a0f..d7e521b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/3.0_to_4.0.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/96-migration/3.0_to_4.0.xhtml
@@ -101,7 +101,7 @@
 &lt;/tc:bar></demo-highlight>
         <p>Also new markups are added to change collapse/expand behavior and color scheme.
           For more information have a look at
-          <tc:link label="tc:bar" outcome="/content/20-component/050-container/60-bar/Bar.xhtml"/></p>
+          <tc:link label="tc:bar" outcome="/content/050-container/60-bar/Bar.xhtml"/></p>
       </tc:section>
     </tc:section>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/migrate4-layout.sh b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/96-migration/migrate4-layout.sh
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/migrate4-layout.sh
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/96-migration/migrate4-layout.sh
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/2.0_to_3.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/97-migration/2.0_to_3.0.xhtml
similarity index 98%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/2.0_to_3.0.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/97-migration/2.0_to_3.0.xhtml
index da1e7d9..0fc3fd1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/2.0_to_3.0.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/97-migration/2.0_to_3.0.xhtml
@@ -112,7 +112,7 @@
         tc:column with f:facet name="dropDownBox" can now easily and much more flexible implemented with
         the header facet of the tc:sheet. Example:
         <tc:link label="Sheet Filter"
-                 outcome="/content/20-component/080-sheet/50-filter/Sheet_Filter.xhtml" />
+                 outcome="/content/080-sheet/50-filter/Sheet_Filter.xhtml" />
       </tc:section>
       <tc:section label="Menu">
         The Menu tags tc:menu, tc:menuBar, tc:menuCommand and tc:menuSeparator are no longer available and
@@ -204,7 +204,7 @@
         </tc:section>
         Example:
         <tc:link label="File Upload"
-                 outcome="/content/20-component/100-upload/Upload.xhtml" />
+                 outcome="/content/100-upload/Upload.xhtml" />
       </tc:section>
 
     </tc:section>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/98-migration/1.5_to_2.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/98-migration/1.5_to_2.0.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/98-migration/1.5_to_2.0.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/98-migration/1.5_to_2.0.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/99-migration/1.0_to_1.5.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/99-migration/1.0_to_1.5.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/99-migration/1.0_to_1.5.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/99-migration/1.0_to_1.5.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/Migration.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/Migration.xhtml
similarity index 78%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/Migration.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/Migration.xhtml
index 9239bee..052419e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/Migration.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/Migration.xhtml
@@ -31,23 +31,23 @@
     <ul>
       <li>
         <tc:link label="Upgrade from 4.0 to 5.0"
-                 outcome="/content/10-intro/50-migration/95-migration/4.0_to_5.0.xhtml"/>
+                 outcome="/content/000-intro/50-migration/95-migration/4.0_to_5.0.xhtml"/>
       </li>
       <li>
         <tc:link label="Upgrade from 3.0 to 4.0"
-                 outcome="/content/10-intro/50-migration/96-migration/3.0_to_4.0.xhtml"/>
+                 outcome="/content/000-intro/50-migration/96-migration/3.0_to_4.0.xhtml"/>
       </li>
       <li>
         <tc:link label="Upgrade from 2.0 to 3.0"
-                 outcome="/content/10-intro/50-migration/97-migration/2.0_to_3.0.xhtml"/>
+                 outcome="/content/000-intro/50-migration/97-migration/2.0_to_3.0.xhtml"/>
       </li>
       <li>
         <tc:link label="Upgrade from 1.5 to 2.0"
-                 outcome="/content/10-intro/50-migration/98-migration/1.5_to_2.0.xhtml"/>
+                 outcome="/content/000-intro/50-migration/98-migration/1.5_to_2.0.xhtml"/>
       </li>
       <li>
         <tc:link label="Upgrade from 1.0 to 1.5"
-                 outcome="/content/10-intro/50-migration/99-migration/1.0_to_1.5.xhtml"/>
+                 outcome="/content/000-intro/50-migration/99-migration/1.0_to_1.5.xhtml"/>
       </li>
     </ul>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/60-compatibility/Compatibility.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/60-compatibility/Compatibility.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/60-compatibility/Compatibility.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/60-compatibility/Compatibility.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/FAQ.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/70-faq/FAQ.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/70-faq/FAQ.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/70-faq/FAQ.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/80-api/API.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/80-api/API.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/80-api/API.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/80-api/API.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/85-download/Download.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/85-download/Download.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/85-download/Download.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/85-download/Download.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/Release_Checklist.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/90-release-checklist/Release_Checklist.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/Release_Checklist.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/90-release-checklist/Release_Checklist.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/drop-artifacts.sh b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/90-release-checklist/drop-artifacts.sh
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/drop-artifacts.sh
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/90-release-checklist/drop-artifacts.sh
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/release-artifacts.sh b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/90-release-checklist/release-artifacts.sh
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/90-release-checklist/release-artifacts.sh
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/90-release-checklist/release-artifacts.sh
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/Intro.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/Intro.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/Intro.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/Intro.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/Intro.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/Intro.xhtml
similarity index 97%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/Intro.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/Intro.xhtml
index 51ff696..fea8b56 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/Intro.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/Intro.xhtml
@@ -24,7 +24,7 @@
   <p>This is the demo and documentation of <b>Tobago #{serverInfo.version}</b>.
     It shows the components and concepts of Tobago and is also a main part of the documentation.</p>
   <p>If you want to migrate from an older version, you'll find further information in the
-    <tc:link label="migration guide" outcome="/content/10-intro/50-migration/Migration.xhtml"/>.</p>
+    <tc:link label="migration guide" outcome="/content/000-intro/50-migration/Migration.xhtml"/>.</p>
   <p>If you want to start this demo on your local machine, have a look at the section 'Local Demo'.</p>
   <tc:section label="Description">
     <p>Tobago is a user interface framework for developing web applications.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/10-in/In.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/010-input/10-in/In.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/10-in/In.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/In.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/010-input/10-in/In.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/20-suggest/Suggest.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/010-input/20-suggest/Suggest.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/20-suggest/Suggest.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/20-suggest/Suggest.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/010-input/20-suggest/Suggest.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/Textarea.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/30-textarea/Textarea.xhtml
similarity index 95%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/Textarea.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/010-input/30-textarea/Textarea.xhtml
index 5a7977f..2dc25ed 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/30-textarea/Textarea.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/30-textarea/Textarea.xhtml
@@ -29,7 +29,7 @@
   <tc:section label="Basics">
     <p>The textarea should always have a label attached. For this, use the <code>label</code> attribute.</p>
     <p>Unlike the input field <tc:link label="In"
-                                      outcome="/content/20-component/010-input/10-in/In.xhtml"/> there is no placeholder attribute to describe the meaning of a textarea, when no label is set.</p>
+                                      outcome="/content/010-input/10-in/In.xhtml"/> there is no placeholder attribute to describe the meaning of a textarea, when no label is set.</p>
     <demo-highlight language="markup">&lt;tc:textarea label="Text Area" value="Some text, some text, ..."/&gt;</demo-highlight>
     <tc:textarea id="t1" label="Text Area"
                  value="Some text, some text, some text, some text, some text, some text, some text, some text, some text, some text, ..."/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/40-date/Date.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/010-input/40-date/Date.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/40-date/Date.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/40-date/Date.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/010-input/40-date/Date.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/45-range/Range.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/45-range/Range.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/45-range/Range.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/010-input/45-range/Range.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/50-input-group/Group.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/010-input/50-input-group/Group.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/50-input-group/Group.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/Group.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/010-input/50-input-group/Group.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/80-stars/5_Star_Rating.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/80-stars/5_Star_Rating.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/80-stars/5_Star_Rating.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/010-input/80-stars/5_Star_Rating.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/Input.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/Input.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/Input.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/010-input/Input.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/Out.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/10-out/Out.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/10-out/Out.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/020-output/10-out/Out.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/20-label/Label.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/20-label/Label.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/20-label/Label.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/020-output/20-label/Label.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/25-badge/Badge.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/25-badge/Badge.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/25-badge/Badge.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/020-output/25-badge/Badge.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/40-image/Image.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/40-image/Image.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/40-image/Image.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/020-output/40-image/Image.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/45-figure/Figure.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/45-figure/Figure.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/45-figure/Figure.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/020-output/45-figure/Figure.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/50-progress/Progress.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/50-progress/Progress.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/50-progress/Progress.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/020-output/50-progress/Progress.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/Object.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/60-object/Object.xhtml
similarity index 98%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/Object.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/020-output/60-object/Object.xhtml
index e03d899..7cc0f7b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/Object.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/60-object/Object.xhtml
@@ -23,7 +23,7 @@
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-  <tc:script file="#{request.contextPath}/content/20-component/020-output/60-object/object.js"/>
+  <tc:script file="#{request.contextPath}/content/020-output/60-object/object.js"/>
 
   <p>The <code class="language-markup">&lt;tc:object/></code> tag creates an <code class="language-markup">&lt;iframe></code>.</p>
   <tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/object.js b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/60-object/object.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/60-object/object.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/020-output/60-object/object.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/Output.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/Output.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/020-output/Output.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/020-output/Output.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/10-selectBooleanCheckbox/Checkbox.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/10-selectBooleanCheckbox/Checkbox.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/10-selectBooleanCheckbox/Checkbox.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/10-selectBooleanCheckbox/Checkbox.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/10-selectBooleanCheckbox/Checkbox.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/15-selectBooleanToggle/Toggle.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/15-selectBooleanToggle/Toggle.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/15-selectBooleanToggle/Toggle.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/15-selectBooleanToggle/Toggle.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/15-selectBooleanToggle/Toggle.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/20-selectOneChoice/Dropdown.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/20-selectOneChoice/Dropdown.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/20-selectOneChoice/Dropdown.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/20-selectOneChoice/Dropdown.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/20-selectOneChoice/Dropdown.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/Radio.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/30-selectOneRadio/Radio.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/Radio.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/30-selectOneRadio/Radio.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/Radio.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/30-selectOneRadio/Radio.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/30-selectOneRadio/Radio.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/30-selectOneRadio/Radio.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/40-selectOneListbox/Listbox.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/40-selectOneListbox/Listbox.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/40-selectOneListbox/Listbox.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/40-selectOneListbox/Listbox.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/40-selectOneListbox/Listbox.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/50-selectManyCheckbox/Multi_Checkbox.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/60-selectManyListbox/Multi_Listbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/60-selectManyListbox/Multi_Listbox.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/60-selectManyListbox/Multi_Listbox.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/60-selectManyListbox/Multi_Listbox.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/70-selectManyShuttle/Shuttle.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/70-selectManyShuttle/Shuttle.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/70-selectManyShuttle/Shuttle.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/70-selectManyShuttle/Shuttle.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/70-selectManyShuttle/Shuttle.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/Select.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/Select.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/030-select/Select.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/030-select/Select.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/Button_and_Link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/Button_and_Link.xhtml
similarity index 98%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/Button_and_Link.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/Button_and_Link.xhtml
index 6e6e10f..887da3a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/Button_and_Link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/Button_and_Link.xhtml
@@ -43,9 +43,9 @@
 
       <tc:link id="l0i" label="Alps" link="#{request.contextPath}/image/alps.png"/>
       |
-      <tc:link id="l0l" label="Intro (link)" link="#{request.contextPath}/content/10-intro/intro.xhtml"/>
+      <tc:link id="l0l" label="Intro (link)" link="#{request.contextPath}/content/000-intro/Intro.xhtml"/>
       |
-      <tc:link id="l0o" label="Intro (outcome)" outcome="/content/10-intro/Intro.xhtml"/>
+      <tc:link id="l0o" label="Intro (outcome)" outcome="/content/000-intro/Intro.xhtml"/>
       |
       <tc:link id="l1" label="apache.org" link="https://www.apache.org/"/>
       |
@@ -246,7 +246,7 @@
       <p>The iframe is set with <code class="language-markup">&lt;tc:object name="objectframe" .../></code>
         (see <tc:link
             label="Object"
-            outcome="/content/20-component/020-output/60-object/Object.xhtml"/>).
+            outcome="/content/020-output/60-object/Object.xhtml"/>).
         The value of the <code>target</code> attribute is in this case 'objectframe'.</p>
       <p><tc:link label="apache.org" link="https://www.apache.org/" target="objectframe"/>
         |
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/sample.html b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/sample.html
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/sample.html
rename to tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/sample.html
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/sample_de.html b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/sample_de.html
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button-link/sample_de.html
rename to tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/sample_de.html
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/10-default/Default_Command.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/10-default/Default_Command.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/10-default/Default_Command.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/040-command/10-default/Default_Command.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/Button_Group.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/20-buttons/Button_Group.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/Button_Group.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/040-command/20-buttons/Button_Group.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/Button_Group.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/20-buttons/Button_Group.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/20-buttons/Button_Group.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/040-command/20-buttons/Button_Group.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/21-buttons-customizer/Customizer.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/21-buttons-customizer/Customizer.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/21-buttons-customizer/Customizer.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/040-command/21-buttons-customizer/Customizer.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/21-buttons-customizer/x-buttons-item-delete.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/21-buttons-customizer/x-buttons-item-delete.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/21-buttons-customizer/x-buttons-item-delete.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/040-command/21-buttons-customizer/x-buttons-item-delete.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/21-buttons-customizer/x-buttons-item-edit.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/21-buttons-customizer/x-buttons-item-edit.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/21-buttons-customizer/x-buttons-item-edit.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/040-command/21-buttons-customizer/x-buttons-item-edit.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/21-buttons-customizer/x-buttons-item-new.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/21-buttons-customizer/x-buttons-item-new.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/21-buttons-customizer/x-buttons-item-new.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/040-command/21-buttons-customizer/x-buttons-item-new.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/25-links/Link_Group.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/25-links/Link_Group.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/25-links/Link_Group.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/040-command/25-links/Link_Group.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/Command.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/Command.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/Command.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/040-command/Command.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/Box.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/10-box/Box.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/Box.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/050-container/10-box/Box.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/Box.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/10-box/Box.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/Box.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/050-container/10-box/Box.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/20-panel/Panel.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/20-panel/Panel.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/20-panel/Panel.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/050-container/20-panel/Panel.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/30-separator/Separator.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/30-separator/Separator.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/30-separator/Separator.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/050-container/30-separator/Separator.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/Section.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/40-section/Section.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/Section.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/050-container/40-section/Section.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/Section.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/40-section/Section.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/40-section/Section.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/050-container/40-section/Section.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header-footer/Header_and_Footer.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/50-header-footer/Header_and_Footer.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header-footer/Header_and_Footer.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/050-container/50-header-footer/Header_and_Footer.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header-footer/x-header-footer-example.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/50-header-footer/x-header-footer-example.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/50-header-footer/x-header-footer-example.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/050-container/50-header-footer/x-header-footer-example.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/Bar.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/60-bar/Bar.xhtml
similarity index 89%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/Bar.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/050-container/60-bar/Bar.xhtml
index b25b1e7..1beea6f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/60-bar/Bar.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/60-bar/Bar.xhtml
@@ -37,7 +37,7 @@
     <demo-highlight language="markup">&lt;tc:bar markup="large, dark">
   &lt;tc:style customClass="bg-dark"/>
   &lt;f:facet name="brand">
-    &lt;tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+    &lt;tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
   &lt;/f:facet>
   &lt;tc:links>
     &lt;tc:link label="Link One"/>
@@ -53,7 +53,7 @@
     <tc:bar markup="large, dark">
       <tc:style customClass="bg-dark"/>
       <f:facet name="brand">
-        <tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+        <tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
       </f:facet>
       <tc:links>
         <tc:link label="Link One"/>
@@ -73,7 +73,7 @@
     <demo-highlight language="markup">&lt;tc:bar markup="large, dark">
   &lt;tc:style customClass="bg-dark"/>
   &lt;f:facet name="brand">
-    &lt;tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+    &lt;tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
   &lt;/f:facet>
   &lt;div class="ml-auto">
     // centered content
@@ -85,7 +85,7 @@
     <tc:bar markup="large, dark">
       <tc:style customClass="bg-dark"/>
       <f:facet name="brand">
-        <tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+        <tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
       </f:facet>
       <div class="ml-auto">
         <tc:links>
@@ -106,7 +106,7 @@
     <tc:bar markup="dark">
       <tc:style customClass="bg-dark"/>
       <f:facet name="brand">
-        <tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+        <tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
       </f:facet>
       <tc:links>
         <tc:link omit="true" label="Radio">
@@ -147,7 +147,7 @@
     <tc:bar markup="large, dark">
       <tc:style customClass="bg-dark"/>
       <f:facet name="brand">
-        <tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+        <tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
       </f:facet>
       <tc:links>
         <tc:link label="Link One"/>
@@ -163,7 +163,7 @@
     <tc:bar markup="large, light">
       <tc:style customClass="bg-light"/>
       <f:facet name="brand">
-        <tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+        <tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
       </f:facet>
       <tc:links>
         <tc:link label="Link One"/>
@@ -179,7 +179,7 @@
     <tc:bar markup="large, dark">
       <tc:style customClass="bg-danger"/>
       <f:facet name="brand">
-        <tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+        <tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
       </f:facet>
       <tc:links>
         <tc:link label="Link One"/>
@@ -195,7 +195,7 @@
     <tc:bar markup="large, dark">
       <tc:style customClass="bg-primary"/>
       <f:facet name="brand">
-        <tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+        <tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
       </f:facet>
       <tc:links>
         <tc:link label="Link One"/>
@@ -211,7 +211,7 @@
     <tc:bar markup="large, light">
       <tc:style customClass="bg-warning"/>
       <f:facet name="brand">
-        <tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+        <tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
       </f:facet>
       <tc:links>
         <tc:link label="Link One"/>
@@ -248,7 +248,7 @@
     <tc:bar markup="light">
       <tc:style customClass="bg-light"/>
       <f:facet name="brand">
-        <tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+        <tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
       </f:facet>
       <tc:links>
         <tc:link label="Link One"/>
@@ -258,7 +258,7 @@
     <tc:bar markup="small, light">
       <tc:style customClass="bg-light"/>
       <f:facet name="brand">
-        <tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+        <tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
       </f:facet>
       <tc:links>
         <tc:link label="Link One"/>
@@ -268,7 +268,7 @@
     <tc:bar markup="medium, light">
       <tc:style customClass="bg-light"/>
       <f:facet name="brand">
-        <tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+        <tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
       </f:facet>
       <tc:links>
         <tc:link label="Link One"/>
@@ -278,7 +278,7 @@
     <tc:bar markup="large, light">
       <tc:style customClass="bg-light"/>
       <f:facet name="brand">
-        <tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+        <tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
       </f:facet>
       <tc:links>
         <tc:link label="Link One"/>
@@ -288,7 +288,7 @@
     <tc:bar markup="extraLarge, light">
       <tc:style customClass="bg-light"/>
       <f:facet name="brand">
-        <tc:link label="BRAND" outcome="/content/10-intro/Intro.xhtml"/>
+        <tc:link label="BRAND" outcome="/content/000-intro/Intro.xhtml"/>
       </f:facet>
       <tc:links>
         <tc:link label="Link One"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/Container.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/Container.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/Container.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/050-container/Container.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/060-popup/Popup.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/060-popup/Popup.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/060-popup/Popup.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/Popup.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/060-popup/Popup.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/Tab_Client.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/00-client/Tab_Client.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/00-client/Tab_Client.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/00-client/Tab_Client.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/01-ajax/Tab_Ajax.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/01-ajax/Tab_Ajax.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/01-ajax/Tab_Ajax.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/01-ajax/Tab_Ajax.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/02-server/Tab_Server.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/02-server/Tab_Server.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/02-server/Tab_Server.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/02-server/Tab_Server.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/Tab_Group.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/Tab_Group.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/Tab_Group.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/070-tab/Tab_Group.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/Tab_Group.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/Sheet_Sorting.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/10-sort/Sheet_Sorting.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/Sheet_Sorting.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/10-sort/Sheet_Sorting.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/Sheet_Sorting.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/10-sort/Sheet_Sorting.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/Sheet_Sorting.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/10-sort/Sheet_Sorting.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/Sheet_Column_Selector.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/20-selector/Sheet_Column_Selector.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/20-selector/Sheet_Column_Selector.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/20-selector/Sheet_Column_Selector.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/30-event/Sheet_Event.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/30-event/Sheet_Event.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/30-event/Sheet_Event.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/30-event/Sheet_Event.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/30-event/Sheet_Event.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/30-event/Sheet_Event.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/30-event/Sheet_Event.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/30-event/Sheet_Event.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/35-markup/Sheet_Markup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/35-markup/Sheet_Markup.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/35-markup/Sheet_Markup.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/35-markup/Sheet_Markup.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/40-style/Sheet_Style.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/40-style/Sheet_Style.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/40-style/Sheet_Style.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/40-style/Sheet_Style.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/50-filter/Sheet_Filter.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/50-filter/Sheet_Filter.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/50-filter/Sheet_Filter.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/50-filter/Sheet_Filter.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/55-staticheader/Sheet_Static_Header.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/55-staticheader/Sheet_Static_Header.xhtml
similarity index 97%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/55-staticheader/Sheet_Static_Header.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/55-staticheader/Sheet_Static_Header.xhtml
index 17e9c6f..073756d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/55-staticheader/Sheet_Static_Header.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/55-staticheader/Sheet_Static_Header.xhtml
@@ -27,7 +27,7 @@
     <code class="language-markup">&lt;tc:column></code>.
     For more complex header which span over columns and/or rows please go to the
     <tc:link label="Sheet Multi Header"
-             outcome="/content/20-component/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml"/> section.</p>
+             outcome="/content/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml"/> section.</p>
   <p>Tag Library Documentation:
     <tc:link label="&lt;tc:sheet/>" image="#{request.contextPath}/image/feather-leaf.png"
              link="#{apiController.tldBase}/#{apiController.currentRelease}/tld/tc/sheet.html"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/70-tree/Sheet_Tree.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/70-tree/Sheet_Tree.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/70-tree/Sheet_Tree.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/70-tree/Sheet_Tree.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/70-tree/Sheet_Tree.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/80-editable/Sheet_Editable.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/80-editable/Sheet_Editable.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/80-editable/Sheet_Editable.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/80-editable/Sheet_Editable.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/90-lazy/Sheet_Lazy.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/90-lazy/Sheet_Lazy.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/90-lazy/Sheet_Lazy.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/90-lazy/Sheet_Lazy.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/Sheet.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/Sheet.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/Sheet.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/Sheet.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/x-sheet-nested.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/x-sheet-nested.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/x-sheet-nested.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/x-sheet-nested.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/00-command/Tree_Command_Types.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/00-command/Tree_Command_Types.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/00-command/Tree_Command_Types.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/00-command/Tree_Command_Types.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/00-command/Tree_Command_Types.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/01-select/Tree_Select.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/01-select/Tree_Select.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/01-select/Tree_Select.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/01-select/Tree_Select.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/01-select/Tree_Select.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/02-editor/Tree_Editor.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/02-editor/Tree_Editor.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/02-editor/Tree_Editor.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/02-editor/Tree_Editor.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/Tree_Menu.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/03-menu/Tree_Menu.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/03-menu/Tree_Menu.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/03-menu/Tree_Menu.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/Tree_Listbox.test.js b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/04-listbox/Tree_Listbox.test.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/Tree_Listbox.test.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/04-listbox/Tree_Listbox.test.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/Tree_Listbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/04-listbox/Tree_Listbox.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/04-listbox/Tree_Listbox.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/04-listbox/Tree_Listbox.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/Tree.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/Tree.xhtml
similarity index 97%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/Tree.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/Tree.xhtml
index 034b3dd..56b32b7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/090-tree/Tree.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/Tree.xhtml
@@ -36,8 +36,8 @@
 
   <p>A classic tree can created with the <code class="language-markup">&lt;tc:tree/></code> tag.
     Tobago knows two more presentations of a tree. As a
-    <tc:link label="menu" outcome="/content/20-component/090-tree/03-menu/Tree_Menu.xhtml"/>
-    and as a <tc:link label="list" outcome="/content/20-component/090-tree/04-listbox/Tree_Listbox.xhtml"/>.</p>
+    <tc:link label="menu" outcome="/content/090-tree/03-menu/Tree_Menu.xhtml"/>
+    and as a <tc:link label="list" outcome="/content/090-tree/04-listbox/Tree_Listbox.xhtml"/>.</p>
   <p>Tag Library Documentation:
     <tc:link label="&lt;tc:tree/>" image="#{request.contextPath}/image/feather-leaf.png"
              link="#{apiController.tldBase}/#{apiController.currentRelease}/tld/tc/tree.html"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/100-upload/File_Upload.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/100-upload/File_Upload.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/100-upload/File_Upload.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/100-upload/File_Upload.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/00-tinymce/TinyMCE.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/00-tinymce/TinyMCE.xhtml
similarity index 96%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/00-tinymce/TinyMCE.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/00-tinymce/TinyMCE.xhtml
index 6091d18..e141859 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/00-tinymce/TinyMCE.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/00-tinymce/TinyMCE.xhtml
@@ -24,7 +24,7 @@
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:script file="https://cdn.tiny.cloud/1/no-api-key/tinymce/5/tinymce.min.js" referrerpolicy="origin"/>
-  <tc:script file="#{request.contextPath}/content/20-component/110-wysiwyg/00-tinymce/init-tinymce.js"/>
+  <tc:script file="#{request.contextPath}/content/110-wysiwyg/00-tinymce/init-tinymce.js"/>
 
   <tc:section label="Setup">
     <p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/00-tinymce/init-tinymce.js b/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/00-tinymce/init-tinymce.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/00-tinymce/init-tinymce.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/00-tinymce/init-tinymce.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/01-ckeditor/CKEditor.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/01-ckeditor/CKEditor.xhtml
similarity index 96%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/01-ckeditor/CKEditor.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/01-ckeditor/CKEditor.xhtml
index f26f4e2..b6de702 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/01-ckeditor/CKEditor.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/01-ckeditor/CKEditor.xhtml
@@ -24,7 +24,7 @@
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <tc:script file="https://cdn.ckeditor.com/ckeditor5/25.0.0/classic/ckeditor.js"/>
-  <tc:script file="#{request.contextPath}/content/20-component/110-wysiwyg/01-ckeditor/init-ckeditor.js"/>
+  <tc:script file="#{request.contextPath}/content/110-wysiwyg/01-ckeditor/init-ckeditor.js"/>
 
   <tc:section label="Setup">
     <p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/01-ckeditor/init-ckeditor.js b/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/01-ckeditor/init-ckeditor.js
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/01-ckeditor/init-ckeditor.js
rename to tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/01-ckeditor/init-ckeditor.js
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/WYSIWYG_Editor.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/WYSIWYG_Editor.xhtml
similarity index 100%
rename from tobago-example/tobago-example-demo/src/main/webapp/content/20-component/110-wysiwyg/WYSIWYG_Editor.xhtml
rename to tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/WYSIWYG_Editor.xhtml
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/Component.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/Component.xhtml
deleted file mode 100644
index 9745c8f..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/Component.xhtml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<ui:composition template="/main.xhtml"
-                xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
-
-  <p>The different components of Tobago are shown in this section.
-    There are some classic components like input fields, output fields or radiobuttons
-    and some more advanced like a popup dialog, a tab group or a sheet.</p>
-</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/Form.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/Form.xhtml
index b6e4177..06ddeca 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/Form.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/Form.xhtml
@@ -27,7 +27,7 @@
     Forms are added by the <code class="language-markup">&lt;tc:form/></code> tag.</p>
   <p>Forms are also relevant for
     <tc:link label="Default Command"
-             outcome="/content/20-component/040-command/10-default/Default_Command.xhtml"/>.</p>
+             outcome="/content/040-command/10-default/Default_Command.xhtml"/>.</p>
   <tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
            link="#{apiController.tldBase}/#{apiController.currentRelease}/tld/tc/form.html"/>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/12-browser/Browser.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/12-browser/Browser.xhtml
index e593256..bef0ff9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/12-browser/Browser.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/12-browser/Browser.xhtml
@@ -41,7 +41,7 @@
 
   <p>
     More information of the support of different version you may find in the
-    <tc:link label="Compatiblity" link="#{request.contextPath}/content/10-intro/60-compatibility/Compatibility.xhtml"/>
+    <tc:link label="Compatiblity" link="#{request.contextPath}/content/000-intro/60-compatibility/Compatibility.xhtml"/>
     of Tobago.
   </p>
 </ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/30-behavior/Behavior.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/30-behavior/Behavior.xhtml
index 6aee197..6d1d6fe 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/30-behavior/Behavior.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/30-behavior/Behavior.xhtml
@@ -87,7 +87,7 @@
 
     <tc:section label="Example">
       <p>An example can be found for
-        <tc:link label="&lt;tc:row>" outcome="/content/20-component/080-sheet/30-event/Sheet_Event.xhtml"/>
+        <tc:link label="&lt;tc:row>" outcome="/content/080-sheet/30-event/Sheet_Event.xhtml"/>
         Option: 'open popup on click with AJAX'.</p>
       <demo-highlight language="markup">&lt;tc:row>
   &lt;tc:event>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/Collapsible_Box.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/Collapsible_Box.xhtml
index 90d60bb..5541d3f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/Collapsible_Box.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/Collapsible_Box.xhtml
@@ -24,7 +24,7 @@
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>On this page the collapsible concept is explained for a
-    <tc:link label="Box" outcome="/content/20-component/050-container/10-box/Box.xhtml"/>.</p>
+    <tc:link label="Box" outcome="/content/050-container/10-box/Box.xhtml"/>.</p>
 
   <tc:section label="Simple Collapsible Box">
     <tc:form id="controller">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml
index 8fbed52..9fa1784 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml
@@ -23,7 +23,7 @@
                 xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
   <p>This page contain some examples for the collapsible concept of a popup. Please have a look at the
-    <tc:link label="Popup" outcome="/content/20-component/060-popup/Popup.xhtml"/>
+    <tc:link label="Popup" outcome="/content/060-popup/Popup.xhtml"/>
     page in the components section for more details.</p>
 
   <tc:section label="Simple Popup">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml
index ab2c2b3..a6749ec 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml
@@ -24,7 +24,7 @@
                 xmlns:f="http://xmlns.jcp.org/jsf/core">
 
   <p>This page show some examples for the collapsible concept of a
-    <tc:link label="Panel" outcome="/content/20-component/050-container/20-panel/Panel.xhtml"/>.
+    <tc:link label="Panel" outcome="/content/050-container/20-panel/Panel.xhtml"/>.
     Every panel contain a required input field to see if a validation occur while submitting.
     For better visibility every panel has a border.</p>
   <tc:section label="Simple Panel">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/Collapsible_Section.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/Collapsible_Section.xhtml
index 7c096e5..ac892b4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/Collapsible_Section.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/Collapsible_Section.xhtml
@@ -25,7 +25,7 @@
 
   <p>Collapsible concept explained for a
     <tc:link label="Section"
-             outcome="/content/20-component/050-container/40-section/Section.xhtml"/>.</p>
+             outcome="/content/050-container/40-section/Section.xhtml"/>.</p>
   <tc:section label="Simple Section">
     <p>A simple collapsible section. The <code>collapsed</code> attribute is set by a controller.
       The 'hide'-button got <code>immediate="true"</code> to submitting without validation.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/Collapsible.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/Collapsible.xhtml
index 504a56b..d35ab19 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/Collapsible.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/Collapsible.xhtml
@@ -27,12 +27,12 @@
   </p>
 
   <p>The collapsible concept is the base for
-    <tc:link label="Box" outcome="/content/20-component/050-container/10-box/Box.xhtml"/>,
-    <tc:link label="Popup" outcome="/content/20-component/060-popup/Popup.xhtml"/>,
-    <tc:link label="Panel" outcome="/content/20-component/050-container/20-panel/Panel.xhtml"/>
+    <tc:link label="Box" outcome="/content/050-container/10-box/Box.xhtml"/>,
+    <tc:link label="Popup" outcome="/content/060-popup/Popup.xhtml"/>,
+    <tc:link label="Panel" outcome="/content/050-container/20-panel/Panel.xhtml"/>
     and
     <tc:link label="Section"
-             outcome="/content/20-component/050-container/40-section/Section.xhtml"/>.
+             outcome="/content/050-container/40-section/Section.xhtml"/>.
     It determines how parts or whole components are shown or hidden.
     For example, a popup is hidden completely while for box only the content
     could be hidden.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/Attribute.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/Attribute.xhtml
index eb1aa60..8264c2e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/Attribute.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/Attribute.xhtml
@@ -66,7 +66,7 @@
           <tc:attribute name="action" value="#{attributeController.reload}"/>
         </c:if>
         <c:if test="${not attributeController.condition}">
-          <tc:attribute name="outcome" value="/content/10-intro/intro.xhtml"/>
+          <tc:attribute name="outcome" value="/content/000-intro/Intro.xhtml"/>
         </c:if>
       </tc:button>
 
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/Test.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/Test.xhtml
index 482f161..3bf29f3 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/Test.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/Test.xhtml
@@ -29,7 +29,7 @@
 
   <p>
     To run the tests automatically, see in
-    <tc:link label="FAQ" outcome="/content/10-intro/70-faq/FAQ.xhtml"
+    <tc:link label="FAQ" outcome="/content/000-intro/70-faq/FAQ.xhtml"
              fragment="page:mainForm:integrationTest"/>.
   </p>