diff --git a/documentation/current/community/index.wiki b/documentation/current/_others/community/index.wiki
similarity index 99%
rename from documentation/current/community/index.wiki
rename to documentation/current/_others/community/index.wiki
index ce0c25e3..777cb81f 100644
--- a/documentation/current/community/index.wiki
+++ b/documentation/current/_others/community/index.wiki
@@ -1,6 +1,6 @@
 [[Property:title|Community]]
 [[Property:description|Members of the Eiffel community can contribute to this documentation through this book]]
-[[Property:weight|2]]
+[[Property:weight|15]]
 [[Property:uuid|75c75712-7c3e-2757-51b7-77b404471e2e]]
 =You can become a  contributor!=
 
diff --git a/documentation/current/draft/index.wiki b/documentation/current/_others/draft/index.wiki
similarity index 77%
rename from documentation/current/draft/index.wiki
rename to documentation/current/_others/draft/index.wiki
index 6f96d753..761f5714 100644
--- a/documentation/current/draft/index.wiki
+++ b/documentation/current/_others/draft/index.wiki
@@ -1,5 +1,5 @@
 [[Property:title|Draft]]
-[[Property:weight|999]]
+[[Property:weight|99]]
 [[Property:uuid|c277e707-67a0-14a2-099e-5b861f2480ad]]
 
 
diff --git a/documentation/current/draft/multiple-inheritance.wiki b/documentation/current/_others/draft/multiple-inheritance.wiki
similarity index 100%
rename from documentation/current/draft/multiple-inheritance.wiki
rename to documentation/current/_others/draft/multiple-inheritance.wiki
diff --git a/documentation/current/draft/test-page.wiki b/documentation/current/_others/draft/test-page.wiki
similarity index 100%
rename from documentation/current/draft/test-page.wiki
rename to documentation/current/_others/draft/test-page.wiki
diff --git a/documentation/current/guide/_images/static_documentation_page_0.png b/documentation/current/_others/guide/_images/static_documentation_page_0.png
similarity index 100%
rename from documentation/current/guide/_images/static_documentation_page_0.png
rename to documentation/current/_others/guide/_images/static_documentation_page_0.png
diff --git a/documentation/current/guide/_images/static_documentation_page_0.png.data b/documentation/current/_others/guide/_images/static_documentation_page_0.png.data
similarity index 100%
rename from documentation/current/guide/_images/static_documentation_page_0.png.data
rename to documentation/current/_others/guide/_images/static_documentation_page_0.png.data
diff --git a/documentation/current/guide/index.wiki b/documentation/current/_others/guide/index.wiki
similarity index 99%
rename from documentation/current/guide/index.wiki
rename to documentation/current/_others/guide/index.wiki
index 32efbf1b..30c5a797 100644
--- a/documentation/current/guide/index.wiki
+++ b/documentation/current/_others/guide/index.wiki
@@ -1,7 +1,7 @@
 [[Property:title|Guide]]
 [[Property:description|Central repository of information about Eiffel and the products and technologies of Eiffel Software]]
 [[Property:link_title|Information Guide]]
-[[Property:weight|-10]]
+[[Property:weight|10]]
 [[Property:uuid|68b37685-64e9-f564-9258-29e709a55f44]]
 '''Guide to Eiffel Information'''
 
diff --git a/documentation/current/guide/learning-eiffel.wiki b/documentation/current/_others/guide/learning-eiffel.wiki
similarity index 100%
rename from documentation/current/guide/learning-eiffel.wiki
rename to documentation/current/_others/guide/learning-eiffel.wiki
diff --git a/documentation/current/guide/offline-use-eiffel-documentation.wiki b/documentation/current/_others/guide/offline-use-eiffel-documentation.wiki
similarity index 100%
rename from documentation/current/guide/offline-use-eiffel-documentation.wiki
rename to documentation/current/_others/guide/offline-use-eiffel-documentation.wiki
diff --git a/documentation/current/why-eiffel/common-myths-and-misconceptions-about-eiffel.wiki b/documentation/current/_others/why-eiffel/common-myths-and-misconceptions-about-eiffel.wiki
similarity index 100%
rename from documentation/current/why-eiffel/common-myths-and-misconceptions-about-eiffel.wiki
rename to documentation/current/_others/why-eiffel/common-myths-and-misconceptions-about-eiffel.wiki
diff --git a/documentation/current/why-eiffel/index.wiki b/documentation/current/_others/why-eiffel/index.wiki
similarity index 97%
rename from documentation/current/why-eiffel/index.wiki
rename to documentation/current/_others/why-eiffel/index.wiki
index 4dc5010f..e7653e7b 100644
--- a/documentation/current/why-eiffel/index.wiki
+++ b/documentation/current/_others/why-eiffel/index.wiki
@@ -1,6 +1,6 @@
 [[Property:title|Why Eiffel?]]
 [[Property:description|arguments for using Eiffel]]
-[[Property:weight|-1]]
+[[Property:weight|11]]
 [[Property:uuid|df007537-c0dd-2ea6-233b-764ad483eb65]]
 This book collects arguments for using Eiffel.
 
diff --git a/documentation/current/examples/example-command-line-arguments.wiki b/documentation/current/eiffel/Examples/example-command-line-arguments.wiki
similarity index 100%
rename from documentation/current/examples/example-command-line-arguments.wiki
rename to documentation/current/eiffel/Examples/example-command-line-arguments.wiki
diff --git a/documentation/current/examples/example-environment-variables.wiki b/documentation/current/eiffel/Examples/example-environment-variables.wiki
similarity index 100%
rename from documentation/current/examples/example-environment-variables.wiki
rename to documentation/current/eiffel/Examples/example-environment-variables.wiki
diff --git a/documentation/current/examples/example-file-io.wiki b/documentation/current/eiffel/Examples/example-file-io.wiki
similarity index 100%
rename from documentation/current/examples/example-file-io.wiki
rename to documentation/current/eiffel/Examples/example-file-io.wiki
diff --git a/documentation/current/examples/example-polymorphism.wiki b/documentation/current/eiffel/Examples/example-polymorphism.wiki
similarity index 100%
rename from documentation/current/examples/example-polymorphism.wiki
rename to documentation/current/eiffel/Examples/example-polymorphism.wiki
diff --git a/documentation/current/examples/example-reverse-string.wiki b/documentation/current/eiffel/Examples/example-reverse-string.wiki
similarity index 100%
rename from documentation/current/examples/example-reverse-string.wiki
rename to documentation/current/eiffel/Examples/example-reverse-string.wiki
diff --git a/documentation/current/examples/example-self-initializing-attributes-and-assigner-commands.wiki b/documentation/current/eiffel/Examples/example-self-initializing-attributes-and-assigner-commands.wiki
similarity index 100%
rename from documentation/current/examples/example-self-initializing-attributes-and-assigner-commands.wiki
rename to documentation/current/eiffel/Examples/example-self-initializing-attributes-and-assigner-commands.wiki
diff --git a/documentation/current/examples/example-sieve-eratosthenes.wiki b/documentation/current/eiffel/Examples/example-sieve-eratosthenes.wiki
similarity index 100%
rename from documentation/current/examples/example-sieve-eratosthenes.wiki
rename to documentation/current/eiffel/Examples/example-sieve-eratosthenes.wiki
diff --git a/documentation/current/examples/example-sleep.wiki b/documentation/current/eiffel/Examples/example-sleep.wiki
similarity index 100%
rename from documentation/current/examples/example-sleep.wiki
rename to documentation/current/eiffel/Examples/example-sleep.wiki
diff --git a/documentation/current/examples/index.wiki b/documentation/current/eiffel/Examples/index.wiki
similarity index 100%
rename from documentation/current/examples/index.wiki
rename to documentation/current/eiffel/Examples/index.wiki
diff --git a/documentation/current/examples/introduction-examples-book.wiki b/documentation/current/eiffel/Examples/introduction-examples-book.wiki
similarity index 100%
rename from documentation/current/examples/introduction-examples-book.wiki
rename to documentation/current/eiffel/Examples/introduction-examples-book.wiki
diff --git a/documentation/current/eiffel/Language_reference/index.wiki b/documentation/current/eiffel/Language_reference/index.wiki
new file mode 100644
index 00000000..794863e5
--- /dev/null
+++ b/documentation/current/eiffel/Language_reference/index.wiki
@@ -0,0 +1,5 @@
+[[Property:title|Language reference]]
+[[Property:link_title|Language]]
+[[Property:weight|3]]
+
+
diff --git a/documentation/current/method/quick-reference-eiffel-programming-language/eiffel-programming-language-reserved-words.wiki b/documentation/current/eiffel/Language_reference/quick-reference-eiffel-programming-language/eiffel-programming-language-reserved-words.wiki
similarity index 100%
rename from documentation/current/method/quick-reference-eiffel-programming-language/eiffel-programming-language-reserved-words.wiki
rename to documentation/current/eiffel/Language_reference/quick-reference-eiffel-programming-language/eiffel-programming-language-reserved-words.wiki
diff --git a/documentation/current/method/quick-reference-eiffel-programming-language/eiffel-programming-language-syntax.wiki b/documentation/current/eiffel/Language_reference/quick-reference-eiffel-programming-language/eiffel-programming-language-syntax.wiki
similarity index 50%
rename from documentation/current/method/quick-reference-eiffel-programming-language/eiffel-programming-language-syntax.wiki
rename to documentation/current/eiffel/Language_reference/quick-reference-eiffel-programming-language/eiffel-programming-language-syntax.wiki
index 1fa6d41c..7d4c1cf3 100644
--- a/documentation/current/method/quick-reference-eiffel-programming-language/eiffel-programming-language-syntax.wiki
+++ b/documentation/current/eiffel/Language_reference/quick-reference-eiffel-programming-language/eiffel-programming-language-syntax.wiki
@@ -49,7 +49,10 @@ A simple string -- specimen of Simple_string -- is a [[#Strings|String]] consist
 
 {| border="2"
 |+ Special Characters and Their Codes
-! Character || Code || Mnemonic name
+|-
+! Character 
+! Code 
+! Mnemonic name
 |-
 | @ || %A || At-sign
 |-
@@ -77,7 +80,7 @@ A simple string -- specimen of Simple_string -- is a [[#Strings|String]] consist
 |-
 | NUL || %U || Null
 |-
-| <nowiki>|</nowiki> || %V || Vertical bar
+| &#124; || %V || Vertical bar
 |-
 | % || %% || Percent
 |-
@@ -113,479 +116,475 @@ Line wrapping parts are used as separators between one [[#Simple strings|Simple_
 
 
 ===Class names ===
-Class_name ::= [[#Identfiers|Identifier]] <br/><br/>
-<br/>
+Class_name ::= [[#Identfiers|Identifier]] 
+
 ===Class declarations ===
-Class_declaration ::= <nowiki>[</nowiki>[[#Notes|Notes]]<nowiki>]</nowiki> <br/>
-[[#Class headers|Class_header]] <br/>
-<nowiki>[</nowiki>[[#Formal generic parameters|Formal_generics]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Obsolete marks|Obsolete]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Inheritance parts|Inheritance]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Creators parts|Creators]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Converter clauses|Converters]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Feature parts|Features]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Assertions|Invariant]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Notes|Notes]]<nowiki>]</nowiki> <br/>
-<code>end</code><br/>
-<br/>
+Class_declaration ::= <nowiki>[</nowiki>[[#Notes|Notes]]<nowiki>]</nowiki>
+[[#Class headers|Class_header]] 
+<nowiki>[</nowiki>[[#Formal generic parameters|Formal_generics]]<nowiki>]</nowiki> 
+<nowiki>[</nowiki>[[#Obsolete marks|Obsolete]]<nowiki>]</nowiki> 
+<nowiki>[</nowiki>[[#Inheritance parts|Inheritance]]<nowiki>]</nowiki>
+<nowiki>[</nowiki>[[#Creators parts|Creators]]<nowiki>]</nowiki>
+<nowiki>[</nowiki>[[#Converter clauses|Converters]]<nowiki>]</nowiki> 
+<nowiki>[</nowiki>[[#Feature parts|Features]]<nowiki>]</nowiki> 
+<nowiki>[</nowiki>[[#Assertions|Invariant]]<nowiki>]</nowiki> 
+<nowiki>[</nowiki>[[#Notes|Notes]]<nowiki>]</nowiki>
+<code>end</code>
+
 ===Notes ===
-Notes ::= <code>note</code> Note_list<br/>
-Note_list ::= {Note_entry ";" …}* <br/>
-Note_entry ::= Note_name Note_values <br/>
-Note_name ::= [[#Identifiers|Identifier]] ":" <br/>
-Note_values ::= {Note_item ","…}+ <br/>
-Note_item ::= [[#Identifiers|Identifier]] | [[#Manifest constants|Manifest_constant]] <br/>
-<br/>
+Notes ::= <code>note</code> Note_list
+Note_list ::= {Note_entry ";" …}* 
+Note_entry ::= Note_name Note_values 
+Note_name ::= [[#Identifiers|Identifier]] ":" 
+Note_values ::= {Note_item ","…}+ 
+Note_item ::= [[#Identifiers|Identifier]] | [[#Manifest constants|Manifest_constant]] 
+
 ===Class headers ===
-Class_header ::= [Header_mark] <code>class</code> [[#Class names|Class_name]] <br/>
-Header_mark ::= <code>deferred</code> | <code>expanded</code> | <code>frozen</code> <br/>
-<br/>
+Class_header ::= <nowiki>[Header_mark]</nowiki> <code>class</code> [[#Class names|Class_name]] 
+Header_mark ::= <code>deferred</code> | <code>expanded</code> | <code>frozen</code> 
+
 ===Obsolete marks ===
-Obsolete ::= <code>obsolete</code> Message <br/>
-Message ::= [[#Manifest strings|Manifest_string]] <br/>
-<br/>
+Obsolete ::= <code>obsolete</code> Message 
+Message ::= [[#Manifest strings|Manifest_string]] 
+
 ===Feature parts ===
-Features ::= Feature_clause+ <br/>
-Feature_clause ::= <code>feature</code> <nowiki>[</nowiki>[[#Clients|Clients]]<nowiki>]</nowiki> <nowiki>[</nowiki>[[#Feature parts|Header_comment]]<nowiki>]</nowiki> Feature_declaration_list <br/>
-Feature_declaration_list ::= {[[#Feature declarations|Feature_declaration]] ";" …}* <br/>
-Header_comment ::= [[#Comments|Comment]] <br/>
-<br/>
+Features ::= Feature_clause+ 
+Feature_clause ::= <code>feature</code> <nowiki>[</nowiki>[[#Clients|Clients]]<nowiki>]</nowiki> <nowiki>[</nowiki>[[#Feature parts|Header_comment]]<nowiki>]</nowiki> Feature_declaration_list 
+Feature_declaration_list ::= {[[#Feature declarations|Feature_declaration]] ";" …}* 
+Header_comment ::= [[#Comments|Comment]] 
+
 ===Feature declarations ===
-Feature_declaration ::= [[#New feature lists|New_feature_list]] Declaration_body <br/>
-Declaration_body ::= <nowiki>[</nowiki>[[#Formal argument and entity declarations|Formal_arguments]]<nowiki>]</nowiki> [Query_mark] [Feature_value] <br/>
-Query_mark ::= Type_mark <nowiki>[</nowiki>[[#Assigner marks|Assigner_mark]]<nowiki>]</nowiki> <br/>
-Type_mark ::= ":" [[#Types|Type]] <br/>
-Feature_value ::= [Explicit_value] <br/>
-<nowiki>[</nowiki>[[#Obsolete parts|Obsolete]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Feature parts|Header_comment]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Feature bodies|Attribute_or_routine]]<nowiki>]</nowiki> <br/>
-Explicit_value ::= "=" [[#Manifest constants|Manifest_constant]] <br/>
-<br/>
-<br/>
+Feature_declaration ::= [[#New feature lists|New_feature_list]] Declaration_body 
+Declaration_body ::= <nowiki>[</nowiki>[[#Formal argument and entity declarations|Formal_arguments]]<nowiki>] [Query_mark] [Feature_value] </nowiki>
+Query_mark ::= Type_mark <nowiki>[</nowiki>[[#Assigner marks|Assigner_mark]]<nowiki>]</nowiki> 
+Type_mark ::= ":" [[#Types|Type]] 
+Feature_value ::= <nowiki>[Explicit_value] </nowiki>
+<nowiki>[</nowiki>[[#Obsolete parts|Obsolete]]<nowiki>]</nowiki> 
+<nowiki>[</nowiki>[[#Feature parts|Header_comment]]<nowiki>]</nowiki> 
+<nowiki>[</nowiki>[[#Feature bodies|Attribute_or_routine]]<nowiki>]</nowiki> 
+Explicit_value ::= "=" [[#Manifest constants|Manifest_constant]] 
+
+
 ===New feature lists ===
-New_feature_list ::= {New_feature "," …}+ <br/>
-New_feature ::= [<code>frozen</code>] [[#Feature names|Extended_feature_name]]<br/>
-<br/>
-<br/>
+New_feature_list ::= {New_feature "," …}+ 
+New_feature ::= <nowiki>[</nowiki><code>frozen</code><nowiki>]</nowiki> [[#Feature names|Extended_feature_name]]
+
+
 ===Feature bodies ===
-Attribute_or_routine ::= <nowiki>[</nowiki>[[#Assertions|Precondition]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Local variable declarations|Local_declarations]]<nowiki>]</nowiki> <br/>
-Feature_body <br/>
-<nowiki>[</nowiki>[[#Assertions|Postcondition]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Rescue clauses|Rescue]]<nowiki>]</nowiki> <br/>
-<code>end</code><br/>
-Feature_body ::= [[#Routine bodies|Deferred]] | [[#Routine bodies|Effective_routine]] | [[#Attribute bodies|Attribute]]<br/>
-<br/>
-<br/>
+Attribute_or_routine ::= <nowiki>[</nowiki>[[#Assertions|Precondition]]<nowiki>]</nowiki> 
+<nowiki>[</nowiki>[[#Local variable declarations|Local_declarations]]<nowiki>]</nowiki> 
+Feature_body 
+<nowiki>[</nowiki>[[#Assertions|Postcondition]]<nowiki>]</nowiki> 
+<nowiki>[</nowiki>[[#Rescue clauses|Rescue]]<nowiki>]</nowiki> 
+<code>end</code>
+Feature_body ::= [[#Routine bodies|Deferred]] | [[#Routine bodies|Effective_routine]] | [[#Attribute bodies|Attribute]]
+
+
 ===Feature names ===
-Extended_feature_name ::= Feature_name [Alias] <br/>
-Feature_name ::= [[#Identfiers|Identifier]] <br/>
-Alias ::= <code>alias</code> '"' Alias_name '"' [<code>convert</code>] <br/>
-Alias_name ::= [[#Operators|Operator]] | Bracket <br/>
-Bracket ::= "[  ]" <br/>
-<br/>
-<br/>
+Extended_feature_name ::= Feature_name <nowiki>[Alias]</nowiki> 
+Feature_name ::= [[#Identfiers|Identifier]] 
+Alias ::= <code>alias</code> '"' Alias_name '"' <nowiki>[</nowiki><code>convert</code><nowiki>]</nowiki>
+Alias_name ::= [[#Operators|Operator]] | Bracket 
+Bracket ::= "<nowiki>[ ]</nowiki>" 
+
+
 ===Operators ===
-Operator ::= Unary | Binary <br/>
-Unary ::= <code>not</code> | "+" | "–" | Free_unary <br/>
-Binary ::= "+" | "–" | "*" | "/" | "//" | "\\" | "^" | ".." | <br/>
-"<" | ">" | "<=" | ">=" | <br/>
-<code>and</code> | <code>or</code> | <code>xor</code> | <code>and</code> <code>then</code> | <code>or</code> <code>else</code> | <code>implies</code> | <br/>
-Free_binary <br/>
+Operator ::= Unary | Binary 
+Unary ::= <code>not</code> | "+" | "–" | Free_unary 
+Binary ::= <nowiki>"+" | "–" | "*" | "/" | "//" | "\\" | "^" | ".." | "<" | ">" | "<=" | ">=" |</nowiki> <code>and</code> | <code>or</code> | <code>xor</code> | <code>and</code> <code>then</code> | <code>or</code> <code>else</code> | <code>implies</code> | Free_binary
+
 {{note| Free_unary and Free_binary are free operators that are distinct from (respectively) the ''standard'' unary and binary operators (one- or two-character symbols) explicitly listed in the Unary and Binary productions. See ''Definition: Free operator'' in the standard for more precision.}}
-<br/>
-<br/>
+
+
 ===Assigner marks ===
-Assigner_mark ::= <code>assign</code> [[#Feature names|Feature_name]]<br/>
-<br/>
-<br/>
+Assigner_mark ::= <code>assign</code> [[#Feature names|Feature_name]]
+
+
 ===Inheritance parts ===
-Inheritance ::= Inherit_clause+ <br/>
-Inherit_clause ::= <code>inherit</code> [Non_conformance] Parent_list <br/>
-Non_conformance ::= "{" NONE "}" <br/>
-Parent_list ::= {Parent ";" …}+ <br/>
-Parent ::= [[#Types|Class_type]] [Feature_adaptation] <br/>
-Feature_adaptation ::= <nowiki>[</nowiki>[[#Undefine clauses|Undefine]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Redefinition|Redefine]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Rename clauses|Rename]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Export adaptation|New_exports]]<nowiki>]</nowiki> <br/>
-<nowiki>[</nowiki>[[#Select clauses|Select]]<nowiki>]</nowiki> <br/>
-<code>end</code> <br/>
-<br/>
-<br/>
-<br/>
+Inheritance ::= Inherit_clause+ 
+Inherit_clause ::= <code>inherit</code> <nowiki>[Non_conformance]</nowiki> Parent_list 
+Non_conformance ::= "{" NONE "}" 
+Parent_list ::= {Parent ";" …}+ 
+Parent ::= [[#Types|Class_type]] <nowiki>[Feature_adaptation]</nowiki>
+Feature_adaptation ::= <nowiki>[</nowiki>[[#Undefine clauses|Undefine]]<nowiki>]</nowiki> 
+<nowiki>[</nowiki>[[#Redefinition|Redefine]]<nowiki>]</nowiki> 
+<nowiki>[</nowiki>[[#Rename clauses|Rename]]<nowiki>]</nowiki> 
+<nowiki>[</nowiki>[[#Export adaptation|New_exports]]<nowiki>]</nowiki> 
+<nowiki>[</nowiki>[[#Select clauses|Select]]<nowiki>]</nowiki> 
+<code>end</code> 
+
+
+
 ===Rename clauses ===
-Rename ::= <code>rename</code> Rename_list <br/>
-Rename_list ::= {Rename_pair "," …}+ <br/>
-Rename_pair ::= [[#Feature names|Feature_name]] <code>as</code> [[#Feature names|Extended_feature_name]] <br/>
-<br/>
-<br/>
+Rename ::= <code>rename</code> Rename_list 
+Rename_list ::= {Rename_pair "," …}+ 
+Rename_pair ::= [[#Feature names|Feature_name]] <code>as</code> [[#Feature names|Extended_feature_name]] 
+
+
 ===Clients ===
-Clients ::= "{" Class_list "}" <br/>
-Class_list ::= {[[#Class names|Class_name]] "," …}+<br/>
-<br/>
-<br/>
-<br/>
+Clients ::= "{" Class_list "}" 
+Class_list ::= {[[#Class names|Class_name]] "," …}+
+
+
+
 ===Export adaptation ===
-New_exports ::= <code>export</code> New_export_list <br/>
-New_export_list ::= {New_export_item ";" …}+ <br/>
-New_export_item ::= [[#Clients|Clients]] <nowiki>[</nowiki>[[#Feature parts|Header_comment]]<nowiki>]</nowiki> Feature_set <br/>
-Feature_set ::= Feature_list | <code>all</code> <br/>
-Feature_list ::= {[[#Feature names|Feature_name]] "," …}+<br/>
-<br/>
-<br/>
-<br/>
+New_exports ::= <code>export</code> New_export_list 
+New_export_list ::= {New_export_item ";" …}+ 
+New_export_item ::= [[#Clients|Clients]] <nowiki>[</nowiki>[[#Feature parts|Header_comment]]<nowiki>]</nowiki> Feature_set 
+Feature_set ::= Feature_list | <code>all</code> 
+Feature_list ::= {[[#Feature names|Feature_name]] "," …}+
+
+
+
 ===Formal argument and entity declarations ===
-Formal_arguments ::= "(" [[#Formal argument and entity declarations|Entity_declaration_list]] ")" <br/>
-Entity_declaration_list ::= {Entity_declaration_group ";" …}+ <br/>
-Entity_declaration_group ::= Identifier_list [[#Feature declarations|Type_mark]] <br/>
-Identifier_list ::= {[[#Identfiers|Identifier]] "," …}+ <br/>
-<br/>
-<br/>
+Formal_arguments ::= "(" [[#Formal argument and entity declarations|Entity_declaration_list]] ")" 
+Entity_declaration_list ::= {Entity_declaration_group ";" …}+ 
+Entity_declaration_group ::= Identifier_list [[#Feature declarations|Type_mark]] 
+Identifier_list ::= {[[#Identfiers|Identifier]] "," …}+ 
+
+
 ===Routine bodies ===
-Deferred ::= <code>deferred</code> <br/>
-Effective_routine ::= Internal | [[#External routines|External]] <br/>
-Internal ::= Routine_mark [[#Instructions|Compound]] <br/>
-Routine_mark ::= <code>do</code> | Once <br/>
-Once ::= <code>once</code> [ "("Key_list ")" ] <br/>
-Key_list ::= {[[#Manifest strings|Manifest_string]] "," …}+<br/>
-<br/>
-<br/>
+Deferred ::= <code>deferred</code> 
+Effective_routine ::= Internal | [[#External routines|External]] 
+Internal ::= Routine_mark [[#Instructions|Compound]] 
+Routine_mark ::= <code>do</code> | Once 
+Once ::= <code>once</code> <nowiki>[</nowiki> "("Key_list ")" <nowiki>]</nowiki> 
+Key_list ::= {[[#Manifest strings|Manifest_string]] "," …}+
+
+
 ===Local variable declarations ===
-Local_declarations ::= <code>local</code> <nowiki>[</nowiki>[[#Formal argument and entity declarations|Entity_declaration_list]]<nowiki>]</nowiki><br/>
-<br/>
-<br/>
+Local_declarations ::= <code>local</code> <nowiki>[</nowiki>[[#Formal argument and entity declarations|Entity_declaration_list]]<nowiki>]</nowiki>
+
+
 ===Instructions ===
-Compound ::= {Instruction ";" …}* <br/>
-Instruction ::= [[#Creation instructions|Creation_instruction]] | [[#Feature calls|Call]] | [[#Assignments|Assignment]] | [[#Assigner calls|Assigner_call]] | [[#Conditionals|Conditional]] | [[#Multi-branch instructions|Multi_branch]] <br/>
-| [[#Loops|Loop]] | [[#Debug instructions|Debug]] | [[#Precursor|Precursor]] | [[#Check instructions|Check]] | [[#Rescue clauses|Retry]]<br/>
-<br/>
-<br/>
+Compound ::= {Instruction ";" …}* 
+Instruction ::= [[#Creation instructions|Creation_instruction]] | [[#Feature calls|Call]] | [[#Assignments|Assignment]] | [[#Assigner calls|Assigner_call]] | [[#Conditionals|Conditional]] | [[#Multi-branch instructions|Multi_branch]] 
+| [[#Loops|Loop]] | [[#Debug instructions|Debug]] | [[#Precursor|Precursor]] | [[#Check instructions|Check]] | [[#Rescue clauses|Retry]]
+
+
 ===Assertions ===
-Precondition ::= <code>require</code> [<code>else</code>] Assertion <br/>
-Postcondition ::= <code>ensure</code> [<code>then</code>] Assertion <nowiki>[</nowiki>[[#"Only" postcondition clauses|Only]]<nowiki>]</nowiki> <br/>
-Invariant ::= <code>invariant</code> Assertion <br/>
-Assertion ::= {Assertion_clause ";" …}* <br/>
-Assertion_clause ::= [Tag_mark] Unlabeled_assertion_clause <br/>
-Unlabeled_assertion_clause ::= [[#Expressions|Boolean_expression]] | [[#Comments|Comment]] <br/>
-Tag_mark ::= Tag ":" <br/>
-Tag ::= [[#Identfiers|Identifier]] <br/>
-<br/>
-<br/>
+Precondition ::= <code>require</code> [<code>else</code>] Assertion 
+Postcondition ::= <code>ensure</code> [<code>then</code>] Assertion <nowiki>[</nowiki>[[#"Only" postcondition clauses|Only]]<nowiki>]</nowiki> 
+Invariant ::= <code>invariant</code> Assertion 
+Assertion ::= {Assertion_clause ";" …}* 
+Assertion_clause ::= [Tag_mark] Unlabeled_assertion_clause 
+Unlabeled_assertion_clause ::= [[#Expressions|Boolean_expression]] | [[#Comments|Comment]] 
+Tag_mark ::= Tag ":" 
+Tag ::= [[#Identfiers|Identifier]] 
+
+
 ===“Old” postcondition expressions ===
-Old ::= <code>old</code> [[#Expressions|Expression]]<br/>
-<br/>
-<br/>
+Old ::= <code>old</code> [[#Expressions|Expression]]
+
+
 ===“Only” postcondition clauses ===
-Only ::= <code>only</code> <nowiki>[</nowiki>[[#Export adaptation|Feature_list]]<nowiki>]</nowiki><br/>
-<br/>
-<br/>
+Only ::= <code>only</code> <nowiki>[</nowiki>[[#Export adaptation|Feature_list]]<nowiki>]</nowiki>
+
+
 ===Check instructions ===
-Check ::= <code>check</code> [[#Assertions|Assertion]] <nowiki>[</nowiki>[[#Notes|Notes]]<nowiki>]</nowiki> <code>end</code><br/>
-<br/>
-<br/>
+Check ::= <code>check</code> [[#Assertions|Assertion]] <nowiki>[</nowiki>[[#Notes|Notes]]<nowiki>]</nowiki> <code>end</code>
+
+
 ===Variants ===
-Variant ::= <code>variant</code> <nowiki>[</nowiki>[[#Assertions|Tag_mark]]<nowiki>]</nowiki> [[#Expressions|Expression]]<br/>
-<br/>
-<br/>
+Variant ::= <code>variant</code> <nowiki>[</nowiki>[[#Assertions|Tag_mark]]<nowiki>]</nowiki> [[#Expressions|Expression]]
+
+
 ===Precursor ===
-Precursor ::= <code>Precursor</code> [Parent_qualification] <nowiki>[</nowiki>[[#Actual arguments|Actuals]]<nowiki>]</nowiki> <br/>
-Parent_qualification ::= "{" [[#Class names|Class_name]] "}"<br/>
-<br/>
-<br/>
+Precursor ::= <code>Precursor</code> [Parent_qualification] <nowiki>[</nowiki>[[#Actual arguments|Actuals]]<nowiki>]</nowiki> 
+Parent_qualification ::= "{" [[#Class names|Class_name]] "}"
+
+
 ===Redefinition ===
-Redefine ::= <code>redefine</code> [[#Export adaptation|Feature_list]]<br/>
-<br/>
-<br/>
+Redefine ::= <code>redefine</code> [[#Export adaptation|Feature_list]]
+
+
 ===Undefine clauses ===
-Undefine ::= <code>undefine</code> [[#Export adaptation|Feature_list]]<br/>
-<br/>
-<br/>
+Undefine ::= <code>undefine</code> [[#Export adaptation|Feature_list]]
+
+
 ===Types ===
-Type ::= Class_or_tuple_type | [[#Formal generic parameters|Formal_generic_name]] | Anchored <br/>
-Class_or_tuple_type ::= Class_type | [[#Tuple types|Tuple_type]] <br/>
-Class_type ::= [Attachment_mark] [[#Class names|Class_name]] <nowiki>[</nowiki>[[#Actual generic parameters|Actual_generics]]<nowiki>]</nowiki> <br/>
-Attachment_mark ::= "?"  |  "!" <br/>
-Anchored ::= [Attachment_mark] <code>like</code> Anchor <br/>
-Anchor ::= [[#Feature names|Feature_name]] | <code>Current</code><br/>
-<br/>
-<br/>
+Type ::= Class_or_tuple_type | [[#Formal generic parameters|Formal_generic_name]] | Anchored 
+Class_or_tuple_type ::= Class_type | [[#Tuple types|Tuple_type]] 
+Class_type ::= [Attachment_mark] [[#Class names|Class_name]] <nowiki>[</nowiki>[[#Actual generic parameters|Actual_generics]]<nowiki>]</nowiki> 
+Attachment_mark ::= "?"  |  "!" 
+Anchored ::= [Attachment_mark] <code>like</code> Anchor 
+Anchor ::= [[#Feature names|Feature_name]] | <code>Current</code>
+
+
 ===Actual generic parameters ===
-Actual_generics ::= "[" Type_list "]" <br/>
-Type_list ::= {[[#Types|Type]] "," …}+<br/>
-<br/>
-<br/>
+Actual_generics ::= <nowiki>"[" Type_list "]"</nowiki>
+Type_list ::= {[[#Types|Type]] "," …}+
+
+
 ===Formal generic parameters ===
-Formal_generics ::= "[" Formal_generic_list "]" <br/>
-Formal_generic_list ::= {Formal_generic ","…}+ <br/>
-Formal_generic ::= [<code>frozen</code>] Formal_generic_name <nowiki>[</nowiki>[[#Generic constraints|Constraint]]<nowiki>]</nowiki> <br/>
-Formal_generic_name ::= [?] [[#Identfiers|Identifier]]<br/>
-<br/>
-<br/>
+Formal_generics ::= <nowiki>"[" Formal_generic_list "]"</nowiki>
+Formal_generic_list ::= {Formal_generic ","…}+ 
+Formal_generic ::= <nowiki>[</nowiki><code>frozen</code><nowiki>]</nowiki> Formal_generic_name <nowiki>[</nowiki>[[#Generic constraints|Constraint]]<nowiki>]</nowiki> 
+Formal_generic_name ::= <nowiki>[?]</nowiki> [[#Identfiers|Identifier]]
+
+
 ===Generic constraints ===
-Constraint ::= "–>" Constraining_types [Constraint_creators] <br/>
-Constraining_types ::= Single_constraint | Multiple_constraint <br/>
-Single_constraint ::= [[#Types|Type]] [Renaming] <br/>
-Renaming ::= [[#Rename clauses|Rename]] <code>end</code><br/>
-Multiple_constraint ::= "{" Constraint_list "}" <br/>
-Constraint_list ::= {Single_constraint "," …}+ <br/>
-Constraint_creators ::= <code>create</code> [[#Export adaptation|Feature_list]] <code>end</code><br/>
-<br/>
-<br/>
+Constraint ::= "–>" Constraining_types <nowiki>[Constraint_creators]</nowiki> 
+Constraining_types ::= Single_constraint | Multiple_constraint 
+Single_constraint ::= [[#Types|Type]] [Renaming] 
+Renaming ::= [[#Rename clauses|Rename]] <code>end</code>
+Multiple_constraint ::= "{" Constraint_list "}" 
+Constraint_list ::= {Single_constraint "," …}+ 
+Constraint_creators ::= <code>create</code> [[#Export adaptation|Feature_list]] <code>end</code>
+
+
 ===Tuple types ===
-Tuple_type ::= <code>TUPLE</code> [Tuple_parameter_list] <br/>
-Tuple_parameter_list ::= "[" Tuple_parameters "]"<br/>
-Tuple_parameters ::= [[#Actual generic parameters|Type_list]] | [[#Formal argument and entity declarations|Entity_declaration_list]]<br/>
-<br/>
-<br/>
+Tuple_type ::= <code>TUPLE</code> <nowiki>[Tuple_parameter_list]</nowiki>
+Tuple_parameter_list ::= <nowiki>"[" Tuple_parameters "]"</nowiki>
+Tuple_parameters ::= [[#Actual generic parameters|Type_list]] | [[#Formal argument and entity declarations|Entity_declaration_list]]
+
+
 ===Manifest tuples ===
-Manifest_tuple ::= "[" Expression_list "]" <br/>
-Expression_list ::= {[[#Expressions|Expression]] "," …}*<br/>
-<br/>
-<br/>
+Manifest_tuple ::= <nowiki>"[" Expression_list "]"</nowiki>
+Expression_list ::= {[[#Expressions|Expression]] "," …}*
+
+
 ===Converter clauses ===
-Converters ::= <code>convert</code> Converter_list <br/>
-Converter_list ::= {Converter ","…}+ <br/>
-Converter ::= Conversion_procedure | Conversion_query <br/>
-Conversion_procedure ::= [[#Feature names|Feature_name]] "(" "{" [[#Actual generic parameters|Type_list]] "}" ")" <br/>
-Conversion_query ::= [[#Feature names|Feature_name]] ":" "{" [[#Actual generic parameters|Type_list]] "}"<br/>
-<br/>
-<br/>
+Converters ::= <code>convert</code> Converter_list 
+Converter_list ::= {Converter ","…}+ 
+Converter ::= Conversion_procedure | Conversion_query 
+Conversion_procedure ::= [[#Feature names|Feature_name]] "(" "{" [[#Actual generic parameters|Type_list]] "}" ")" 
+Conversion_query ::= [[#Feature names|Feature_name]] ":" "{" [[#Actual generic parameters|Type_list]] "}"
+
+
 ===Select clauses ===
-Select ::= <code>select</code> [[#Export adaptation|Feature_list]]<br/>
-<br/>
-<br/>
+Select ::= <code>select</code> [[#Export adaptation|Feature_list]]
+
+
 ===Conditionals ===
-Conditional ::= <code>if</code> Then_part_list [Else_part] <code>end</code> <br/>
-Then_part_list ::= {Then_part <code>elseif</code> …}+ <br/>
-Then_part ::= [[#Expressions|Boolean_expression]] <code>then</code> [[#Instructions|Compound]] <br/>
-Else_part ::= <code>else</code> [[#Instructions|Compound]]<br/>
-<br/>
-<br/>
+Conditional ::= <code>if</code> Then_part_list <nowiki>[Else_part]</nowiki> <code>end</code> 
+Then_part_list ::= {Then_part <code>elseif</code> …}+ 
+Then_part ::= [[#Expressions|Boolean_expression]] <code>then</code> [[#Instructions|Compound]] 
+Else_part ::= <code>else</code> [[#Instructions|Compound]]
+
+
 ===Multi-branch instructions ===
-Multi_branch ::= <code>inspect</code> [[#Expressions|Expression]] [When_part_list] [Else_part] <code>end</code> <br/>
-When_part_list ::= When_part+ <br/>
-When_part ::= <code>when</code> Choices <code>then</code> [[#Instructions|Compound]] <br/>
-Choices ::= {Choice "," …}+ <br/>
-Choice ::= [[#Constants|Constant]] | [[#Manifest constants|Manifest_type]] | Constant_interval | Type_interval <br/>
-Constant_interval ::= [[#Constants|Constant]] ".." [[#Constants|Constant]] <br/>
-Type_interval ::= [[#Manifest constants|Manifest_type]] ".." [[#Manifest constants|Manifest_type]]<br/>
-<br/>
-<br/>
+Multi_branch ::= <code>inspect</code> [[#Expressions|Expression]] <nowiki>[When_part_list] [Else_part]</nowiki> <code>end</code> 
+When_part_list ::= When_part+ 
+When_part ::= <code>when</code> Choices <code>then</code> [[#Instructions|Compound]] 
+Choices ::= {Choice "," …}+ 
+Choice ::= [[#Constants|Constant]] | [[#Manifest constants|Manifest_type]] | Constant_interval | Type_interval 
+Constant_interval ::= [[#Constants|Constant]] ".." [[#Constants|Constant]] 
+Type_interval ::= [[#Manifest constants|Manifest_type]] ".." [[#Manifest constants|Manifest_type]]
+
+
 ===Loops ===
-Loop ::= Initialization <br/>
-<nowiki>[</nowiki>[[#Assertions|Invariant]]<nowiki>]</nowiki> <br/>
-Exit_condition <br/>
-Loop_body <br/>
-<nowiki>[</nowiki>[[#Variants|Variant]]<nowiki>]</nowiki><br/>
-<code>end</code> <br/>
-Initialization ::= <code>from</code> [[#Instructions|Compound]] <br/>
-Exit_condition ::= <code>until</code> [[#Expressions|Boolean_expression]] <br/>
-Loop_body ::= <code>loop</code> [[#Instructions|Compound]]<br/>
-<br/>
-<br/>
+Loop ::= Initialization 
+<nowiki>[</nowiki>[[#Assertions|Invariant]]<nowiki>]</nowiki> 
+Exit_condition 
+Loop_body 
+<nowiki>[</nowiki>[[#Variants|Variant]]<nowiki>]</nowiki>
+<code>end</code> 
+Initialization ::= <code>from</code> [[#Instructions|Compound]] 
+Exit_condition ::= <code>until</code> [[#Expressions|Boolean_expression]] 
+Loop_body ::= <code>loop</code> [[#Instructions|Compound]]
+
+
 ===Debug instructions ===
-Debug ::= <code>debug</code> [ "("[[#Routine_bodies|Key_list]] ")" ] [[#Instructions|Compound]] <code>end</code><br/>
-<br/>
-<br/>
+Debug ::= <code>debug</code> <nowiki>[</nowiki> "("[[#Routine_bodies|Key_list]] ")" ] [[#Instructions|Compound]] <code>end</code>
+
+
 ===Attribute bodies ===
-Attribute ::= <code>attribute</code> [[#Instructions|Compound]]<br/>
-<br/>
-<br/>
+Attribute ::= <code>attribute</code> [[#Instructions|Compound]]
+
+
 ===Entities and variables ===
-Entity ::= Variable | Read_only <br/>
-Variable ::= Variable_attribute | Local <br/>
-Variable_attribute ::= [[#Feature names|Feature_name]] <br/>
-Local ::= [[#Identfiers|Identifier]] | <code>Result</code> <br/>
-Read_only ::= Formal | Constant_attribute | <code>Current</code> <br/>
-Formal ::= [[#Identfiers|Identifier]] <br/>
-Constant_attribute ::= [[#Feature names|Feature_name]]<br/>
-<br/>
-<br/>
+Entity ::= Variable | Read_only 
+Variable ::= Variable_attribute | Local 
+Variable_attribute ::= [[#Feature names|Feature_name]] 
+Local ::= [[#Identfiers|Identifier]] | <code>Result</code> 
+Read_only ::= Formal | Constant_attribute | <code>Current</code> 
+Formal ::= [[#Identfiers|Identifier]] 
+Constant_attribute ::= [[#Feature names|Feature_name]]
+
+
 ===Creators parts ===
-Creators ::= Creation_clause+ <br/>
-Creation_clause ::= <code>create</code> <nowiki>[</nowiki>[[#Clients|Clients]]<nowiki>]</nowiki> <nowiki>[</nowiki>[[#Feature parts|Header_comment]]<nowiki>]</nowiki> Creation_procedure_list <br/>
-Creation_procedure_list ::= {Creation_procedure ","…}+ <br/>
-Creation_procedure ::= [[#Feature names|Feature_name]]<br/>
-<br/>
-<br/>
+Creators ::= Creation_clause+ 
+Creation_clause ::= <code>create</code> <nowiki>[</nowiki>[[#Clients|Clients]]<nowiki>]</nowiki> <nowiki>[</nowiki>[[#Feature parts|Header_comment]]<nowiki>]</nowiki> Creation_procedure_list 
+Creation_procedure_list ::= {Creation_procedure ","…}+ 
+Creation_procedure ::= [[#Feature names|Feature_name]]
+
+
 ===Creation instructions ===
-Creation_instruction ::= <code>create</code> [Explicit_creation_type] Creation_call <br/>
-Explicit_creation_type ::= "{" [[#Types|Type]] "}" <br/>
-Creation_call ::= [[#Entities and variables|Variable]] [Explicit_creation_call] <br/>
-Explicit_creation_call ::= "." [[#Feature calls|Unqualified_call]]<br/>
-<br/>
-<br/>
+Creation_instruction ::= <code>create</code> <nowiki>[Explicit_creation_type]</nowiki> Creation_call 
+Explicit_creation_type ::= "{" [[#Types|Type]] "}" 
+Creation_call ::= [[#Entities and variables|Variable]] [Explicit_creation_call] 
+Explicit_creation_call ::= "." [[#Feature calls|Unqualified_call]]
+
+
 ===Creation expressions ===
-Creation_expression ::= <code>create</code> [[#Creation instructions|Explicit_creation_type]] <nowiki>[</nowiki>[[#Creation instructions|Explicit_creation_call]]<nowiki>]</nowiki><br/>
-<br/>
-<br/>
+Creation_expression ::= <code>create</code> [[#Creation instructions|Explicit_creation_type]] <nowiki>[</nowiki>[[#Creation instructions|Explicit_creation_call]]<nowiki>]</nowiki>
+
+
 ===Equality expressions ===
-Equality ::= [[#Expressions|Expression]] Comparison [[#Expressions|Expression]] <br/>
-Comparison ::= "=" | "/=" | "~" | "/~"<br/>
-<br/>
-<br/>
+Equality ::= [[#Expressions|Expression]] Comparison [[#Expressions|Expression]] 
+Comparison ::= "=" | "/=" | "~" | "/~"
+
+
 ===Assignments ===
-Assignment ::= [[#Entities and variables|Variable]] ":=" [[#Expressions|Expression]]<br/>
-<br/>
-<br/>
+Assignment ::= [[#Entities and variables|Variable]] ":=" [[#Expressions|Expression]]
+
+
 ===Assigner calls ===
-Assigner_call ::= [[#Expressions|Expression]] ":=" [[#Expressions|Expression]]<br/>
-<br/>
-<br/>
+Assigner_call ::= [[#Expressions|Expression]] ":=" [[#Expressions|Expression]]
+
+
 ===Feature calls ===
-Call ::= Object_call | Non_object_call <br/>
-Object_call ::= [Target "."] Unqualified_call <br/>
-Unqualified_call ::= [[#Feature names|Feature_name]] <nowiki>[</nowiki>[[#Actual arguments|Actuals]]<nowiki>]</nowiki> <br/>
-Target ::= [[#Entities and variables|Local]] | [[#Entities and variables|Read_only]] | Call | Parenthesized_target <br/>
-Parenthesized_target ::= "( |" [[#Expressions|Expression]] "| )" <br/>
-Non_object_call ::= "{" [[#Types|Type]] "}" "." Unqualified_call<br/>
-<br/>
-<br/>
+Call ::= Object_call | Non_object_call 
+Object_call ::= <nowiki>[Target "."] Unqualified_call </nowiki>
+Unqualified_call ::= [[#Feature names|Feature_name]] <nowiki>[</nowiki>[[#Actual arguments|Actuals]]<nowiki>]</nowiki> 
+Target ::= [[#Entities and variables|Local]] | [[#Entities and variables|Read_only]] | Call | Parenthesized_target 
+Parenthesized_target ::= "( |" [[#Expressions|Expression]] "| )" 
+Non_object_call ::= "{" [[#Types|Type]] "}" "." Unqualified_call
+
+
 ===Actual arguments ===
-Actuals ::= "(" Actual_list ")" <br/>
-Actual_list ::= {[[#Expressions|Expression]] "," …}+<br/>
-<br/>
-<br/>
+Actuals ::= "(" Actual_list ")" 
+Actual_list ::= {[[#Expressions|Expression]] "," …}+
+
+
 ===Object test ===
-Object_test ::= "{" [[#Identfiers|Identifier]] ":" [[#Types|Type]] "}" [[#Expressions|Expression]]<br/>
-<br/>
-<br/>
+Object_test ::= "{" [[#Identfiers|Identifier]] ":" [[#Types|Type]] "}" [[#Expressions|Expression]]
+
+
 ===Rescue clauses ===
-Rescue ::= <code>rescue</code> [[#Instructions|Compound]] <br/>
-Retry ::= <code>retry</code><br/>
-<br/>
-<br/>
+Rescue ::= <code>rescue</code> [[#Instructions|Compound]] 
+Retry ::= <code>retry</code>
+
+
 ===Agents ===
-Agent ::= Call_agent | Inline_agent <br/>
-Call_agent ::= <code>agent</code> [[#Call agent bodies|Call_agent_body]] <br/>
-Inline_agent ::= <code>agent</code> <nowiki>[</nowiki>[[#Formal argument and entity declarations|Formal_arguments]]<nowiki>]</nowiki> <nowiki>[</nowiki>[[#Feature declarations|Type_mark]]<nowiki>]</nowiki> <nowiki>[</nowiki>[[#Feature bodies|Attribute_or_routine]]<nowiki>]</nowiki> <nowiki>[</nowiki>[[#Call agent bodies|Agent_actuals]]<nowiki>]</nowiki><br/>
-<br/>
-<br/>
+Agent ::= Call_agent | Inline_agent 
+Call_agent ::= <code>agent</code> [[#Call agent bodies|Call_agent_body]] 
+Inline_agent ::= <code>agent</code> <nowiki>[</nowiki>[[#Formal argument and entity declarations|Formal_arguments]]<nowiki>]</nowiki> <nowiki>[</nowiki>[[#Feature declarations|Type_mark]]<nowiki>]</nowiki> <nowiki>[</nowiki>[[#Feature bodies|Attribute_or_routine]]<nowiki>]</nowiki> <nowiki>[</nowiki>[[#Call agent bodies|Agent_actuals]]<nowiki>]</nowiki>
+
+
 ===Call agent bodies ===
-Call_agent_body ::= Agent_qualified | Agent_unqualified <br/>
-Agent_qualified ::= Agent_target ". " Agent_unqualified <br/>
-Agent_unqualified ::= [[#Feature names|Feature_name]] [Agent_actuals] <br/>
-Agent_target ::= Entity | Parenthesized | [[#Manifest constants|Manifest_type]] <br/>
-Agent_actuals ::= "(" Agent_actual_list ")" <br/>
-Agent_actual_list ::= {Agent_actual "," …}+ <br/>
-Agent_actual ::= [[#Expressions|Expression]] | Placeholder <br/>
-Placeholder ::= <nowiki>[</nowiki>[[#Manifest constants|Manifest_type]]<nowiki>]</nowiki> "?"<br/>
-<br/>
-<br/>
+Call_agent_body ::= Agent_qualified | Agent_unqualified 
+Agent_qualified ::= Agent_target ". " Agent_unqualified 
+Agent_unqualified ::= [[#Feature names|Feature_name]] [Agent_actuals] 
+Agent_target ::= Entity | Parenthesized | [[#Manifest constants|Manifest_type]] 
+Agent_actuals ::= "(" Agent_actual_list ")" 
+Agent_actual_list ::= {Agent_actual "," …}+ 
+Agent_actual ::= [[#Expressions|Expression]] | Placeholder 
+Placeholder ::= <nowiki>[</nowiki>[[#Manifest constants|Manifest_type]]<nowiki>]</nowiki> "?"
+
+
 ===Expressions ===
-Expression ::= Basic_expression | Special_expression <br/>
-Basic_expression ::= [[#Entities and variables|Read_only]] | [[#Entities and variables|Local]] | [[#Feature calls|Call]] | [[#Precursor|Precursor]] | [[#Equality expressions|Equality]] | Parenthesized | [[#"Old" postcondition expressions|Old]] | <br/>
-[[#Operator expressions|Operator_expression]] | [[#Bracket expressions|Bracket_expression]]  | [[#Creation expression|Creation_expression]] <br/>
-Special_expression ::= [[#Manifest constants|Manifest_constant]] | [[#Manifest tuples|Manifest_tuple]] | [[#Agents|Agent]] | [[#Object test|Object_test]] | Once_string | <br/>
-Address <br/>
-Parenthesized ::= "(" Expression ")" <br/>
-Address ::= "$" [[#Entities and variables|Variable]] <br/>
-Once_string ::= <code>once</code> [[#Manifest strings|Manifest_string]] <br/>
-Boolean_expression ::= Basic_expression | [[#Manifest constants|Boolean_constant]] | [[#Object test|Object_test]]<br/>
-<br/>
-<br/>
+Expression ::= Basic_expression | Special_expression 
+Basic_expression ::= [[#Entities and variables|Read_only]] | [[#Entities and variables|Local]] | [[#Feature calls|Call]] | [[#Precursor|Precursor]] | [[#Equality expressions|Equality]] | Parenthesized | [[#"Old" postcondition expressions|Old]] | 
+[[#Operator expressions|Operator_expression]] | [[#Bracket expressions|Bracket_expression]]  | [[#Creation expression|Creation_expression]] 
+Special_expression ::= [[#Manifest constants|Manifest_constant]] | [[#Manifest tuples|Manifest_tuple]] | [[#Agents|Agent]] | [[#Object test|Object_test]] | Once_string | 
+Address 
+Parenthesized ::= "(" Expression ")" 
+Address ::= "$" [[#Entities and variables|Variable]] 
+Once_string ::= <code>once</code> [[#Manifest strings|Manifest_string]] 
+Boolean_expression ::= Basic_expression | [[#Manifest constants|Boolean_constant]] | [[#Object test|Object_test]]
+
+
 ===Operator expressions ===
-Operator_expression ::= Unary_expression | Binary_expression <br/>
-Unary_expression ::= Unary Expression <br/>
-Binary_expression ::= [[#Expressions|Expression]] [[#Operators|Binary]] [[#Expressions|Expression]]<br/>
-<br/>
-<br/>
+Operator_expression ::= Unary_expression | Binary_expression 
+Unary_expression ::= Unary Expression 
+Binary_expression ::= [[#Expressions|Expression]] [[#Operators|Binary]] [[#Expressions|Expression]]
+
+
 ===Bracket expressions ===
-Bracket_expression ::= Bracket_target "[" [[#Actual arguments|Actuals]] "]" <br/>
-Bracket_target ::= [[#Feature calls|Target]] | [[#Expressions|Once_string]] | [[#Manifest constants|Manifest_constant]] | [[#Manifest tuples|Manifest_tuple]]<br/>
-<br/>
-<br/>
+Bracket_expression ::= Bracket_target "[" [[#Actual arguments|Actuals]] "]" 
+Bracket_target ::= [[#Feature calls|Target]] | [[#Expressions|Once_string]] | [[#Manifest constants|Manifest_constant]] | [[#Manifest tuples|Manifest_tuple]]
+
+
 ===Constants ===
-Constant ::= [[#Manifest constants|Manifest_constant]] | Constant_attribute <br/>
-Constant_attribute ::= [[#Feature names|Feature_name]]<br/>
-<br/>
-<br/>
+Constant ::= [[#Manifest constants|Manifest_constant]] | Constant_attribute 
+Constant_attribute ::= [[#Feature names|Feature_name]]
+
+
 ===Manifest constants ===
-Manifest_constant ::= [Manifest_type] Manifest_value <br/>
-Manifest_type ::= "{" [[#Types|Type]] "}"<br/>
-Manifest_value ::= Boolean_constant |  <br/>
-Character_constant |  <br/>
-Integer_constant |  <br/>
-Real_constant |  <br/>
-[[#Manifest strings|Manifest_string]] | <br/>
-Manifest_type <br/>
-Sign ::= "+" | "–" <br/>
-Integer_constant ::= [Sign] [[#Integers|Integer]] <br/>
-Character_constant ::= " ' " [[#Characters|Character]] " ' " <br/>
-Boolean_constant ::= <code>True</code> | <code>False</code> <br/>
-Real_constant ::= [Sign] [[#Reals|Real]]<br/>
-<br/>
-<br/>
+Manifest_constant ::= [Manifest_type] Manifest_value 
+Manifest_type ::= "{" [[#Types|Type]] "}"
+Manifest_value ::= Boolean_constant |  
+Character_constant |  
+Integer_constant |  
+Real_constant |  
+[[#Manifest strings|Manifest_string]] | 
+Manifest_type 
+Sign ::= "+" | "–" 
+Integer_constant ::= <nowiki>[Sign]</nowiki> [[#Integers|Integer]] 
+Character_constant ::= " ' " [[#Characters|Character]] " ' " 
+Boolean_constant ::= <code>True</code> | <code>False</code> 
+Real_constant ::= <nowiki>[Sign]</nowiki> [[#Reals|Real]]
+
+
 ===Manifest strings ===
-Manifest_string ::= Basic_manifest_string | Verbatim_string <br/>
-Basic_manifest_string ::= ' " '  String_content  ' " ' <br/>
-String_content ::= {[[#Simple strings|Simple_string]] [[#Line wrapping parts|Line_wrapping_part]] …}+<br/>
-Verbatim_string ::= Verbatim_string_opener Line_sequence Verbatim_string_closer <br/>
-Verbatim_string_opener ::= ' " ' <nowiki>[</nowiki>[[#Simple strings|Simple_string]]<nowiki>]</nowiki> Open_bracket <br/>
-Verbatim_string_closer ::= Close_bracket <nowiki>[</nowiki>[[#Simple strings|Simple_string]]<nowiki>]</nowiki> ' " ' <br/>
-Open_bracket ::= "[" | "{" <br/>
-Close_bracket ::= "]" | "}"Verbatim_string ::= Verbatim_string_opener Line_sequence Verbatim_string_closer <br/>
-Verbatim_string_opener ::= ' " ' <nowiki>[</nowiki>[[#Simple strings|Simple_string]]<nowiki>]</nowiki> Open_bracket <br/>
-Verbatim_string_closer ::= Close_bracket <nowiki>[</nowiki>[[#Simple strings|Simple_string]]<nowiki>]</nowiki> ' " ' <br/>
-Open_bracket ::= "[" | "{" <br/>
-Close_bracket ::= "]" | "}" <br/>
-<br/>
-<br/>
+Manifest_string ::= Basic_manifest_string | Verbatim_string 
+Basic_manifest_string ::= ' " '  String_content  ' " ' 
+String_content ::= {[[#Simple strings|Simple_string]] [[#Line wrapping parts|Line_wrapping_part]] …}+
+Verbatim_string ::= Verbatim_string_opener Line_sequence Verbatim_string_closer 
+Verbatim_string_opener ::= ' " ' <nowiki>[</nowiki>[[#Simple strings|Simple_string]]<nowiki>]</nowiki> Open_bracket 
+Verbatim_string_closer ::= Close_bracket <nowiki>[</nowiki>[[#Simple strings|Simple_string]]<nowiki>]</nowiki> ' " ' 
+Open_bracket ::= <nowiki>"[" | "{"</nowiki> 
+Close_bracket ::= "]" | "}"Verbatim_string ::= Verbatim_string_opener Line_sequence Verbatim_string_closer 
+Verbatim_string_opener ::= ' " ' <nowiki>[</nowiki>[[#Simple strings|Simple_string]]<nowiki>]</nowiki> Open_bracket 
+Verbatim_string_closer ::= Close_bracket <nowiki>[</nowiki>[[#Simple strings|Simple_string]]<nowiki>]</nowiki> ' " ' 
+Open_bracket ::= <nowiki>"[" | "{" </nowiki>
+Close_bracket ::= <nowiki>"]" | "}" </nowiki>
+
+
 ===External routines ===
-External ::= <code>external</code> External_language [External_name] <br/>
-External_language ::= Unregistered_language | [[#Registered languages|Registered_language]] <br/>
-Unregistered_language ::= [[#Manifest strings|Manifest_string]] <br/>
-External_name ::= <code>alias</code> [[#Manifest strings|Manifest_string]]<br/>
+External ::= <code>external</code> External_language <nowiki>[External_name]</nowiki>
+External_language ::= Unregistered_language | [[#Registered languages|Registered_language]] 
+Unregistered_language ::= [[#Manifest strings|Manifest_string]] 
+External_name ::= <code>alias</code> [[#Manifest strings|Manifest_string]]
 {{note|If the `inline' keyword is used in the Registered_language part, then External_name part is the inline code on the specified language.}}
-<br/>
-<br/>
+
+
 ===Registered languages ===
-Registered_language ::= [[#C externals|C_external]] | [[#C++ externals|C++_external]] | [[#DLL externals|DLL_external]]<br/>
-<br/>
-<br/>
+Registered_language ::= [[#C externals|C_external]] | [[#C++ externals|C++_external]] | [[#DLL externals|DLL_external]]
+
+
 ===External signatures ===
-External_signature ::= <code>signature</code> [External_argument_types] [: External_type] <br/>
-External_argument_types ::= "(" External_type_list ")" <br/>
-External_type_list ::= {External_type "," …}* <br/>
-External_type ::= [[#Simple strings|Simple_string]]<br/>
-<br/>
-<br/>
+External_signature ::= <code>signature</code> <nowiki>[External_argument_types] [: External_type]</nowiki> 
+External_argument_types ::= "(" External_type_list ")" 
+External_type_list ::= {External_type "," …}* 
+External_type ::= [[#Simple strings|Simple_string]]
+
+
 ===External file use ===
-External_file_use ::= <code>use</code> External_file_list <br/>
-External_file_list ::= {External_file "," …}+ <br/>
-External_file ::= External_user_file | External_system_file <br/>
-External_user_file ::= ' " '  [[#Simple strings|Simple_string]]  ' " ' <br/>
-External_system_file ::= "<"[[#Simple strings|Simple_string]] ">"<br/>
-<br/>
-<br/>
+External_file_use ::= <code>use</code> External_file_list 
+External_file_list ::= {External_file "," <nowiki>… }+ </nowiki>
+External_file ::= External_user_file | External_system_file 
+External_user_file ::= ' " '  [[#Simple strings|Simple_string]]  ' " ' 
+External_system_file ::= <nowiki>"<"</nowiki> [[#Simple strings|Simple_string]] <nowiki>">"</nowiki>
+
 ===C externals ===
-C_external ::= ' " ' <code>C</code> [<code>inline</code>] [ [[#External signatures |External_signature]] ] [ [[#External file use |External_file_use]] ] ' " '<br/>
-<br/>
-<br/>
+C_external ::= ' " ' <code>C</code> <nowiki>[</nowiki><code>inline</code>] <nowiki>[</nowiki> [[#External signatures |External_signature]] <nowiki>] [</nowiki> [[#External file use |External_file_use]] <nowiki>] ' " '</nowiki>
+
+
 ===C++ externals ===
-C++_external ::= ' " '  <code>C++</code> <code>inline</code> [ [[#External signatures |External_signature]] ] [ [[#External file use |External_file_use]] ] ' " '<br/>
-<br/>
-<br/>
+C++_external ::= ' " '  <code>C++</code> <code>inline</code> <nowiki>[</nowiki> [[#External signatures |External_signature]] <nowiki>] [</nowiki> [[#External file use |External_file_use]] <nowiki>] ' " '</nowiki>
+
+
 ===DLL externals ===
-DLL_external ::= ' " ' <code>dll</code> [<code>windows</code>] DLL_identifier [DLL_index] [ [[#External signatures |External_signature]] ]
-[ [[#External file use |External_file_use]] ] ' " ' <br/>
-DLL_identifier ::= [[#Simple strings|Simple_string]] <br/>
-DLL_index ::= [[#Integers|Integer]]<br/>
-<br/>
-<br/>
+DLL_external ::= ' " ' <code>dll</code> <nowiki>[</nowiki><code>windows</code><nowiki>] DLL_identifier [DLL_index] [[</nowiki> [[#External signatures |External_signature]] <nowiki>] [</nowiki> [[#External file use |External_file_use]] <nowiki>] ' " ' </nowiki>
+DLL_identifier ::= [[#Simple strings|Simple_string]] 
+DLL_index ::= [[#Integers|Integer]]
+
+
 ===Comments ===
-Comment ::= "– –" {[[#Simple strings|Simple_string]] Comment_break …}* <br/>
-Comment_break ::= New_line [Blanks_or_tabs] "– –"<br/>
-<br/>
+Comment ::= "– –" <nowiki>{</nowiki>[[#Simple strings|Simple_string]] Comment_break …}* 
+Comment_break ::= New_line <nowiki>[Blanks_or_tabs] "– –"</nowiki>
+
 ===Integers ===
-Integer ::= [Integer_base] Digit_sequence <br/>
-Integer_base ::= "0" Integer_base_letter <br/>
-Integer_base_letter ::= "b"  |  "c"  |  "x" |  "B"  |  "C"  |  "X" <br/>
-Digit_sequence ::= Digit+ <br/>
-Digit ::= "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"  | <br/>
-"a" | "b" | "c" | "d" | "e" | "f" | <br/>
-"A" | "B" | "C" | "D" | "E" | "F" | "_"<br/>
-<br/>
+Integer ::= <nowiki>[Integer_base]</nowiki> Digit_sequence 
+Integer_base ::= "0" Integer_base_letter 
+Integer_base_letter ::= "b"  |  "c"  |  "x" |  "B"  |  "C"  |  "X" 
+Digit_sequence ::= Digit+ 
+Digit ::= "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9"  | 
+"a" | "b" | "c" | "d" | "e" | "f" | 
+"A" | "B" | "C" | "D" | "E" | "F" | "_"
+
 
 
diff --git a/documentation/current/method/quick-reference-eiffel-programming-language/index.wiki b/documentation/current/eiffel/Language_reference/quick-reference-eiffel-programming-language/index.wiki
similarity index 100%
rename from documentation/current/method/quick-reference-eiffel-programming-language/index.wiki
rename to documentation/current/eiffel/Language_reference/quick-reference-eiffel-programming-language/index.wiki
diff --git a/documentation/current/method/void-safe-programming-eiffel/converting-existing-software-void-safety/changes-eiffel-libraries-support-void-safety.wiki b/documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/converting-existing-software-void-safety/changes-eiffel-libraries-support-void-safety.wiki
similarity index 100%
rename from documentation/current/method/void-safe-programming-eiffel/converting-existing-software-void-safety/changes-eiffel-libraries-support-void-safety.wiki
rename to documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/converting-existing-software-void-safety/changes-eiffel-libraries-support-void-safety.wiki
diff --git a/documentation/current/method/void-safe-programming-eiffel/converting-existing-software-void-safety/index.wiki b/documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/converting-existing-software-void-safety/index.wiki
similarity index 100%
rename from documentation/current/method/void-safe-programming-eiffel/converting-existing-software-void-safety/index.wiki
rename to documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/converting-existing-software-void-safety/index.wiki
diff --git a/documentation/current/method/void-safe-programming-eiffel/converting-existing-software-void-safety/mixing-void-safe-and-void-unsafe-software.wiki b/documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/converting-existing-software-void-safety/mixing-void-safe-and-void-unsafe-software.wiki
similarity index 100%
rename from documentation/current/method/void-safe-programming-eiffel/converting-existing-software-void-safety/mixing-void-safe-and-void-unsafe-software.wiki
rename to documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/converting-existing-software-void-safety/mixing-void-safe-and-void-unsafe-software.wiki
diff --git a/documentation/current/method/void-safe-programming-eiffel/creating-new-void-safe-project.wiki b/documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/creating-new-void-safe-project.wiki
similarity index 100%
rename from documentation/current/method/void-safe-programming-eiffel/creating-new-void-safe-project.wiki
rename to documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/creating-new-void-safe-project.wiki
diff --git a/documentation/current/method/void-safe-programming-eiffel/index.wiki b/documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/index.wiki
similarity index 98%
rename from documentation/current/method/void-safe-programming-eiffel/index.wiki
rename to documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/index.wiki
index 6f295651..3afc6536 100644
--- a/documentation/current/method/void-safe-programming-eiffel/index.wiki
+++ b/documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/index.wiki
@@ -1,5 +1,5 @@
 [[Property:title|Void-safe programming in Eiffel]]
-[[Property:weight|3]]
+[[Property:weight|10]]
 [[Property:uuid|a03568e8-eb79-70d7-04a3-6fd3ed7ac2b3]]
 =About void-safe software development using Eiffel=
 
diff --git a/documentation/current/method/void-safe-programming-eiffel/void-safety-background-definition-and-tools.wiki b/documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/void-safety-background-definition-and-tools.wiki
similarity index 100%
rename from documentation/current/method/void-safe-programming-eiffel/void-safety-background-definition-and-tools.wiki
rename to documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/void-safety-background-definition-and-tools.wiki
diff --git a/documentation/current/method/void-safe-programming-eiffel/what-makes-certified-attachment-pattern.wiki b/documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/what-makes-certified-attachment-pattern.wiki
similarity index 100%
rename from documentation/current/method/void-safe-programming-eiffel/what-makes-certified-attachment-pattern.wiki
rename to documentation/current/eiffel/Language_reference/void-safe-programming-eiffel/what-makes-certified-attachment-pattern.wiki
diff --git a/documentation/current/eiffel/Overview/common-myths-and-misconceptions-about-eiffel.wiki b/documentation/current/eiffel/Overview/common-myths-and-misconceptions-about-eiffel.wiki
new file mode 100644
index 00000000..b400a776
--- /dev/null
+++ b/documentation/current/eiffel/Overview/common-myths-and-misconceptions-about-eiffel.wiki
@@ -0,0 +1,80 @@
+[[Property:title|Common myths and misconceptions about Eiffel]]
+[[Property:link_title|]]
+[[Property:weight|2]]
+[[Property:uuid|056c0ab0-8e44-571f-f126-0b1850980754]]
+Often, when we speak about Eiffel to prospective users, we hear them repeat misinformation about the method, the language, or the tools. Most of the time, the stories are familiar to us … and untrue. Here are a few of the myths that we hear most often, as recounted and debunked by the series entitled [http://eiffel.com/developers/presentations/ "Where Eiffel Fits"].
+
+
+==Eiffel is an "academic" language only:    ''Whoa, wrong! Twice!''==
+
+Recently, I was offered the opportunity to speak to a local technology group about Eiffel for Microsoft .Net. The leader of this group is part of a small commercially-oriented software development company. Concerning Eiffel, he said, “All I know about Eiffel is that it’s an academic language.”
+
+We hear that one a lot … and it’s wrong … in two unrelated ways.
+
+First, as you should know by now, Eiffel is a framework for software development. It has a full-lifecycle development method. The Eiffel method is supported by a notation we call the Eiffel programming language. The notation just happens to be designed such that when it contains sufficient detail, it can be compiled into a running software system. Additionally, the method and language are supported by a set of tools including an interactive development and compiler. So to refer to Eiffel only as a "language" is to do injustice to the complete framework of which the language is only one part.
+
+Secondly, I’m not sure what “academic language” means exactly, but if it means only used in an academic setting, or not fit for practical work, then this could not be farther from the truth. It is true that Bertrand Meyer who developed the original Eiffel concepts has academic background and is well-respected in the academic community. It’s also true that many of those Eiffel ideas evolved from work that was done by other academic computer scientists and mathematicians. And it’s true that many colleges and universities use Eiffel to teach the best practices of software development.
+
+But Eiffel is also used successfully in many commercial and government endeavors. If you have any doubts, pay a visit to [https://www.eiffel.com/company/customers/testimonials/ eiffel.com] and check out the success stories and customers testimonials. 
+
+
+==Eiffel is not for doing "real" work:     ''That's  a joke, right?''==
+
+Occasionally we’ve heard people say that Eiffel is only suitable for building “toy” systems.
+
+This is similar to the "academic language" argument and is just as false.
+
+In actuality, we see Eiffel being used often in situations in which other technologies fail. If anything it is the other commonly used technologies that tend to break down under stress.
+
+We see Eiffel being used instead of other technologies for systems in which scalability and reliability are essential.
+
+One of our customers is an organization that has developed a payroll system using Eiffel that every week pays over two hundred thousand employees in twenty thousand different institutions … the people in this organization would assure you that Eiffel is indeed industrial grade.
+
+
+==Not many people are using Eiffel:    ''You wouldn't want to share an elevator with them all!''==
+
+The answer to this one depends a bit upon your frame of reference. Some time ago Microsoft estimated that there were twenty million Visual Basic programmers world wide. 
+
+If this is true, then relatively speaking, we have to admit that Eiffel’s market share ''is'' considerably smaller than that of Visual Basic.
+
+Despite that, it’s not correct to say that not many people use Eiffel. Eiffel licenses world wide number in the tens of thousands. If you use Eiffel, you are not alone. These license-holders have formed a lasting worldwide quorum. Many world-class organizations are committed now, and will continue to be committed to the Eiffel framework. There is support through your maintenance contract with Eiffel Software. Help and information are available online in the form of the [https://www.eiffel.com/company/customers/ Eiffel Software users’ list] and websites like [http://community.eiffel.com/room/ EiffelRoom].
+
+Eiffel Software's dual licensing model gives developers the opportunity to learn Eiffel without a great initial financial commitment. 
+
+So, don’t worry about it, plenty of people use Eiffel … and those numbers are increasing constantly.
+
+
+==If we use Eiffel, we may not be able to find qualified programmers: ''Gimme a break.''==
+
+Through the years some potential Eiffel users have expressed to us a concern that if they embrace Eiffel, that they may not be able to find a sufficient number of qualified developers.
+
+This is of course incorrect.
+
+First, almost all Eiffel people were proficient in some other technology before they became Eiffel people. It turns out that this really works to your advantage. You see, Eiffel people want to stay Eiffel people. So an Eiffel programmer on the job market will be searching for an Eiffel position first, and would probably rather have a root canal than to go back to working in his or her previous technology.
+
+Additionally, it is important also to understand that Eiffel developers are easy to create. Because Eiffel is simple, clean, and elegant, it doesn’t take long to get people going with it. I teach a five-day course that contains fifteen programming exercises. Each time I’ve taught the course, almost every student has finished every exercise. Students leave with a good foundation for how to begin saving time and money for their organization by constructing quality software with Eiffel. These people can be fluent in Eiffel in as little as a couple of months. This can be contrasted with the other extreme ... a well-known Microsoft Windows expert told me a couple of years ago that he estimates it to take 5 to 7 years to become truly fluent in C++/COM programming on Windows. Programmers who are proficient in other technologies often experience Eiffel as a breath of fresh air.
+
+
+==Eiffel might not be around in five/eight/ten (choose one) years: ''Better recalibrate your crystal ball, Nostradamus!''==
+
+I think the first time I heard this one, it was about 1989.
+
+And of course, I’ve heard it many times in the years since. 
+
+And of course, it’s not true. 
+
+Eiffel is more complete and functionally superior in most ways to every other commercially viable software development technology … and there are enough people around who recognize this (that quorum of users I mentioned earlier) to ensure that Eiffel will be around for a long time to come.
+
+It’s possible that twenty-five years from now, there will be a significantly better software engineering idea … but certainly there hasn’t been anything that’s come close since Eiffel’s original design in 1985. In most areas, other technologies are playing “catch-up” to Eiffel. 
+
+Besides, Eiffel constantly implements refinements and new capabilities with minimal impact on existing software. [[Void-safe programming in Eiffel|Void-safe programming]] is an excellent example of this. 
+
+You can get a feel for this issue by watching [http://channel9.msdn.com/posts/Charles/Emmanuel-Stapf-Eiffel-and-Contract-Oriented-Programming/ this video on Microsoft Developers Network Channel9]. Here you'll see Emmanuel Stapf, an engineer at Eiffel Software, speak with Mads Torgersen, one of Microsoft's C# language designers. You'll hear how Eiffel stays fresh and continues to set a technological standard worthy of the aspirations of other technologies.
+
+So, don’t worry about it. Eiffel will be here.
+
+
+
+
+ 
+
diff --git a/documentation/current/why-eiffel/eiffel-two-minute-fact-sheet.wiki b/documentation/current/eiffel/Overview/eiffel-two-minute-fact-sheet.wiki
similarity index 98%
rename from documentation/current/why-eiffel/eiffel-two-minute-fact-sheet.wiki
rename to documentation/current/eiffel/Overview/eiffel-two-minute-fact-sheet.wiki
index 88bf13ab..ab5d7e9d 100644
--- a/documentation/current/why-eiffel/eiffel-two-minute-fact-sheet.wiki
+++ b/documentation/current/eiffel/Overview/eiffel-two-minute-fact-sheet.wiki
@@ -1,4 +1,4 @@
-[[Property:title|Eiffel: The Two-Minute Fact Sheet]]
+[[Property:title|Two-Minute fact sheet]]
 [[Property:weight|0]]
 [[Property:uuid|f672bfb8-ddea-beb1-eaa6-e374a6a6bc92]]
 If you are both curious about Eiffel and in a hurry, take a couple of minutes to read these facts about Eiffel. If anything here seems too good to be true, please suspend your disbelief. Press on to the more detailed documentation for the rationale, and our success stories for the evidence behind these facts.
diff --git a/documentation/current/eiffel/Overview/index.wiki b/documentation/current/eiffel/Overview/index.wiki
new file mode 100644
index 00000000..4c8c788e
--- /dev/null
+++ b/documentation/current/eiffel/Overview/index.wiki
@@ -0,0 +1,4 @@
+[[Property:title|Overview]]
+[[Property:link_title|Overview]]
+[[Property:weight|1]]
+
diff --git a/documentation/current/why-eiffel/why-your-next-project-should-use-eiffel.wiki b/documentation/current/eiffel/Overview/why-your-next-project-should-use-eiffel.wiki
similarity index 99%
rename from documentation/current/why-eiffel/why-your-next-project-should-use-eiffel.wiki
rename to documentation/current/eiffel/Overview/why-your-next-project-should-use-eiffel.wiki
index 580eb1de..f201bf5e 100644
--- a/documentation/current/why-eiffel/why-your-next-project-should-use-eiffel.wiki
+++ b/documentation/current/eiffel/Overview/why-your-next-project-should-use-eiffel.wiki
@@ -1,4 +1,4 @@
-[[Property:title|Why your next project should use Eiffel]]
+[[Property:title|Your next project in Eiffel]]
 [[Property:weight|1]]
 [[Property:uuid|b0ff2508-8cd7-2e13-bf6b-b4a7a8235875]]
 (After an article in the special Eiffel issue of the ''Journal of Object-Oriented Programming'', May 1996. ) <br/>
diff --git a/documentation/current/method/books-about-eiffel-method-and-language/ecma-standard-367.wiki b/documentation/current/eiffel/Technical_papers/books-about-eiffel-method-and-language/ecma-standard-367.wiki
similarity index 100%
rename from documentation/current/method/books-about-eiffel-method-and-language/ecma-standard-367.wiki
rename to documentation/current/eiffel/Technical_papers/books-about-eiffel-method-and-language/ecma-standard-367.wiki
diff --git a/documentation/current/method/books-about-eiffel-method-and-language/eiffel-language.wiki b/documentation/current/eiffel/Technical_papers/books-about-eiffel-method-and-language/eiffel-language.wiki
similarity index 100%
rename from documentation/current/method/books-about-eiffel-method-and-language/eiffel-language.wiki
rename to documentation/current/eiffel/Technical_papers/books-about-eiffel-method-and-language/eiffel-language.wiki
diff --git a/documentation/current/method/books-about-eiffel-method-and-language/index.wiki b/documentation/current/eiffel/Technical_papers/books-about-eiffel-method-and-language/index.wiki
similarity index 100%
rename from documentation/current/method/books-about-eiffel-method-and-language/index.wiki
rename to documentation/current/eiffel/Technical_papers/books-about-eiffel-method-and-language/index.wiki
diff --git a/documentation/current/method/books-about-eiffel-method-and-language/object-oriented-software-construction-2nd-edition.wiki b/documentation/current/eiffel/Technical_papers/books-about-eiffel-method-and-language/object-oriented-software-construction-2nd-edition.wiki
similarity index 100%
rename from documentation/current/method/books-about-eiffel-method-and-language/object-oriented-software-construction-2nd-edition.wiki
rename to documentation/current/eiffel/Technical_papers/books-about-eiffel-method-and-language/object-oriented-software-construction-2nd-edition.wiki
diff --git a/documentation/current/method/books-about-eiffel-method-and-language/touch-class-learning-program-well-objects-and-contracts.wiki b/documentation/current/eiffel/Technical_papers/books-about-eiffel-method-and-language/touch-class-learning-program-well-objects-and-contracts.wiki
similarity index 100%
rename from documentation/current/method/books-about-eiffel-method-and-language/touch-class-learning-program-well-objects-and-contracts.wiki
rename to documentation/current/eiffel/Technical_papers/books-about-eiffel-method-and-language/touch-class-learning-program-well-objects-and-contracts.wiki
diff --git a/documentation/current/papers/eiffel-expression-language.wiki b/documentation/current/eiffel/Technical_papers/eiffel-expression-language.wiki
similarity index 100%
rename from documentation/current/papers/eiffel-expression-language.wiki
rename to documentation/current/eiffel/Technical_papers/eiffel-expression-language.wiki
diff --git a/documentation/current/eiffel/Technical_papers/index.wiki b/documentation/current/eiffel/Technical_papers/index.wiki
new file mode 100644
index 00000000..5de684f3
--- /dev/null
+++ b/documentation/current/eiffel/Technical_papers/index.wiki
@@ -0,0 +1,9 @@
+[[Property:title|Technical papers]]
+[[Property:description|Background, foundation, or supplemental information about uncovered topics]]
+[[Property:link_title|Papers]]
+[[Property:weight|4]]
+[[Property:uuid|d2b880d6-d1dc-9811-32b8-ed718ad4d4be]]
+Occasionally papers are produced providing background, foundation, or supplemental information about the topics covered by the Eiffel documentation. Although the material in these papers might be of interest to many Eiffel users, they might not be suitable in their current form for inclusion in the mainstream documentation books. 
+
+You will find a collection of these papers in this book.
+
diff --git a/documentation/current/papers/void-safety-how-eiffel-removes-null-pointer-dereferencing.wiki b/documentation/current/eiffel/Technical_papers/void-safety-how-eiffel-removes-null-pointer-dereferencing.wiki
similarity index 100%
rename from documentation/current/papers/void-safety-how-eiffel-removes-null-pointer-dereferencing.wiki
rename to documentation/current/eiffel/Technical_papers/void-safety-how-eiffel-removes-null-pointer-dereferencing.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-agents.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-agents.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-agents.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-agents.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-design-contract-tm-assertions-and-exceptions.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-design-contract-tm-assertions-and-exceptions.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-design-contract-tm-assertions-and-exceptions.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-design-contract-tm-assertions-and-exceptions.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-dynamic-structure-execution-model.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-dynamic-structure-execution-model.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-dynamic-structure-execution-model.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-dynamic-structure-execution-model.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-eiffel-tutorial-copyright.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-eiffel-tutorial-copyright.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-eiffel-tutorial-copyright.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-eiffel-tutorial-copyright.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-general-properties.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-general-properties.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-general-properties.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-general-properties.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-genericity-and-arrays.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-genericity-and-arrays.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-genericity-and-arrays.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-genericity-and-arrays.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-hello-world.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-hello-world.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-hello-world.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-hello-world.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-inheritance.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-inheritance.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-inheritance.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-inheritance.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-instructions.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-instructions.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-instructions.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-instructions.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-learn-more.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-learn-more.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-learn-more.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-learn-more.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-lexical-conventions-and-style-rules.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-lexical-conventions-and-style-rules.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-lexical-conventions-and-style-rules.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-lexical-conventions-and-style-rules.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-once-routines-and-shared-objects.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-once-routines-and-shared-objects.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-once-routines-and-shared-objects.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-once-routines-and-shared-objects.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-other-mechanisms.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-other-mechanisms.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-other-mechanisms.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-other-mechanisms.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-overview.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-overview.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-overview.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-overview.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-software-process-eiffel.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-software-process-eiffel.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-software-process-eiffel.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-software-process-eiffel.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/et-static-picture-system-organization.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-static-picture-system-organization.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/et-static-picture-system-organization.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/et-static-picture-system-organization.wiki
diff --git a/documentation/current/method/eiffel-tutorial-et/index.wiki b/documentation/current/eiffel/Tutorials/eiffel-tutorial-et/index.wiki
similarity index 100%
rename from documentation/current/method/eiffel-tutorial-et/index.wiki
rename to documentation/current/eiffel/Tutorials/eiffel-tutorial-et/index.wiki
diff --git a/documentation/current/eiffel/Tutorials/index.wiki b/documentation/current/eiffel/Tutorials/index.wiki
new file mode 100644
index 00000000..b0ad91b4
--- /dev/null
+++ b/documentation/current/eiffel/Tutorials/index.wiki
@@ -0,0 +1,4 @@
+[[Property:title|Tutorials]]
+[[Property:link_title|Tutorials]]
+[[Property:weight|2]]
+
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-classes.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-classes.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-classes.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-classes.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-combining-genericity-and-inheritance.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-combining-genericity-and-inheritance.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-combining-genericity-and-inheritance.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-combining-genericity-and-inheritance.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-deferred-classes-and-seamless-development.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-deferred-classes-and-seamless-development.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-deferred-classes-and-seamless-development.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-deferred-classes-and-seamless-development.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-design-contract-and-assertions.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-design-contract-and-assertions.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-design-contract-and-assertions.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-design-contract-and-assertions.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-design-principles.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-design-principles.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-design-principles.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-design-principles.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-event-driven-programming-and-agents.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-event-driven-programming-and-agents.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-event-driven-programming-and-agents.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-event-driven-programming-and-agents.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-exceptions.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-exceptions.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-exceptions.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-exceptions.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-genericity.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-genericity.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-genericity.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-genericity.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-inheritance.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-inheritance.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-inheritance.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-inheritance.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-invitation-eiffel-copyright.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-invitation-eiffel-copyright.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-invitation-eiffel-copyright.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-invitation-eiffel-copyright.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-object-oriented-design.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-object-oriented-design.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-object-oriented-design.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-object-oriented-design.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-polymorphism-and-dynamic-binding.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-polymorphism-and-dynamic-binding.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-polymorphism-and-dynamic-binding.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-polymorphism-and-dynamic-binding.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-putting-system-together.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-putting-system-together.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-putting-system-together.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-putting-system-together.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-types.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-types.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-types.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-types.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/i2e-what-must-i-know-first.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-what-must-i-know-first.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/i2e-what-must-i-know-first.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/i2e-what-must-i-know-first.wiki
diff --git a/documentation/current/method/invitation-eiffel-i2e/index.wiki b/documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/index.wiki
similarity index 100%
rename from documentation/current/method/invitation-eiffel-i2e/index.wiki
rename to documentation/current/eiffel/Tutorials/invitation-eiffel-i2e/index.wiki
diff --git a/documentation/current/method/_images/Catcall_demo_class_diagram.png b/documentation/current/eiffel/_images/Catcall_demo_class_diagram.png
similarity index 100%
rename from documentation/current/method/_images/Catcall_demo_class_diagram.png
rename to documentation/current/eiffel/_images/Catcall_demo_class_diagram.png
diff --git a/documentation/current/method/_images/Catcall_demo_class_diagram.png.data b/documentation/current/eiffel/_images/Catcall_demo_class_diagram.png.data
similarity index 100%
rename from documentation/current/method/_images/Catcall_demo_class_diagram.png.data
rename to documentation/current/eiffel/_images/Catcall_demo_class_diagram.png.data
diff --git a/documentation/current/method/_images/Catcall_warning.png b/documentation/current/eiffel/_images/Catcall_warning.png
similarity index 100%
rename from documentation/current/method/_images/Catcall_warning.png
rename to documentation/current/eiffel/_images/Catcall_warning.png
diff --git a/documentation/current/method/_images/Catcall_warning.png.data b/documentation/current/eiffel/_images/Catcall_warning.png.data
similarity index 100%
rename from documentation/current/method/_images/Catcall_warning.png.data
rename to documentation/current/eiffel/_images/Catcall_warning.png.data
diff --git a/documentation/current/method/_images/ECMA-367_cover.png b/documentation/current/eiffel/_images/ECMA-367_cover.png
similarity index 100%
rename from documentation/current/method/_images/ECMA-367_cover.png
rename to documentation/current/eiffel/_images/ECMA-367_cover.png
diff --git a/documentation/current/method/_images/ECMA-367_cover.png.data b/documentation/current/eiffel/_images/ECMA-367_cover.png.data
similarity index 100%
rename from documentation/current/method/_images/ECMA-367_cover.png.data
rename to documentation/current/eiffel/_images/ECMA-367_cover.png.data
diff --git a/documentation/current/method/_images/ETL.png b/documentation/current/eiffel/_images/ETL.png
similarity index 100%
rename from documentation/current/method/_images/ETL.png
rename to documentation/current/eiffel/_images/ETL.png
diff --git a/documentation/current/method/_images/ETL.png.data b/documentation/current/eiffel/_images/ETL.png.data
similarity index 100%
rename from documentation/current/method/_images/ETL.png.data
rename to documentation/current/eiffel/_images/ETL.png.data
diff --git a/documentation/current/method/_images/OOSC2_small.png b/documentation/current/eiffel/_images/OOSC2_small.png
similarity index 100%
rename from documentation/current/method/_images/OOSC2_small.png
rename to documentation/current/eiffel/_images/OOSC2_small.png
diff --git a/documentation/current/method/_images/OOSC2_small.png.data b/documentation/current/eiffel/_images/OOSC2_small.png.data
similarity index 100%
rename from documentation/current/method/_images/OOSC2_small.png.data
rename to documentation/current/eiffel/_images/OOSC2_small.png.data
diff --git a/documentation/current/method/_images/Touch_of_Class_cover_small.png b/documentation/current/eiffel/_images/Touch_of_Class_cover_small.png
similarity index 100%
rename from documentation/current/method/_images/Touch_of_Class_cover_small.png
rename to documentation/current/eiffel/_images/Touch_of_Class_cover_small.png
diff --git a/documentation/current/method/_images/Touch_of_Class_cover_small.png.data b/documentation/current/eiffel/_images/Touch_of_Class_cover_small.png.data
similarity index 100%
rename from documentation/current/method/_images/Touch_of_Class_cover_small.png.data
rename to documentation/current/eiffel/_images/Touch_of_Class_cover_small.png.data
diff --git a/documentation/current/method/_images/Tour_sec_5_class_diagram.png b/documentation/current/eiffel/_images/Tour_sec_5_class_diagram.png
similarity index 100%
rename from documentation/current/method/_images/Tour_sec_5_class_diagram.png
rename to documentation/current/eiffel/_images/Tour_sec_5_class_diagram.png
diff --git a/documentation/current/method/_images/Tour_sec_5_class_diagram.png.data b/documentation/current/eiffel/_images/Tour_sec_5_class_diagram.png.data
similarity index 100%
rename from documentation/current/method/_images/Tour_sec_5_class_diagram.png.data
rename to documentation/current/eiffel/_images/Tour_sec_5_class_diagram.png.data
diff --git a/documentation/current/method/_images/VGCC_error.png b/documentation/current/eiffel/_images/VGCC_error.png
similarity index 100%
rename from documentation/current/method/_images/VGCC_error.png
rename to documentation/current/eiffel/_images/VGCC_error.png
diff --git a/documentation/current/method/_images/VGCC_error.png.data b/documentation/current/eiffel/_images/VGCC_error.png.data
similarity index 100%
rename from documentation/current/method/_images/VGCC_error.png.data
rename to documentation/current/eiffel/_images/VGCC_error.png.data
diff --git a/documentation/current/method/_images/VoidSafeAddLibraryDialog_noGobo.png b/documentation/current/eiffel/_images/VoidSafeAddLibraryDialog_noGobo.png
similarity index 100%
rename from documentation/current/method/_images/VoidSafeAddLibraryDialog_noGobo.png
rename to documentation/current/eiffel/_images/VoidSafeAddLibraryDialog_noGobo.png
diff --git a/documentation/current/method/_images/VoidSafeAddLibraryDialog_noGobo.png.data b/documentation/current/eiffel/_images/VoidSafeAddLibraryDialog_noGobo.png.data
similarity index 100%
rename from documentation/current/method/_images/VoidSafeAddLibraryDialog_noGobo.png.data
rename to documentation/current/eiffel/_images/VoidSafeAddLibraryDialog_noGobo.png.data
diff --git a/documentation/current/method/_images/VoidSafeErrorList.png b/documentation/current/eiffel/_images/VoidSafeErrorList.png
similarity index 100%
rename from documentation/current/method/_images/VoidSafeErrorList.png
rename to documentation/current/eiffel/_images/VoidSafeErrorList.png
diff --git a/documentation/current/method/_images/VoidSafeErrorList.png.data b/documentation/current/eiffel/_images/VoidSafeErrorList.png.data
similarity index 100%
rename from documentation/current/method/_images/VoidSafeErrorList.png.data
rename to documentation/current/eiffel/_images/VoidSafeErrorList.png.data
diff --git a/documentation/current/method/_images/VoidSafePrecompileOffer.png b/documentation/current/eiffel/_images/VoidSafePrecompileOffer.png
similarity index 100%
rename from documentation/current/method/_images/VoidSafePrecompileOffer.png
rename to documentation/current/eiffel/_images/VoidSafePrecompileOffer.png
diff --git a/documentation/current/method/_images/VoidSafePrecompileOffer.png.data b/documentation/current/eiffel/_images/VoidSafePrecompileOffer.png.data
similarity index 100%
rename from documentation/current/method/_images/VoidSafePrecompileOffer.png.data
rename to documentation/current/eiffel/_images/VoidSafePrecompileOffer.png.data
diff --git a/documentation/current/method/_images/VoidSafeVEVI1.png b/documentation/current/eiffel/_images/VoidSafeVEVI1.png
similarity index 100%
rename from documentation/current/method/_images/VoidSafeVEVI1.png
rename to documentation/current/eiffel/_images/VoidSafeVEVI1.png
diff --git a/documentation/current/method/_images/VoidSafeVEVI1.png.data b/documentation/current/eiffel/_images/VoidSafeVEVI1.png.data
similarity index 100%
rename from documentation/current/method/_images/VoidSafeVEVI1.png.data
rename to documentation/current/eiffel/_images/VoidSafeVEVI1.png.data
diff --git a/documentation/current/method/_images/VoidSafeVJAR1.png b/documentation/current/eiffel/_images/VoidSafeVJAR1.png
similarity index 100%
rename from documentation/current/method/_images/VoidSafeVJAR1.png
rename to documentation/current/eiffel/_images/VoidSafeVJAR1.png
diff --git a/documentation/current/method/_images/VoidSafeVJAR1.png.data b/documentation/current/eiffel/_images/VoidSafeVJAR1.png.data
similarity index 100%
rename from documentation/current/method/_images/VoidSafeVJAR1.png.data
rename to documentation/current/eiffel/_images/VoidSafeVJAR1.png.data
diff --git a/documentation/current/method/_images/invitation-2.png b/documentation/current/eiffel/_images/invitation-2.png
similarity index 100%
rename from documentation/current/method/_images/invitation-2.png
rename to documentation/current/eiffel/_images/invitation-2.png
diff --git a/documentation/current/method/_images/invitation-2.png.data b/documentation/current/eiffel/_images/invitation-2.png.data
similarity index 100%
rename from documentation/current/method/_images/invitation-2.png.data
rename to documentation/current/eiffel/_images/invitation-2.png.data
diff --git a/documentation/current/method/_images/invitation-3.png b/documentation/current/eiffel/_images/invitation-3.png
similarity index 100%
rename from documentation/current/method/_images/invitation-3.png
rename to documentation/current/eiffel/_images/invitation-3.png
diff --git a/documentation/current/method/_images/invitation-3.png.data b/documentation/current/eiffel/_images/invitation-3.png.data
similarity index 100%
rename from documentation/current/method/_images/invitation-3.png.data
rename to documentation/current/eiffel/_images/invitation-3.png.data
diff --git a/documentation/current/method/_images/invitation-4.png b/documentation/current/eiffel/_images/invitation-4.png
similarity index 100%
rename from documentation/current/method/_images/invitation-4.png
rename to documentation/current/eiffel/_images/invitation-4.png
diff --git a/documentation/current/method/_images/invitation-4.png.data b/documentation/current/eiffel/_images/invitation-4.png.data
similarity index 100%
rename from documentation/current/method/_images/invitation-4.png.data
rename to documentation/current/eiffel/_images/invitation-4.png.data
diff --git a/documentation/current/method/_images/invitation-5.png b/documentation/current/eiffel/_images/invitation-5.png
similarity index 100%
rename from documentation/current/method/_images/invitation-5.png
rename to documentation/current/eiffel/_images/invitation-5.png
diff --git a/documentation/current/method/_images/invitation-5.png.data b/documentation/current/eiffel/_images/invitation-5.png.data
similarity index 100%
rename from documentation/current/method/_images/invitation-5.png.data
rename to documentation/current/eiffel/_images/invitation-5.png.data
diff --git a/documentation/current/method/_images/tutorial-10.png b/documentation/current/eiffel/_images/tutorial-10.png
similarity index 100%
rename from documentation/current/method/_images/tutorial-10.png
rename to documentation/current/eiffel/_images/tutorial-10.png
diff --git a/documentation/current/method/_images/tutorial-10.png.data b/documentation/current/eiffel/_images/tutorial-10.png.data
similarity index 100%
rename from documentation/current/method/_images/tutorial-10.png.data
rename to documentation/current/eiffel/_images/tutorial-10.png.data
diff --git a/documentation/current/method/_images/tutorial-11.png b/documentation/current/eiffel/_images/tutorial-11.png
similarity index 100%
rename from documentation/current/method/_images/tutorial-11.png
rename to documentation/current/eiffel/_images/tutorial-11.png
diff --git a/documentation/current/method/_images/tutorial-11.png.data b/documentation/current/eiffel/_images/tutorial-11.png.data
similarity index 100%
rename from documentation/current/method/_images/tutorial-11.png.data
rename to documentation/current/eiffel/_images/tutorial-11.png.data
diff --git a/documentation/current/method/_images/tutorial-12.png b/documentation/current/eiffel/_images/tutorial-12.png
similarity index 100%
rename from documentation/current/method/_images/tutorial-12.png
rename to documentation/current/eiffel/_images/tutorial-12.png
diff --git a/documentation/current/method/_images/tutorial-12.png.data b/documentation/current/eiffel/_images/tutorial-12.png.data
similarity index 100%
rename from documentation/current/method/_images/tutorial-12.png.data
rename to documentation/current/eiffel/_images/tutorial-12.png.data
diff --git a/documentation/current/method/_images/tutorial-13.png b/documentation/current/eiffel/_images/tutorial-13.png
similarity index 100%
rename from documentation/current/method/_images/tutorial-13.png
rename to documentation/current/eiffel/_images/tutorial-13.png
diff --git a/documentation/current/method/_images/tutorial-13.png.data b/documentation/current/eiffel/_images/tutorial-13.png.data
similarity index 100%
rename from documentation/current/method/_images/tutorial-13.png.data
rename to documentation/current/eiffel/_images/tutorial-13.png.data
diff --git a/documentation/current/method/_images/tutorial-14.png b/documentation/current/eiffel/_images/tutorial-14.png
similarity index 100%
rename from documentation/current/method/_images/tutorial-14.png
rename to documentation/current/eiffel/_images/tutorial-14.png
diff --git a/documentation/current/method/_images/tutorial-14.png.data b/documentation/current/eiffel/_images/tutorial-14.png.data
similarity index 100%
rename from documentation/current/method/_images/tutorial-14.png.data
rename to documentation/current/eiffel/_images/tutorial-14.png.data
diff --git a/documentation/current/method/_images/tutorial-2.png b/documentation/current/eiffel/_images/tutorial-2.png
similarity index 100%
rename from documentation/current/method/_images/tutorial-2.png
rename to documentation/current/eiffel/_images/tutorial-2.png
diff --git a/documentation/current/method/_images/tutorial-2.png.data b/documentation/current/eiffel/_images/tutorial-2.png.data
similarity index 100%
rename from documentation/current/method/_images/tutorial-2.png.data
rename to documentation/current/eiffel/_images/tutorial-2.png.data
diff --git a/documentation/current/method/_images/tutorial-3.png b/documentation/current/eiffel/_images/tutorial-3.png
similarity index 100%
rename from documentation/current/method/_images/tutorial-3.png
rename to documentation/current/eiffel/_images/tutorial-3.png
diff --git a/documentation/current/method/_images/tutorial-3.png.data b/documentation/current/eiffel/_images/tutorial-3.png.data
similarity index 100%
rename from documentation/current/method/_images/tutorial-3.png.data
rename to documentation/current/eiffel/_images/tutorial-3.png.data
diff --git a/documentation/current/method/_images/tutorial-5.png b/documentation/current/eiffel/_images/tutorial-5.png
similarity index 100%
rename from documentation/current/method/_images/tutorial-5.png
rename to documentation/current/eiffel/_images/tutorial-5.png
diff --git a/documentation/current/method/_images/tutorial-5.png.data b/documentation/current/eiffel/_images/tutorial-5.png.data
similarity index 100%
rename from documentation/current/method/_images/tutorial-5.png.data
rename to documentation/current/eiffel/_images/tutorial-5.png.data
diff --git a/documentation/current/method/_images/tutorial-6.png b/documentation/current/eiffel/_images/tutorial-6.png
similarity index 100%
rename from documentation/current/method/_images/tutorial-6.png
rename to documentation/current/eiffel/_images/tutorial-6.png
diff --git a/documentation/current/method/_images/tutorial-6.png.data b/documentation/current/eiffel/_images/tutorial-6.png.data
similarity index 100%
rename from documentation/current/method/_images/tutorial-6.png.data
rename to documentation/current/eiffel/_images/tutorial-6.png.data
diff --git a/documentation/current/method/_images/tutorial-7.png b/documentation/current/eiffel/_images/tutorial-7.png
similarity index 100%
rename from documentation/current/method/_images/tutorial-7.png
rename to documentation/current/eiffel/_images/tutorial-7.png
diff --git a/documentation/current/method/_images/tutorial-7.png.data b/documentation/current/eiffel/_images/tutorial-7.png.data
similarity index 100%
rename from documentation/current/method/_images/tutorial-7.png.data
rename to documentation/current/eiffel/_images/tutorial-7.png.data
diff --git a/documentation/current/method/_images/tutorial-8.png b/documentation/current/eiffel/_images/tutorial-8.png
similarity index 100%
rename from documentation/current/method/_images/tutorial-8.png
rename to documentation/current/eiffel/_images/tutorial-8.png
diff --git a/documentation/current/method/_images/tutorial-8.png.data b/documentation/current/eiffel/_images/tutorial-8.png.data
similarity index 100%
rename from documentation/current/method/_images/tutorial-8.png.data
rename to documentation/current/eiffel/_images/tutorial-8.png.data
diff --git a/documentation/current/method/_images/tutorial-9.png b/documentation/current/eiffel/_images/tutorial-9.png
similarity index 100%
rename from documentation/current/method/_images/tutorial-9.png
rename to documentation/current/eiffel/_images/tutorial-9.png
diff --git a/documentation/current/method/_images/tutorial-9.png.data b/documentation/current/eiffel/_images/tutorial-9.png.data
similarity index 100%
rename from documentation/current/method/_images/tutorial-9.png.data
rename to documentation/current/eiffel/_images/tutorial-9.png.data
diff --git a/documentation/current/method/index.wiki b/documentation/current/eiffel/index.wiki
similarity index 92%
rename from documentation/current/method/index.wiki
rename to documentation/current/eiffel/index.wiki
index 467af7ec..c3c0fdd1 100644
--- a/documentation/current/method/index.wiki
+++ b/documentation/current/eiffel/index.wiki
@@ -1,7 +1,7 @@
-[[Property:title|Method]]
+[[Property:title|Eiffel]]
 [[Property:description|Eiffel development method and the Eiffel programming language]]
-[[Property:link_title|Method & Language]]
-[[Property:weight|-3]]
+[[Property:link_title|Eiffel]]
+[[Property:weight|1]]
 [[Property:uuid|ae6f212e-bdc6-d5f2-972a-1bfee586479e]]
 == The Eiffel Method and Language ==
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/appendix-writing-documentation-filters-eff-eiffel-filter-format.wiki b/documentation/current/eiffelstudio/Tutorials/appendix-writing-documentation-filters-eff-eiffel-filter-format.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/appendix-writing-documentation-filters-eff-eiffel-filter-format.wiki
rename to documentation/current/eiffelstudio/Tutorials/appendix-writing-documentation-filters-eff-eiffel-filter-format.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/browsing-features.wiki b/documentation/current/eiffelstudio/Tutorials/browsing-features.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/browsing-features.wiki
rename to documentation/current/eiffelstudio/Tutorials/browsing-features.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/command-line-compiler.wiki b/documentation/current/eiffelstudio/Tutorials/command-line-compiler.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/command-line-compiler.wiki
rename to documentation/current/eiffelstudio/Tutorials/command-line-compiler.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/compiling-and-executing-system.wiki b/documentation/current/eiffelstudio/Tutorials/compiling-and-executing-system.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/compiling-and-executing-system.wiki
rename to documentation/current/eiffelstudio/Tutorials/compiling-and-executing-system.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/computing-project-metrics.wiki b/documentation/current/eiffelstudio/Tutorials/computing-project-metrics.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/computing-project-metrics.wiki
rename to documentation/current/eiffelstudio/Tutorials/computing-project-metrics.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/copying-example-files.wiki b/documentation/current/eiffelstudio/Tutorials/copying-example-files.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/copying-example-files.wiki
rename to documentation/current/eiffelstudio/Tutorials/copying-example-files.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/customizing-tools-layout-and-toolbars.wiki b/documentation/current/eiffelstudio/Tutorials/customizing-tools-layout-and-toolbars.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/customizing-tools-layout-and-toolbars.wiki
rename to documentation/current/eiffelstudio/Tutorials/customizing-tools-layout-and-toolbars.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/debugging-and-run-time-monitoring.wiki b/documentation/current/eiffelstudio/Tutorials/debugging-and-run-time-monitoring.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/debugging-and-run-time-monitoring.wiki
rename to documentation/current/eiffelstudio/Tutorials/debugging-and-run-time-monitoring.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/executing-system-within-and-without-eiffelstudio.wiki b/documentation/current/eiffelstudio/Tutorials/executing-system-within-and-without-eiffelstudio.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/executing-system-within-and-without-eiffelstudio.wiki
rename to documentation/current/eiffelstudio/Tutorials/executing-system-within-and-without-eiffelstudio.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/graphics-based-design.wiki b/documentation/current/eiffelstudio/Tutorials/graphics-based-design.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/graphics-based-design.wiki
rename to documentation/current/eiffelstudio/Tutorials/graphics-based-design.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/handling-syntax-and-validity-errors.wiki b/documentation/current/eiffelstudio/Tutorials/handling-syntax-and-validity-errors.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/handling-syntax-and-validity-errors.wiki
rename to documentation/current/eiffelstudio/Tutorials/handling-syntax-and-validity-errors.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/how-eiffelstudio-compiles.wiki b/documentation/current/eiffelstudio/Tutorials/how-eiffelstudio-compiles.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/how-eiffelstudio-compiles.wiki
rename to documentation/current/eiffelstudio/Tutorials/how-eiffelstudio-compiles.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/index.wiki b/documentation/current/eiffelstudio/Tutorials/index.wiki
similarity index 69%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/index.wiki
rename to documentation/current/eiffelstudio/Tutorials/index.wiki
index 9b121bcd..631c5bbe 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/index.wiki
+++ b/documentation/current/eiffelstudio/Tutorials/index.wiki
@@ -1,5 +1,5 @@
-[[Property:title|EiffelStudio: A Guided Tour]]
-[[Property:weight|0]]
+[[Property:title|Tutorials]]
+[[Property:weight|2]]
 [[Property:uuid|4d68a136-f7c2-ddd3-d30d-e16ee7692302]]
 This is a guided tour of Eiffel Software's EiffelStudio interactive software development environment.
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/look-project-directory.wiki b/documentation/current/eiffelstudio/Tutorials/look-project-directory.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/look-project-directory.wiki
rename to documentation/current/eiffelstudio/Tutorials/look-project-directory.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/manual-identification-and-copyright.wiki b/documentation/current/eiffelstudio/Tutorials/manual-identification-and-copyright.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/manual-identification-and-copyright.wiki
rename to documentation/current/eiffelstudio/Tutorials/manual-identification-and-copyright.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/producing-and-exporting-documentation.wiki b/documentation/current/eiffelstudio/Tutorials/producing-and-exporting-documentation.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/producing-and-exporting-documentation.wiki
rename to documentation/current/eiffelstudio/Tutorials/producing-and-exporting-documentation.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/recompiling-and-editing.wiki b/documentation/current/eiffelstudio/Tutorials/recompiling-and-editing.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/recompiling-and-editing.wiki
rename to documentation/current/eiffelstudio/Tutorials/recompiling-and-editing.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/retargeting-through-pick-and-drop.wiki b/documentation/current/eiffelstudio/Tutorials/retargeting-through-pick-and-drop.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/retargeting-through-pick-and-drop.wiki
rename to documentation/current/eiffelstudio/Tutorials/retargeting-through-pick-and-drop.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/starting-browse.wiki b/documentation/current/eiffelstudio/Tutorials/starting-browse.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/starting-browse.wiki
rename to documentation/current/eiffelstudio/Tutorials/starting-browse.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/starting-eiffelstudio-and-opening-project.wiki b/documentation/current/eiffelstudio/Tutorials/starting-eiffelstudio-and-opening-project.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/starting-eiffelstudio-and-opening-project.wiki
rename to documentation/current/eiffelstudio/Tutorials/starting-eiffelstudio-and-opening-project.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-automatic-class-licensing.wiki b/documentation/current/eiffelstudio/Tutorials/using-automatic-class-licensing.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-automatic-class-licensing.wiki
rename to documentation/current/eiffelstudio/Tutorials/using-automatic-class-licensing.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-autotest/create-manual-test.wiki b/documentation/current/eiffelstudio/Tutorials/using-autotest/create-manual-test.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-autotest/create-manual-test.wiki
rename to documentation/current/eiffelstudio/Tutorials/using-autotest/create-manual-test.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-autotest/execute-tests.wiki b/documentation/current/eiffelstudio/Tutorials/using-autotest/execute-tests.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-autotest/execute-tests.wiki
rename to documentation/current/eiffelstudio/Tutorials/using-autotest/execute-tests.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-autotest/index.wiki b/documentation/current/eiffelstudio/Tutorials/using-autotest/index.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-autotest/index.wiki
rename to documentation/current/eiffelstudio/Tutorials/using-autotest/index.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-autotest/managing-tests.wiki b/documentation/current/eiffelstudio/Tutorials/using-autotest/managing-tests.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-autotest/managing-tests.wiki
rename to documentation/current/eiffelstudio/Tutorials/using-autotest/managing-tests.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-autotest/testing-background-and-basics.wiki b/documentation/current/eiffelstudio/Tutorials/using-autotest/testing-background-and-basics.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-autotest/testing-background-and-basics.wiki
rename to documentation/current/eiffelstudio/Tutorials/using-autotest/testing-background-and-basics.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-autotest/using-extracted-tests.wiki b/documentation/current/eiffelstudio/Tutorials/using-autotest/using-extracted-tests.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-autotest/using-extracted-tests.wiki
rename to documentation/current/eiffelstudio/Tutorials/using-autotest/using-extracted-tests.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-autotest/using-generated-tests.wiki b/documentation/current/eiffelstudio/Tutorials/using-autotest/using-generated-tests.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/using-autotest/using-generated-tests.wiki
rename to documentation/current/eiffelstudio/Tutorials/using-autotest/using-generated-tests.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/viewing-classes.wiki b/documentation/current/eiffelstudio/Tutorials/viewing-classes.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/viewing-classes.wiki
rename to documentation/current/eiffelstudio/Tutorials/viewing-classes.wiki
diff --git a/documentation/current/eiffelstudio/eiffelstudio-how-tos/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-how-tos/index.wiki
index 2146e251..6dada941 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-how-tos/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-how-tos/index.wiki
@@ -1,5 +1,5 @@
 [[Property:title|EiffelStudio How To's]]
-[[Property:weight|-1]]
+[[Property:weight|5]]
 [[Property:uuid|10d806ce-5b43-26a5-6f0e-23b3b2faa2ed]]
 This chapter contains instructions for accomplishing some of the most commonly required tasks in EiffelStudio. 
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/index.wiki
index 20d9e15a..5e96bcc6 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/index.wiki
@@ -1,5 +1,5 @@
-[[Property:title|EiffelStudio Reference]]
-[[Property:weight|2]]
+[[Property:title|Reference]]
+[[Property:weight|3]]
 [[Property:uuid|e34647c8-840e-159d-74b3-07353a27472e]]
 ==EiffelStudio Reference==
 
diff --git a/documentation/current/eiffelstudio/getting_started/index.wiki b/documentation/current/eiffelstudio/getting_started/index.wiki
new file mode 100644
index 00000000..be1655c5
--- /dev/null
+++ b/documentation/current/eiffelstudio/getting_started/index.wiki
@@ -0,0 +1,4 @@
+[[Property:title|Getting started]]
+[[Property:description|Getting started with EiffelStudio]]
+[[Property:weight|1]]
+
diff --git a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/overview-and-prerequisites.wiki b/documentation/current/eiffelstudio/getting_started/introducing_eiffelstudio.wiki
similarity index 99%
rename from documentation/current/eiffelstudio/eiffelstudio-guided-tour/overview-and-prerequisites.wiki
rename to documentation/current/eiffelstudio/getting_started/introducing_eiffelstudio.wiki
index be856f15..0f3a34db 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-guided-tour/overview-and-prerequisites.wiki
+++ b/documentation/current/eiffelstudio/getting_started/introducing_eiffelstudio.wiki
@@ -1,5 +1,5 @@
-[[Property:title|Overview and Prerequisites]]
-[[Property:weight|-15]]
+[[Property:title|Introducing EiffelStudio]]
+[[Property:weight|2]]
 [[Property:uuid|acf5433b-14e9-1d21-c8cf-997db7821550]]
 EiffelStudio is the central tool of Eiffel Software's implementation of Eiffel, letting you design, develop, debug, document, measure, maintain, test, revise and expand systems using the full power of object technology and Design by Contract&trade;. 
 
diff --git a/documentation/current/eiffelstudio/software-installation/index.wiki b/documentation/current/eiffelstudio/getting_started/setup-and-installation/index.wiki
similarity index 70%
rename from documentation/current/eiffelstudio/software-installation/index.wiki
rename to documentation/current/eiffelstudio/getting_started/setup-and-installation/index.wiki
index a931139a..5b02ab77 100644
--- a/documentation/current/eiffelstudio/software-installation/index.wiki
+++ b/documentation/current/eiffelstudio/getting_started/setup-and-installation/index.wiki
@@ -1,5 +1,5 @@
-[[Property:title|Software Installation]]
-[[Property:weight|-2]]
+[[Property:title|Setup and installation]]
+[[Property:weight|1]]
 [[Property:uuid|90bc1970-bd1d-9707-3030-a4a9f613524a]]
 For detailed installation instructions please follow the link for the product your are installing.
 
diff --git a/documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-freebsd.wiki b/documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-freebsd.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-freebsd.wiki
rename to documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-freebsd.wiki
diff --git a/documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-hp-openvms.wiki b/documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-hp-openvms.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-hp-openvms.wiki
rename to documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-hp-openvms.wiki
diff --git a/documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-hp-tru64-unix.wiki b/documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-hp-tru64-unix.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-hp-tru64-unix.wiki
rename to documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-hp-tru64-unix.wiki
diff --git a/documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-hp-ux.wiki b/documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-hp-ux.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-hp-ux.wiki
rename to documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-hp-ux.wiki
diff --git a/documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-linux.wiki b/documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-linux.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-linux.wiki
rename to documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-linux.wiki
diff --git a/documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-linuxppc.wiki b/documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-linuxppc.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-linuxppc.wiki
rename to documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-linuxppc.wiki
diff --git a/documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-mac-os-x.wiki b/documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-mac-os-x.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-mac-os-x.wiki
rename to documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-mac-os-x.wiki
diff --git a/documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-sgi-irix.wiki b/documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-sgi-irix.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-sgi-irix.wiki
rename to documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-sgi-irix.wiki
diff --git a/documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-solaris.wiki b/documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-solaris.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/eiffelstudio-solaris.wiki
rename to documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/eiffelstudio-solaris.wiki
diff --git a/documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/index.wiki b/documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/index.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/index.wiki
rename to documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/index.wiki
diff --git a/documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/windows.wiki b/documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/windows.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/software-installation/software-installation-eiffelstudio/windows.wiki
rename to documentation/current/eiffelstudio/getting_started/setup-and-installation/software-installation-eiffelstudio/windows.wiki
diff --git a/documentation/current/eiffelstudio/software-installation/third-party-tools-installation-help.wiki b/documentation/current/eiffelstudio/getting_started/setup-and-installation/third-party-tools-installation-help.wiki
similarity index 100%
rename from documentation/current/eiffelstudio/software-installation/third-party-tools-installation-help.wiki
rename to documentation/current/eiffelstudio/getting_started/setup-and-installation/third-party-tools-installation-help.wiki
diff --git a/documentation/current/eiffelstudio/index.wiki b/documentation/current/eiffelstudio/index.wiki
index f89273b9..feaa74db 100644
--- a/documentation/current/eiffelstudio/index.wiki
+++ b/documentation/current/eiffelstudio/index.wiki
@@ -1,6 +1,6 @@
 [[Property:title|EiffelStudio]]
 [[Property:description|EiffelStudio Interactive Software Development Environment]]
-[[Property:weight|-9]]
+[[Property:weight|2]]
 [[Property:uuid|002fbffc-7aee-ea95-14fc-9f4fac1add82]]
 ==The EiffelStudio Interactive Software Development Environment==
 
diff --git a/documentation/current/faqs/index.wiki b/documentation/current/faqs/index.wiki
new file mode 100644
index 00000000..e4a5c726
--- /dev/null
+++ b/documentation/current/faqs/index.wiki
@@ -0,0 +1,4 @@
+[[Property:title|FAQs]]
+[[Property:description|Frequently Asked Questions]]
+[[Property:link_title|FAQs]]
+[[Property:weight|5]]
diff --git a/documentation/current/guide/glossary-object-technology.wiki b/documentation/current/glossary/index.wiki
similarity index 99%
rename from documentation/current/guide/glossary-object-technology.wiki
rename to documentation/current/glossary/index.wiki
index 7a201256..80ce8f44 100644
--- a/documentation/current/guide/glossary-object-technology.wiki
+++ b/documentation/current/glossary/index.wiki
@@ -1,6 +1,6 @@
 [[Property:title|Glossary of Object Technology]]
 [[Property:link_title|Glossary]]
-[[Property:weight|2]]
+[[Property:weight|3]]
 [[Property:uuid|b8c10baa-4f50-adfe-a6f8-9cb56a8f1917]]
 This glossary provides brief definitions of the principal terms of object technology, discussed in detail in the book ''[[uuid:496983ef-b86e-772e-16b9-39b37ef80e37|Object-Oriented Software Construction, 2nd Edition]]'' and used in this website. ''Italics font'' in a definition marks a term or phrase, other than the ubiquitous "class", that is itself the subject of another definition.
 
diff --git a/documentation/current/method/method-and-language-beta-documentation.wiki b/documentation/current/method/method-and-language-beta-documentation.wiki
deleted file mode 100644
index 5dfd429a..00000000
--- a/documentation/current/method/method-and-language-beta-documentation.wiki
+++ /dev/null
@@ -1,15 +0,0 @@
-[[Property:title|Method and Language beta documentation]]
-[[Property:link_title|<beta>]]
-[[Property:weight|10]]
-[[Property:uuid|cc7ef329-861b-ca57-c7ff-a75cc99d1985]]
-{{Beta}}
-
-
-==Beta pages==
-
-Any child pages of this page represent material which will be added to the documentation set or replace existing material, at the time of a future software release.
-
-The information in Beta pages may or may not be accurate, complete, in final form, or represent the behavior of a particular beta version of the software. 
-
-
-
diff --git a/documentation/current/papers/index.wiki b/documentation/current/papers/index.wiki
deleted file mode 100644
index f4ef4eb4..00000000
--- a/documentation/current/papers/index.wiki
+++ /dev/null
@@ -1,11 +0,0 @@
-[[Property:title|Papers]]
-[[Property:description|Background, foundation, or supplemental information about uncovered topics]]
-[[Property:link_title|]]
-[[Property:weight|1]]
-[[Property:uuid|d2b880d6-d1dc-9811-32b8-ed718ad4d4be]]
-Occasionally we produce papers which provide background, foundation, or supplemental information about the topics covered by the Eiffel documentation. Although the material in these papers might be of interest to many Eiffel users, they might not be suitable in their current form for inclusion in the mainstream documentation books. 
-
-You will find a collection of these papers in this book.
-
-
-
diff --git a/documentation/current/solutions/index.wiki b/documentation/current/solutions/index.wiki
index 0f8fa56e..58d85ba2 100644
--- a/documentation/current/solutions/index.wiki
+++ b/documentation/current/solutions/index.wiki
@@ -1,6 +1,6 @@
 [[Property:title|Solutions]]
 [[Property:description|Eiffel Solutions, Technologies, and Class Libraries]]
-[[Property:weight|-8]]
+[[Property:weight|3]]
 [[Property:uuid|0f0913fe-d71c-43d3-6c22-706c8ed5d4ad]]
 == Eiffel Solutions, Technologies, and Class Libraries ==
 
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_Choosing_a_size_definition.png b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_Choosing_a_size_definition.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_Choosing_a_size_definition.png
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_Choosing_a_size_definition.png
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_Choosing_a_size_definition.png.data b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_Choosing_a_size_definition.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_Choosing_a_size_definition.png.data
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_Choosing_a_size_definition.png.data
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_application_01.png b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_application_01.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_application_01.png
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_application_01.png
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_application_01.png.data b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_application_01.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_application_01.png.data
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_application_01.png.data
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_design_tool_01.png b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_design_tool_01.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_design_tool_01.png
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_design_tool_01.png
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_design_tool_01.png.data b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_design_tool_01.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_design_tool_01.png.data
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_design_tool_01.png.data
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_design_tool_02_0.png b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_design_tool_02_0.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_design_tool_02_0.png
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_design_tool_02_0.png
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_design_tool_02_0.png.data b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_design_tool_02_0.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_design_tool_02_0.png.data
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_design_tool_02_0.png.data
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_01.png b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_01.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_01.png
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_01.png
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_01.png.data b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_01.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_01.png.data
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_01.png.data
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_01a.png b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_01a.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_01a.png
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_01a.png
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_01a.png.data b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_01a.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_01a.png.data
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_01a.png.data
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_02.png b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_02.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_02.png
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_02.png
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_02.png.data b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_02.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_02.png.data
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_02.png.data
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_03.png b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_03.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_03.png
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_03.png
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_03.png.data b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_03.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_03.png.data
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_03.png.data
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_04.png b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_04.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_04.png
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_04.png
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_04.png.data b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_04.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_04.png.data
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_04.png.data
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_05.png b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_05.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_05.png
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_05.png
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_05.png.data b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_05.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_scaling_policy_05.png.data
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_scaling_policy_05.png.data
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_size_definition_editor_01.png b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_size_definition_editor_01.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_size_definition_editor_01.png
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_size_definition_editor_01.png
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_size_definition_editor_01.png.data b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_size_definition_editor_01.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_size_definition_editor_01.png.data
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_size_definition_editor_01.png.data
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_size_definition_editor_02.png b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_size_definition_editor_02.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_size_definition_editor_02.png
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_size_definition_editor_02.png
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_size_definition_editor_02.png.data b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_size_definition_editor_02.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_size_definition_editor_02.png.data
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_size_definition_editor_02.png.data
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_size_definition_editor_03.png b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_size_definition_editor_03.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_size_definition_editor_03.png
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_size_definition_editor_03.png
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_size_definition_editor_03.png.data b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_size_definition_editor_03.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_size_definition_editor_03.png.data
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_size_definition_editor_03.png.data
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_window_01.png b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_window_01.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_window_01.png
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_window_01.png
diff --git a/documentation/current/platform-specifics/_images/EiffelRibbon_window_01.png.data b/documentation/current/solutions/platform-specifics/_images/EiffelRibbon_window_01.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/EiffelRibbon_window_01.png.data
rename to documentation/current/solutions/platform-specifics/_images/EiffelRibbon_window_01.png.data
diff --git a/documentation/current/platform-specifics/_images/WEL_cursors_example_01.png b/documentation/current/solutions/platform-specifics/_images/WEL_cursors_example_01.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/WEL_cursors_example_01.png
rename to documentation/current/solutions/platform-specifics/_images/WEL_cursors_example_01.png
diff --git a/documentation/current/platform-specifics/_images/WEL_cursors_example_01.png.data b/documentation/current/solutions/platform-specifics/_images/WEL_cursors_example_01.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/WEL_cursors_example_01.png.data
rename to documentation/current/solutions/platform-specifics/_images/WEL_cursors_example_01.png.data
diff --git a/documentation/current/platform-specifics/_images/analyz.png b/documentation/current/solutions/platform-specifics/_images/analyz.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/analyz.png
rename to documentation/current/solutions/platform-specifics/_images/analyz.png
diff --git a/documentation/current/platform-specifics/_images/analyz.png.data b/documentation/current/solutions/platform-specifics/_images/analyz.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/analyz.png.data
rename to documentation/current/solutions/platform-specifics/_images/analyz.png.data
diff --git a/documentation/current/platform-specifics/_images/bmpview.png b/documentation/current/solutions/platform-specifics/_images/bmpview.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/bmpview.png
rename to documentation/current/solutions/platform-specifics/_images/bmpview.png
diff --git a/documentation/current/platform-specifics/_images/bmpview.png.data b/documentation/current/solutions/platform-specifics/_images/bmpview.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/bmpview.png.data
rename to documentation/current/solutions/platform-specifics/_images/bmpview.png.data
diff --git a/documentation/current/platform-specifics/_images/browse.png b/documentation/current/solutions/platform-specifics/_images/browse.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/browse.png
rename to documentation/current/solutions/platform-specifics/_images/browse.png
diff --git a/documentation/current/platform-specifics/_images/browse.png.data b/documentation/current/solutions/platform-specifics/_images/browse.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/browse.png.data
rename to documentation/current/solutions/platform-specifics/_images/browse.png.data
diff --git a/documentation/current/platform-specifics/_images/brushes.png b/documentation/current/solutions/platform-specifics/_images/brushes.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/brushes.png
rename to documentation/current/solutions/platform-specifics/_images/brushes.png
diff --git a/documentation/current/platform-specifics/_images/brushes.png.data b/documentation/current/solutions/platform-specifics/_images/brushes.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/brushes.png.data
rename to documentation/current/solutions/platform-specifics/_images/brushes.png.data
diff --git a/documentation/current/platform-specifics/_images/calculator.png b/documentation/current/solutions/platform-specifics/_images/calculator.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/calculator.png
rename to documentation/current/solutions/platform-specifics/_images/calculator.png
diff --git a/documentation/current/platform-specifics/_images/calculator.png.data b/documentation/current/solutions/platform-specifics/_images/calculator.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/calculator.png.data
rename to documentation/current/solutions/platform-specifics/_images/calculator.png.data
diff --git a/documentation/current/platform-specifics/_images/change-font-dialog.png b/documentation/current/solutions/platform-specifics/_images/change-font-dialog.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/change-font-dialog.png
rename to documentation/current/solutions/platform-specifics/_images/change-font-dialog.png
diff --git a/documentation/current/platform-specifics/_images/change-font-dialog.png.data b/documentation/current/solutions/platform-specifics/_images/change-font-dialog.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/change-font-dialog.png.data
rename to documentation/current/solutions/platform-specifics/_images/change-font-dialog.png.data
diff --git a/documentation/current/platform-specifics/_images/client-inheritance.png b/documentation/current/solutions/platform-specifics/_images/client-inheritance.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/client-inheritance.png
rename to documentation/current/solutions/platform-specifics/_images/client-inheritance.png
diff --git a/documentation/current/platform-specifics/_images/client-inheritance.png.data b/documentation/current/solutions/platform-specifics/_images/client-inheritance.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/client-inheritance.png.data
rename to documentation/current/solutions/platform-specifics/_images/client-inheritance.png.data
diff --git a/documentation/current/platform-specifics/_images/collaps.png b/documentation/current/solutions/platform-specifics/_images/collaps.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/collaps.png
rename to documentation/current/solutions/platform-specifics/_images/collaps.png
diff --git a/documentation/current/platform-specifics/_images/collaps.png.data b/documentation/current/solutions/platform-specifics/_images/collaps.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/collaps.png.data
rename to documentation/current/solutions/platform-specifics/_images/collaps.png.data
diff --git a/documentation/current/platform-specifics/_images/com-1.gif b/documentation/current/solutions/platform-specifics/_images/com-1.gif
similarity index 100%
rename from documentation/current/platform-specifics/_images/com-1.gif
rename to documentation/current/solutions/platform-specifics/_images/com-1.gif
diff --git a/documentation/current/platform-specifics/_images/com-1.gif.data b/documentation/current/solutions/platform-specifics/_images/com-1.gif.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/com-1.gif.data
rename to documentation/current/solutions/platform-specifics/_images/com-1.gif.data
diff --git a/documentation/current/platform-specifics/_images/com-2.gif b/documentation/current/solutions/platform-specifics/_images/com-2.gif
similarity index 100%
rename from documentation/current/platform-specifics/_images/com-2.gif
rename to documentation/current/solutions/platform-specifics/_images/com-2.gif
diff --git a/documentation/current/platform-specifics/_images/com-2.gif.data b/documentation/current/solutions/platform-specifics/_images/com-2.gif.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/com-2.gif.data
rename to documentation/current/solutions/platform-specifics/_images/com-2.gif.data
diff --git a/documentation/current/platform-specifics/_images/com-3.gif b/documentation/current/solutions/platform-specifics/_images/com-3.gif
similarity index 100%
rename from documentation/current/platform-specifics/_images/com-3.gif
rename to documentation/current/solutions/platform-specifics/_images/com-3.gif
diff --git a/documentation/current/platform-specifics/_images/com-3.gif.data b/documentation/current/solutions/platform-specifics/_images/com-3.gif.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/com-3.gif.data
rename to documentation/current/solutions/platform-specifics/_images/com-3.gif.data
diff --git a/documentation/current/platform-specifics/_images/comctrls.png b/documentation/current/solutions/platform-specifics/_images/comctrls.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/comctrls.png
rename to documentation/current/solutions/platform-specifics/_images/comctrls.png
diff --git a/documentation/current/platform-specifics/_images/comctrls.png.data b/documentation/current/solutions/platform-specifics/_images/comctrls.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/comctrls.png.data
rename to documentation/current/solutions/platform-specifics/_images/comctrls.png.data
diff --git a/documentation/current/platform-specifics/_images/commands.png b/documentation/current/solutions/platform-specifics/_images/commands.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/commands.png
rename to documentation/current/solutions/platform-specifics/_images/commands.png
diff --git a/documentation/current/platform-specifics/_images/commands.png.data b/documentation/current/solutions/platform-specifics/_images/commands.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/commands.png.data
rename to documentation/current/solutions/platform-specifics/_images/commands.png.data
diff --git a/documentation/current/platform-specifics/_images/controls.png b/documentation/current/solutions/platform-specifics/_images/controls.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/controls.png
rename to documentation/current/solutions/platform-specifics/_images/controls.png
diff --git a/documentation/current/platform-specifics/_images/controls.png.data b/documentation/current/solutions/platform-specifics/_images/controls.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/controls.png.data
rename to documentation/current/solutions/platform-specifics/_images/controls.png.data
diff --git a/documentation/current/platform-specifics/_images/ctlcolor.png b/documentation/current/solutions/platform-specifics/_images/ctlcolor.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/ctlcolor.png
rename to documentation/current/solutions/platform-specifics/_images/ctlcolor.png
diff --git a/documentation/current/platform-specifics/_images/ctlcolor.png.data b/documentation/current/solutions/platform-specifics/_images/ctlcolor.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/ctlcolor.png.data
rename to documentation/current/solutions/platform-specifics/_images/ctlcolor.png.data
diff --git a/documentation/current/platform-specifics/_images/date-time-picker.png b/documentation/current/solutions/platform-specifics/_images/date-time-picker.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/date-time-picker.png
rename to documentation/current/solutions/platform-specifics/_images/date-time-picker.png
diff --git a/documentation/current/platform-specifics/_images/date-time-picker.png.data b/documentation/current/solutions/platform-specifics/_images/date-time-picker.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/date-time-picker.png.data
rename to documentation/current/solutions/platform-specifics/_images/date-time-picker.png.data
diff --git a/documentation/current/platform-specifics/_images/diskspace.png b/documentation/current/solutions/platform-specifics/_images/diskspace.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/diskspace.png
rename to documentation/current/solutions/platform-specifics/_images/diskspace.png
diff --git a/documentation/current/platform-specifics/_images/diskspace.png.data b/documentation/current/solutions/platform-specifics/_images/diskspace.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/diskspace.png.data
rename to documentation/current/solutions/platform-specifics/_images/diskspace.png.data
diff --git a/documentation/current/platform-specifics/_images/dotnet-samples--date-time-picker-change-color-dlg.png b/documentation/current/solutions/platform-specifics/_images/dotnet-samples--date-time-picker-change-color-dlg.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/dotnet-samples--date-time-picker-change-color-dlg.png
rename to documentation/current/solutions/platform-specifics/_images/dotnet-samples--date-time-picker-change-color-dlg.png
diff --git a/documentation/current/platform-specifics/_images/dotnet-samples--date-time-picker-change-color-dlg.png.data b/documentation/current/solutions/platform-specifics/_images/dotnet-samples--date-time-picker-change-color-dlg.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/dotnet-samples--date-time-picker-change-color-dlg.png.data
rename to documentation/current/solutions/platform-specifics/_images/dotnet-samples--date-time-picker-change-color-dlg.png.data
diff --git a/documentation/current/platform-specifics/_images/exception-raising.png b/documentation/current/solutions/platform-specifics/_images/exception-raising.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/exception-raising.png
rename to documentation/current/solutions/platform-specifics/_images/exception-raising.png
diff --git a/documentation/current/platform-specifics/_images/exception-raising.png.data b/documentation/current/solutions/platform-specifics/_images/exception-raising.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/exception-raising.png.data
rename to documentation/current/solutions/platform-specifics/_images/exception-raising.png.data
diff --git a/documentation/current/platform-specifics/_images/expand.png b/documentation/current/solutions/platform-specifics/_images/expand.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/expand.png
rename to documentation/current/solutions/platform-specifics/_images/expand.png
diff --git a/documentation/current/platform-specifics/_images/expand.png.data b/documentation/current/solutions/platform-specifics/_images/expand.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/expand.png.data
rename to documentation/current/solutions/platform-specifics/_images/expand.png.data
diff --git a/documentation/current/platform-specifics/_images/folders.png b/documentation/current/solutions/platform-specifics/_images/folders.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/folders.png
rename to documentation/current/solutions/platform-specifics/_images/folders.png
diff --git a/documentation/current/platform-specifics/_images/folders.png.data b/documentation/current/solutions/platform-specifics/_images/folders.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/folders.png.data
rename to documentation/current/solutions/platform-specifics/_images/folders.png.data
diff --git a/documentation/current/platform-specifics/_images/fontenum.png b/documentation/current/solutions/platform-specifics/_images/fontenum.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/fontenum.png
rename to documentation/current/solutions/platform-specifics/_images/fontenum.png
diff --git a/documentation/current/platform-specifics/_images/fontenum.png.data b/documentation/current/solutions/platform-specifics/_images/fontenum.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/fontenum.png.data
rename to documentation/current/solutions/platform-specifics/_images/fontenum.png.data
diff --git a/documentation/current/platform-specifics/_images/fun.png b/documentation/current/solutions/platform-specifics/_images/fun.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/fun.png
rename to documentation/current/solutions/platform-specifics/_images/fun.png
diff --git a/documentation/current/platform-specifics/_images/fun.png.data b/documentation/current/solutions/platform-specifics/_images/fun.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/fun.png.data
rename to documentation/current/solutions/platform-specifics/_images/fun.png.data
diff --git a/documentation/current/platform-specifics/_images/header-ctrl.png b/documentation/current/solutions/platform-specifics/_images/header-ctrl.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/header-ctrl.png
rename to documentation/current/solutions/platform-specifics/_images/header-ctrl.png
diff --git a/documentation/current/platform-specifics/_images/header-ctrl.png.data b/documentation/current/solutions/platform-specifics/_images/header-ctrl.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/header-ctrl.png.data
rename to documentation/current/solutions/platform-specifics/_images/header-ctrl.png.data
diff --git a/documentation/current/platform-specifics/_images/hello-world.png b/documentation/current/solutions/platform-specifics/_images/hello-world.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/hello-world.png
rename to documentation/current/solutions/platform-specifics/_images/hello-world.png
diff --git a/documentation/current/platform-specifics/_images/hello-world.png.data b/documentation/current/solutions/platform-specifics/_images/hello-world.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/hello-world.png.data
rename to documentation/current/solutions/platform-specifics/_images/hello-world.png.data
diff --git a/documentation/current/platform-specifics/_images/hello.png b/documentation/current/solutions/platform-specifics/_images/hello.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/hello.png
rename to documentation/current/solutions/platform-specifics/_images/hello.png
diff --git a/documentation/current/platform-specifics/_images/hello.png.data b/documentation/current/solutions/platform-specifics/_images/hello.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/hello.png.data
rename to documentation/current/solutions/platform-specifics/_images/hello.png.data
diff --git a/documentation/current/platform-specifics/_images/implemented-interface-server.png b/documentation/current/solutions/platform-specifics/_images/implemented-interface-server.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/implemented-interface-server.png
rename to documentation/current/solutions/platform-specifics/_images/implemented-interface-server.png
diff --git a/documentation/current/platform-specifics/_images/implemented-interface-server.png.data b/documentation/current/solutions/platform-specifics/_images/implemented-interface-server.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/implemented-interface-server.png.data
rename to documentation/current/solutions/platform-specifics/_images/implemented-interface-server.png.data
diff --git a/documentation/current/platform-specifics/_images/implemented-interface.png b/documentation/current/solutions/platform-specifics/_images/implemented-interface.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/implemented-interface.png
rename to documentation/current/solutions/platform-specifics/_images/implemented-interface.png
diff --git a/documentation/current/platform-specifics/_images/implemented-interface.png.data b/documentation/current/solutions/platform-specifics/_images/implemented-interface.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/implemented-interface.png.data
rename to documentation/current/solutions/platform-specifics/_images/implemented-interface.png.data
diff --git a/documentation/current/platform-specifics/_images/interface-inheritance-server.png b/documentation/current/solutions/platform-specifics/_images/interface-inheritance-server.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/interface-inheritance-server.png
rename to documentation/current/solutions/platform-specifics/_images/interface-inheritance-server.png
diff --git a/documentation/current/platform-specifics/_images/interface-inheritance-server.png.data b/documentation/current/solutions/platform-specifics/_images/interface-inheritance-server.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/interface-inheritance-server.png.data
rename to documentation/current/solutions/platform-specifics/_images/interface-inheritance-server.png.data
diff --git a/documentation/current/platform-specifics/_images/interface-inheritance.png b/documentation/current/solutions/platform-specifics/_images/interface-inheritance.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/interface-inheritance.png
rename to documentation/current/solutions/platform-specifics/_images/interface-inheritance.png
diff --git a/documentation/current/platform-specifics/_images/interface-inheritance.png.data b/documentation/current/solutions/platform-specifics/_images/interface-inheritance.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/interface-inheritance.png.data
rename to documentation/current/solutions/platform-specifics/_images/interface-inheritance.png.data
diff --git a/documentation/current/platform-specifics/_images/introduction.png b/documentation/current/solutions/platform-specifics/_images/introduction.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/introduction.png
rename to documentation/current/solutions/platform-specifics/_images/introduction.png
diff --git a/documentation/current/platform-specifics/_images/introduction.png.data b/documentation/current/solutions/platform-specifics/_images/introduction.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/introduction.png.data
rename to documentation/current/solutions/platform-specifics/_images/introduction.png.data
diff --git a/documentation/current/platform-specifics/_images/list-view.png b/documentation/current/solutions/platform-specifics/_images/list-view.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/list-view.png
rename to documentation/current/solutions/platform-specifics/_images/list-view.png
diff --git a/documentation/current/platform-specifics/_images/list-view.png.data b/documentation/current/solutions/platform-specifics/_images/list-view.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/list-view.png.data
rename to documentation/current/solutions/platform-specifics/_images/list-view.png.data
diff --git a/documentation/current/platform-specifics/_images/magnify.png b/documentation/current/solutions/platform-specifics/_images/magnify.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/magnify.png
rename to documentation/current/solutions/platform-specifics/_images/magnify.png
diff --git a/documentation/current/platform-specifics/_images/magnify.png.data b/documentation/current/solutions/platform-specifics/_images/magnify.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/magnify.png.data
rename to documentation/current/solutions/platform-specifics/_images/magnify.png.data
diff --git a/documentation/current/platform-specifics/_images/mdi--mdi.png b/documentation/current/solutions/platform-specifics/_images/mdi--mdi.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/mdi--mdi.png
rename to documentation/current/solutions/platform-specifics/_images/mdi--mdi.png
diff --git a/documentation/current/platform-specifics/_images/mdi--mdi.png.data b/documentation/current/solutions/platform-specifics/_images/mdi--mdi.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/mdi--mdi.png.data
rename to documentation/current/solutions/platform-specifics/_images/mdi--mdi.png.data
diff --git a/documentation/current/platform-specifics/_images/mdi.png b/documentation/current/solutions/platform-specifics/_images/mdi.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/mdi.png
rename to documentation/current/solutions/platform-specifics/_images/mdi.png
diff --git a/documentation/current/platform-specifics/_images/mdi.png.data b/documentation/current/solutions/platform-specifics/_images/mdi.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/mdi.png.data
rename to documentation/current/solutions/platform-specifics/_images/mdi.png.data
diff --git a/documentation/current/platform-specifics/_images/menu-contextuel.png b/documentation/current/solutions/platform-specifics/_images/menu-contextuel.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/menu-contextuel.png
rename to documentation/current/solutions/platform-specifics/_images/menu-contextuel.png
diff --git a/documentation/current/platform-specifics/_images/menu-contextuel.png.data b/documentation/current/solutions/platform-specifics/_images/menu-contextuel.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/menu-contextuel.png.data
rename to documentation/current/solutions/platform-specifics/_images/menu-contextuel.png.data
diff --git a/documentation/current/platform-specifics/_images/menu-principal.png b/documentation/current/solutions/platform-specifics/_images/menu-principal.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/menu-principal.png
rename to documentation/current/solutions/platform-specifics/_images/menu-principal.png
diff --git a/documentation/current/platform-specifics/_images/menu-principal.png.data b/documentation/current/solutions/platform-specifics/_images/menu-principal.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/menu-principal.png.data
rename to documentation/current/solutions/platform-specifics/_images/menu-principal.png.data
diff --git a/documentation/current/platform-specifics/_images/menus.png b/documentation/current/solutions/platform-specifics/_images/menus.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/menus.png
rename to documentation/current/solutions/platform-specifics/_images/menus.png
diff --git a/documentation/current/platform-specifics/_images/menus.png.data b/documentation/current/solutions/platform-specifics/_images/menus.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/menus.png.data
rename to documentation/current/solutions/platform-specifics/_images/menus.png.data
diff --git a/documentation/current/platform-specifics/_images/message-box.png b/documentation/current/solutions/platform-specifics/_images/message-box.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/message-box.png
rename to documentation/current/solutions/platform-specifics/_images/message-box.png
diff --git a/documentation/current/platform-specifics/_images/message-box.png.data b/documentation/current/solutions/platform-specifics/_images/message-box.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/message-box.png.data
rename to documentation/current/solutions/platform-specifics/_images/message-box.png.data
diff --git a/documentation/current/platform-specifics/_images/minimal.png b/documentation/current/solutions/platform-specifics/_images/minimal.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/minimal.png
rename to documentation/current/solutions/platform-specifics/_images/minimal.png
diff --git a/documentation/current/platform-specifics/_images/minimal.png.data b/documentation/current/solutions/platform-specifics/_images/minimal.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/minimal.png.data
rename to documentation/current/solutions/platform-specifics/_images/minimal.png.data
diff --git a/documentation/current/platform-specifics/_images/pizza.png b/documentation/current/solutions/platform-specifics/_images/pizza.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/pizza.png
rename to documentation/current/solutions/platform-specifics/_images/pizza.png
diff --git a/documentation/current/platform-specifics/_images/pizza.png.data b/documentation/current/solutions/platform-specifics/_images/pizza.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/pizza.png.data
rename to documentation/current/solutions/platform-specifics/_images/pizza.png.data
diff --git a/documentation/current/platform-specifics/_images/prepro.png b/documentation/current/solutions/platform-specifics/_images/prepro.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/prepro.png
rename to documentation/current/solutions/platform-specifics/_images/prepro.png
diff --git a/documentation/current/platform-specifics/_images/prepro.png.data b/documentation/current/solutions/platform-specifics/_images/prepro.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/prepro.png.data
rename to documentation/current/solutions/platform-specifics/_images/prepro.png.data
diff --git a/documentation/current/platform-specifics/_images/printer.png b/documentation/current/solutions/platform-specifics/_images/printer.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/printer.png
rename to documentation/current/solutions/platform-specifics/_images/printer.png
diff --git a/documentation/current/platform-specifics/_images/printer.png.data b/documentation/current/solutions/platform-specifics/_images/printer.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/printer.png.data
rename to documentation/current/solutions/platform-specifics/_images/printer.png.data
diff --git a/documentation/current/platform-specifics/_images/progress-bar.png b/documentation/current/solutions/platform-specifics/_images/progress-bar.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/progress-bar.png
rename to documentation/current/solutions/platform-specifics/_images/progress-bar.png
diff --git a/documentation/current/platform-specifics/_images/progress-bar.png.data b/documentation/current/solutions/platform-specifics/_images/progress-bar.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/progress-bar.png.data
rename to documentation/current/solutions/platform-specifics/_images/progress-bar.png.data
diff --git a/documentation/current/platform-specifics/_images/rb.png b/documentation/current/solutions/platform-specifics/_images/rb.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/rb.png
rename to documentation/current/solutions/platform-specifics/_images/rb.png
diff --git a/documentation/current/platform-specifics/_images/rb.png.data b/documentation/current/solutions/platform-specifics/_images/rb.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/rb.png.data
rename to documentation/current/solutions/platform-specifics/_images/rb.png.data
diff --git a/documentation/current/platform-specifics/_images/retriev.png b/documentation/current/solutions/platform-specifics/_images/retriev.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/retriev.png
rename to documentation/current/solutions/platform-specifics/_images/retriev.png
diff --git a/documentation/current/platform-specifics/_images/retriev.png.data b/documentation/current/solutions/platform-specifics/_images/retriev.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/retriev.png.data
rename to documentation/current/solutions/platform-specifics/_images/retriev.png.data
diff --git a/documentation/current/platform-specifics/_images/richedit.png b/documentation/current/solutions/platform-specifics/_images/richedit.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/richedit.png
rename to documentation/current/solutions/platform-specifics/_images/richedit.png
diff --git a/documentation/current/platform-specifics/_images/richedit.png.data b/documentation/current/solutions/platform-specifics/_images/richedit.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/richedit.png.data
rename to documentation/current/solutions/platform-specifics/_images/richedit.png.data
diff --git a/documentation/current/platform-specifics/_images/simple-data-binding.png b/documentation/current/solutions/platform-specifics/_images/simple-data-binding.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/simple-data-binding.png
rename to documentation/current/solutions/platform-specifics/_images/simple-data-binding.png
diff --git a/documentation/current/platform-specifics/_images/simple-data-binding.png.data b/documentation/current/solutions/platform-specifics/_images/simple-data-binding.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/simple-data-binding.png.data
rename to documentation/current/solutions/platform-specifics/_images/simple-data-binding.png.data
diff --git a/documentation/current/platform-specifics/_images/simple-hello-world.png b/documentation/current/solutions/platform-specifics/_images/simple-hello-world.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/simple-hello-world.png
rename to documentation/current/solutions/platform-specifics/_images/simple-hello-world.png
diff --git a/documentation/current/platform-specifics/_images/simple-hello-world.png.data b/documentation/current/solutions/platform-specifics/_images/simple-hello-world.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/simple-hello-world.png.data
rename to documentation/current/solutions/platform-specifics/_images/simple-hello-world.png.data
diff --git a/documentation/current/platform-specifics/_images/splitarea.png b/documentation/current/solutions/platform-specifics/_images/splitarea.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/splitarea.png
rename to documentation/current/solutions/platform-specifics/_images/splitarea.png
diff --git a/documentation/current/platform-specifics/_images/splitarea.png.data b/documentation/current/solutions/platform-specifics/_images/splitarea.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/splitarea.png.data
rename to documentation/current/solutions/platform-specifics/_images/splitarea.png.data
diff --git a/documentation/current/platform-specifics/_images/stddlgs.png b/documentation/current/solutions/platform-specifics/_images/stddlgs.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/stddlgs.png
rename to documentation/current/solutions/platform-specifics/_images/stddlgs.png
diff --git a/documentation/current/platform-specifics/_images/stddlgs.png.data b/documentation/current/solutions/platform-specifics/_images/stddlgs.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/stddlgs.png.data
rename to documentation/current/solutions/platform-specifics/_images/stddlgs.png.data
diff --git a/documentation/current/platform-specifics/_images/step1.png b/documentation/current/solutions/platform-specifics/_images/step1.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/step1.png
rename to documentation/current/solutions/platform-specifics/_images/step1.png
diff --git a/documentation/current/platform-specifics/_images/step1.png.data b/documentation/current/solutions/platform-specifics/_images/step1.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/step1.png.data
rename to documentation/current/solutions/platform-specifics/_images/step1.png.data
diff --git a/documentation/current/platform-specifics/_images/step2.png b/documentation/current/solutions/platform-specifics/_images/step2.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/step2.png
rename to documentation/current/solutions/platform-specifics/_images/step2.png
diff --git a/documentation/current/platform-specifics/_images/step2.png.data b/documentation/current/solutions/platform-specifics/_images/step2.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/step2.png.data
rename to documentation/current/solutions/platform-specifics/_images/step2.png.data
diff --git a/documentation/current/platform-specifics/_images/step3.png b/documentation/current/solutions/platform-specifics/_images/step3.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/step3.png
rename to documentation/current/solutions/platform-specifics/_images/step3.png
diff --git a/documentation/current/platform-specifics/_images/step3.png.data b/documentation/current/solutions/platform-specifics/_images/step3.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/step3.png.data
rename to documentation/current/solutions/platform-specifics/_images/step3.png.data
diff --git a/documentation/current/platform-specifics/_images/step4.png b/documentation/current/solutions/platform-specifics/_images/step4.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/step4.png
rename to documentation/current/solutions/platform-specifics/_images/step4.png
diff --git a/documentation/current/platform-specifics/_images/step4.png.data b/documentation/current/solutions/platform-specifics/_images/step4.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/step4.png.data
rename to documentation/current/solutions/platform-specifics/_images/step4.png.data
diff --git a/documentation/current/platform-specifics/_images/step5.png b/documentation/current/solutions/platform-specifics/_images/step5.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/step5.png
rename to documentation/current/solutions/platform-specifics/_images/step5.png
diff --git a/documentation/current/platform-specifics/_images/step5.png.data b/documentation/current/solutions/platform-specifics/_images/step5.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/step5.png.data
rename to documentation/current/solutions/platform-specifics/_images/step5.png.data
diff --git a/documentation/current/platform-specifics/_images/step6.png b/documentation/current/solutions/platform-specifics/_images/step6.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/step6.png
rename to documentation/current/solutions/platform-specifics/_images/step6.png
diff --git a/documentation/current/platform-specifics/_images/step6.png.data b/documentation/current/solutions/platform-specifics/_images/step6.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/step6.png.data
rename to documentation/current/solutions/platform-specifics/_images/step6.png.data
diff --git a/documentation/current/platform-specifics/_images/step7.png b/documentation/current/solutions/platform-specifics/_images/step7.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/step7.png
rename to documentation/current/solutions/platform-specifics/_images/step7.png
diff --git a/documentation/current/platform-specifics/_images/step7.png.data b/documentation/current/solutions/platform-specifics/_images/step7.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/step7.png.data
rename to documentation/current/solutions/platform-specifics/_images/step7.png.data
diff --git a/documentation/current/platform-specifics/_images/step8.png b/documentation/current/solutions/platform-specifics/_images/step8.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/step8.png
rename to documentation/current/solutions/platform-specifics/_images/step8.png
diff --git a/documentation/current/platform-specifics/_images/step8.png.data b/documentation/current/solutions/platform-specifics/_images/step8.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/step8.png.data
rename to documentation/current/solutions/platform-specifics/_images/step8.png.data
diff --git a/documentation/current/platform-specifics/_images/text.png b/documentation/current/solutions/platform-specifics/_images/text.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/text.png
rename to documentation/current/solutions/platform-specifics/_images/text.png
diff --git a/documentation/current/platform-specifics/_images/text.png.data b/documentation/current/solutions/platform-specifics/_images/text.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/text.png.data
rename to documentation/current/solutions/platform-specifics/_images/text.png.data
diff --git a/documentation/current/platform-specifics/_images/timer.png b/documentation/current/solutions/platform-specifics/_images/timer.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/timer.png
rename to documentation/current/solutions/platform-specifics/_images/timer.png
diff --git a/documentation/current/platform-specifics/_images/timer.png.data b/documentation/current/solutions/platform-specifics/_images/timer.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/timer.png.data
rename to documentation/current/solutions/platform-specifics/_images/timer.png.data
diff --git a/documentation/current/platform-specifics/_images/tree-view--tree-view.png b/documentation/current/solutions/platform-specifics/_images/tree-view--tree-view.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/tree-view--tree-view.png
rename to documentation/current/solutions/platform-specifics/_images/tree-view--tree-view.png
diff --git a/documentation/current/platform-specifics/_images/tree-view--tree-view.png.data b/documentation/current/solutions/platform-specifics/_images/tree-view--tree-view.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/tree-view--tree-view.png.data
rename to documentation/current/solutions/platform-specifics/_images/tree-view--tree-view.png.data
diff --git a/documentation/current/platform-specifics/_images/tree-view.png b/documentation/current/solutions/platform-specifics/_images/tree-view.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/tree-view.png
rename to documentation/current/solutions/platform-specifics/_images/tree-view.png
diff --git a/documentation/current/platform-specifics/_images/tree-view.png.data b/documentation/current/solutions/platform-specifics/_images/tree-view.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/tree-view.png.data
rename to documentation/current/solutions/platform-specifics/_images/tree-view.png.data
diff --git a/documentation/current/platform-specifics/_images/unicode.png b/documentation/current/solutions/platform-specifics/_images/unicode.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/unicode.png
rename to documentation/current/solutions/platform-specifics/_images/unicode.png
diff --git a/documentation/current/platform-specifics/_images/unicode.png.data b/documentation/current/solutions/platform-specifics/_images/unicode.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/unicode.png.data
rename to documentation/current/solutions/platform-specifics/_images/unicode.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-check-box-3-state-checked.png b/documentation/current/solutions/platform-specifics/_images/wel-check-box-3-state-checked.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-check-box-3-state-checked.png
rename to documentation/current/solutions/platform-specifics/_images/wel-check-box-3-state-checked.png
diff --git a/documentation/current/platform-specifics/_images/wel-check-box-3-state-checked.png.data b/documentation/current/solutions/platform-specifics/_images/wel-check-box-3-state-checked.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-check-box-3-state-checked.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-check-box-3-state-checked.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-check-box-3-state-indeterminate.png b/documentation/current/solutions/platform-specifics/_images/wel-check-box-3-state-indeterminate.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-check-box-3-state-indeterminate.png
rename to documentation/current/solutions/platform-specifics/_images/wel-check-box-3-state-indeterminate.png
diff --git a/documentation/current/platform-specifics/_images/wel-check-box-3-state-indeterminate.png.data b/documentation/current/solutions/platform-specifics/_images/wel-check-box-3-state-indeterminate.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-check-box-3-state-indeterminate.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-check-box-3-state-indeterminate.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-check-box-3-state-unchecked.png b/documentation/current/solutions/platform-specifics/_images/wel-check-box-3-state-unchecked.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-check-box-3-state-unchecked.png
rename to documentation/current/solutions/platform-specifics/_images/wel-check-box-3-state-unchecked.png
diff --git a/documentation/current/platform-specifics/_images/wel-check-box-3-state-unchecked.png.data b/documentation/current/solutions/platform-specifics/_images/wel-check-box-3-state-unchecked.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-check-box-3-state-unchecked.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-check-box-3-state-unchecked.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-check-box-checked.png b/documentation/current/solutions/platform-specifics/_images/wel-check-box-checked.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-check-box-checked.png
rename to documentation/current/solutions/platform-specifics/_images/wel-check-box-checked.png
diff --git a/documentation/current/platform-specifics/_images/wel-check-box-checked.png.data b/documentation/current/solutions/platform-specifics/_images/wel-check-box-checked.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-check-box-checked.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-check-box-checked.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-check-box-unchecked.png b/documentation/current/solutions/platform-specifics/_images/wel-check-box-unchecked.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-check-box-unchecked.png
rename to documentation/current/solutions/platform-specifics/_images/wel-check-box-unchecked.png
diff --git a/documentation/current/platform-specifics/_images/wel-check-box-unchecked.png.data b/documentation/current/solutions/platform-specifics/_images/wel-check-box-unchecked.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-check-box-unchecked.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-check-box-unchecked.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-choose-color-dialog.png b/documentation/current/solutions/platform-specifics/_images/wel-choose-color-dialog.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-choose-color-dialog.png
rename to documentation/current/solutions/platform-specifics/_images/wel-choose-color-dialog.png
diff --git a/documentation/current/platform-specifics/_images/wel-choose-color-dialog.png.data b/documentation/current/solutions/platform-specifics/_images/wel-choose-color-dialog.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-choose-color-dialog.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-choose-color-dialog.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-choose-folder-dialog.png b/documentation/current/solutions/platform-specifics/_images/wel-choose-folder-dialog.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-choose-folder-dialog.png
rename to documentation/current/solutions/platform-specifics/_images/wel-choose-folder-dialog.png
diff --git a/documentation/current/platform-specifics/_images/wel-choose-folder-dialog.png.data b/documentation/current/solutions/platform-specifics/_images/wel-choose-folder-dialog.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-choose-folder-dialog.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-choose-folder-dialog.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-choose-font-dialog.png b/documentation/current/solutions/platform-specifics/_images/wel-choose-font-dialog.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-choose-font-dialog.png
rename to documentation/current/solutions/platform-specifics/_images/wel-choose-font-dialog.png
diff --git a/documentation/current/platform-specifics/_images/wel-choose-font-dialog.png.data b/documentation/current/solutions/platform-specifics/_images/wel-choose-font-dialog.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-choose-font-dialog.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-choose-font-dialog.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-group-box.png b/documentation/current/solutions/platform-specifics/_images/wel-group-box.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-group-box.png
rename to documentation/current/solutions/platform-specifics/_images/wel-group-box.png
diff --git a/documentation/current/platform-specifics/_images/wel-group-box.png.data b/documentation/current/solutions/platform-specifics/_images/wel-group-box.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-group-box.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-group-box.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-list-view-style-lvs-icon.png b/documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-icon.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-list-view-style-lvs-icon.png
rename to documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-icon.png
diff --git a/documentation/current/platform-specifics/_images/wel-list-view-style-lvs-icon.png.data b/documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-icon.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-list-view-style-lvs-icon.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-icon.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-list-view-style-lvs-list.png b/documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-list.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-list-view-style-lvs-list.png
rename to documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-list.png
diff --git a/documentation/current/platform-specifics/_images/wel-list-view-style-lvs-list.png.data b/documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-list.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-list-view-style-lvs-list.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-list.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-list-view-style-lvs-report.png b/documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-report.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-list-view-style-lvs-report.png
rename to documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-report.png
diff --git a/documentation/current/platform-specifics/_images/wel-list-view-style-lvs-report.png.data b/documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-report.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-list-view-style-lvs-report.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-report.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-list-view-style-lvs-small-icon.png b/documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-small-icon.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-list-view-style-lvs-small-icon.png
rename to documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-small-icon.png
diff --git a/documentation/current/platform-specifics/_images/wel-list-view-style-lvs-small-icon.png.data b/documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-small-icon.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-list-view-style-lvs-small-icon.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-list-view-style-lvs-small-icon.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-multiple-line-edit.png b/documentation/current/solutions/platform-specifics/_images/wel-multiple-line-edit.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-multiple-line-edit.png
rename to documentation/current/solutions/platform-specifics/_images/wel-multiple-line-edit.png
diff --git a/documentation/current/platform-specifics/_images/wel-multiple-line-edit.png.data b/documentation/current/solutions/platform-specifics/_images/wel-multiple-line-edit.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-multiple-line-edit.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-multiple-line-edit.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-multiple-selection-list-box.png b/documentation/current/solutions/platform-specifics/_images/wel-multiple-selection-list-box.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-multiple-selection-list-box.png
rename to documentation/current/solutions/platform-specifics/_images/wel-multiple-selection-list-box.png
diff --git a/documentation/current/platform-specifics/_images/wel-multiple-selection-list-box.png.data b/documentation/current/solutions/platform-specifics/_images/wel-multiple-selection-list-box.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-multiple-selection-list-box.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-multiple-selection-list-box.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-open-file-dialog.png b/documentation/current/solutions/platform-specifics/_images/wel-open-file-dialog.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-open-file-dialog.png
rename to documentation/current/solutions/platform-specifics/_images/wel-open-file-dialog.png
diff --git a/documentation/current/platform-specifics/_images/wel-open-file-dialog.png.data b/documentation/current/solutions/platform-specifics/_images/wel-open-file-dialog.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-open-file-dialog.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-open-file-dialog.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-print-dialog.png b/documentation/current/solutions/platform-specifics/_images/wel-print-dialog.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-print-dialog.png
rename to documentation/current/solutions/platform-specifics/_images/wel-print-dialog.png
diff --git a/documentation/current/platform-specifics/_images/wel-print-dialog.png.data b/documentation/current/solutions/platform-specifics/_images/wel-print-dialog.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-print-dialog.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-print-dialog.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-progress-bar-half.png b/documentation/current/solutions/platform-specifics/_images/wel-progress-bar-half.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-progress-bar-half.png
rename to documentation/current/solutions/platform-specifics/_images/wel-progress-bar-half.png
diff --git a/documentation/current/platform-specifics/_images/wel-progress-bar-half.png.data b/documentation/current/solutions/platform-specifics/_images/wel-progress-bar-half.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-progress-bar-half.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-progress-bar-half.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-push-button.png b/documentation/current/solutions/platform-specifics/_images/wel-push-button.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-push-button.png
rename to documentation/current/solutions/platform-specifics/_images/wel-push-button.png
diff --git a/documentation/current/platform-specifics/_images/wel-push-button.png.data b/documentation/current/solutions/platform-specifics/_images/wel-push-button.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-push-button.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-push-button.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-radio-button-checked.png b/documentation/current/solutions/platform-specifics/_images/wel-radio-button-checked.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-radio-button-checked.png
rename to documentation/current/solutions/platform-specifics/_images/wel-radio-button-checked.png
diff --git a/documentation/current/platform-specifics/_images/wel-radio-button-checked.png.data b/documentation/current/solutions/platform-specifics/_images/wel-radio-button-checked.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-radio-button-checked.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-radio-button-checked.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-radio-button-unchecked.png b/documentation/current/solutions/platform-specifics/_images/wel-radio-button-unchecked.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-radio-button-unchecked.png
rename to documentation/current/solutions/platform-specifics/_images/wel-radio-button-unchecked.png
diff --git a/documentation/current/platform-specifics/_images/wel-radio-button-unchecked.png.data b/documentation/current/solutions/platform-specifics/_images/wel-radio-button-unchecked.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-radio-button-unchecked.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-radio-button-unchecked.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-save-file-dialog.png b/documentation/current/solutions/platform-specifics/_images/wel-save-file-dialog.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-save-file-dialog.png
rename to documentation/current/solutions/platform-specifics/_images/wel-save-file-dialog.png
diff --git a/documentation/current/platform-specifics/_images/wel-save-file-dialog.png.data b/documentation/current/solutions/platform-specifics/_images/wel-save-file-dialog.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-save-file-dialog.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-save-file-dialog.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-scroll-bar-horizontal.png b/documentation/current/solutions/platform-specifics/_images/wel-scroll-bar-horizontal.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-scroll-bar-horizontal.png
rename to documentation/current/solutions/platform-specifics/_images/wel-scroll-bar-horizontal.png
diff --git a/documentation/current/platform-specifics/_images/wel-scroll-bar-horizontal.png.data b/documentation/current/solutions/platform-specifics/_images/wel-scroll-bar-horizontal.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-scroll-bar-horizontal.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-scroll-bar-horizontal.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-scroll-bar-vertical.png b/documentation/current/solutions/platform-specifics/_images/wel-scroll-bar-vertical.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-scroll-bar-vertical.png
rename to documentation/current/solutions/platform-specifics/_images/wel-scroll-bar-vertical.png
diff --git a/documentation/current/platform-specifics/_images/wel-scroll-bar-vertical.png.data b/documentation/current/solutions/platform-specifics/_images/wel-scroll-bar-vertical.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-scroll-bar-vertical.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-scroll-bar-vertical.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-single-line-edit.png b/documentation/current/solutions/platform-specifics/_images/wel-single-line-edit.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-single-line-edit.png
rename to documentation/current/solutions/platform-specifics/_images/wel-single-line-edit.png
diff --git a/documentation/current/platform-specifics/_images/wel-single-line-edit.png.data b/documentation/current/solutions/platform-specifics/_images/wel-single-line-edit.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-single-line-edit.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-single-line-edit.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-single-selection-list-box.png b/documentation/current/solutions/platform-specifics/_images/wel-single-selection-list-box.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-single-selection-list-box.png
rename to documentation/current/solutions/platform-specifics/_images/wel-single-selection-list-box.png
diff --git a/documentation/current/platform-specifics/_images/wel-single-selection-list-box.png.data b/documentation/current/solutions/platform-specifics/_images/wel-single-selection-list-box.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-single-selection-list-box.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-single-selection-list-box.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-tooltip.png b/documentation/current/solutions/platform-specifics/_images/wel-tooltip.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-tooltip.png
rename to documentation/current/solutions/platform-specifics/_images/wel-tooltip.png
diff --git a/documentation/current/platform-specifics/_images/wel-tooltip.png.data b/documentation/current/solutions/platform-specifics/_images/wel-tooltip.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-tooltip.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-tooltip.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-track-bar-horizontal.png b/documentation/current/solutions/platform-specifics/_images/wel-track-bar-horizontal.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-track-bar-horizontal.png
rename to documentation/current/solutions/platform-specifics/_images/wel-track-bar-horizontal.png
diff --git a/documentation/current/platform-specifics/_images/wel-track-bar-horizontal.png.data b/documentation/current/solutions/platform-specifics/_images/wel-track-bar-horizontal.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-track-bar-horizontal.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-track-bar-horizontal.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-track-bar-vertical.png b/documentation/current/solutions/platform-specifics/_images/wel-track-bar-vertical.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-track-bar-vertical.png
rename to documentation/current/solutions/platform-specifics/_images/wel-track-bar-vertical.png
diff --git a/documentation/current/platform-specifics/_images/wel-track-bar-vertical.png.data b/documentation/current/solutions/platform-specifics/_images/wel-track-bar-vertical.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-track-bar-vertical.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-track-bar-vertical.png.data
diff --git a/documentation/current/platform-specifics/_images/wel-up-down-control.png b/documentation/current/solutions/platform-specifics/_images/wel-up-down-control.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-up-down-control.png
rename to documentation/current/solutions/platform-specifics/_images/wel-up-down-control.png
diff --git a/documentation/current/platform-specifics/_images/wel-up-down-control.png.data b/documentation/current/solutions/platform-specifics/_images/wel-up-down-control.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/wel-up-down-control.png.data
rename to documentation/current/solutions/platform-specifics/_images/wel-up-down-control.png.data
diff --git a/documentation/current/platform-specifics/_images/windows.png b/documentation/current/solutions/platform-specifics/_images/windows.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/windows.png
rename to documentation/current/solutions/platform-specifics/_images/windows.png
diff --git a/documentation/current/platform-specifics/_images/windows.png.data b/documentation/current/solutions/platform-specifics/_images/windows.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/windows.png.data
rename to documentation/current/solutions/platform-specifics/_images/windows.png.data
diff --git a/documentation/current/platform-specifics/_images/xcell.png b/documentation/current/solutions/platform-specifics/_images/xcell.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/xcell.png
rename to documentation/current/solutions/platform-specifics/_images/xcell.png
diff --git a/documentation/current/platform-specifics/_images/xcell.png.data b/documentation/current/solutions/platform-specifics/_images/xcell.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/xcell.png.data
rename to documentation/current/solutions/platform-specifics/_images/xcell.png.data
diff --git a/documentation/current/platform-specifics/_images/xy.png b/documentation/current/solutions/platform-specifics/_images/xy.png
similarity index 100%
rename from documentation/current/platform-specifics/_images/xy.png
rename to documentation/current/solutions/platform-specifics/_images/xy.png
diff --git a/documentation/current/platform-specifics/_images/xy.png.data b/documentation/current/solutions/platform-specifics/_images/xy.png.data
similarity index 100%
rename from documentation/current/platform-specifics/_images/xy.png.data
rename to documentation/current/solutions/platform-specifics/_images/xy.png.data
diff --git a/documentation/current/platform-specifics/index.wiki b/documentation/current/solutions/platform-specifics/index.wiki
similarity index 95%
rename from documentation/current/platform-specifics/index.wiki
rename to documentation/current/solutions/platform-specifics/index.wiki
index 700c1f26..41481a3a 100644
--- a/documentation/current/platform-specifics/index.wiki
+++ b/documentation/current/solutions/platform-specifics/index.wiki
@@ -1,6 +1,6 @@
 [[Property:title|Platform specifics]]
 [[Property:description|Eiffel's facilities, tools, and libraries that are targeted to specific operation systems]]
-[[Property:weight|-5]]
+[[Property:weight|12]]
 [[Property:uuid|fe9cb24b-3f0f-cb79-8ef0-27c34c851dfe]]
 Although the majority of Eiffel is completely platform independent, Eiffel does provide solutions for some development needs that are strictly related to the capabilities of specific operating systems. This book documents Eiffel's facilities, tools, and libraries that are targeted to specific operation systems.
 
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-class-reference.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-class-reference.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-class-reference.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-class-reference.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-interface-content/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-interface-content/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-interface-content/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-interface-content/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-interface-content/interfaces.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-interface-content/interfaces.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-interface-content/interfaces.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-interface-content/interfaces.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-interface-content/structures.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-interface-content/structures.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-interface-content/structures.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-library/eiffelcom-interface-content/structures.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-library/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-library/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-library/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-library/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/access-type.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/access-type.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/access-type.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/access-type.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/coclass.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/coclass.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/coclass.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/coclass.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/com-concepts.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/com-concepts.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/com-concepts.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/com-concepts.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/com-interfaces.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/com-interfaces.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/com-interfaces.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/com-interfaces.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/component-location.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/component-location.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/component-location.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/component-location.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/deeper-com.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/deeper-com.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/deeper-com.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/deeper-com.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/eiffelcom-introduction.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/eiffelcom-introduction.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/eiffelcom-introduction.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/eiffelcom-introduction.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/accessing-com-component.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/accessing-com-component.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/accessing-com-component.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/accessing-com-component.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/creating-new-com-component.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/creating-new-com-component.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/creating-new-com-component.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/creating-new-com-component.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/creating-new-component-eiffel-project.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/creating-new-component-eiffel-project.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/creating-new-component-eiffel-project.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/creating-new-component-eiffel-project.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-guided-tour/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-introduction.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-introduction.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-introduction.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-introduction.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/building-com-component.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/building-com-component.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/building-com-component.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/building-com-component.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/class-hierarchy.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/class-hierarchy.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/class-hierarchy.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/class-hierarchy.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/eiffel-project-processing.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/eiffel-project-processing.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/eiffel-project-processing.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/eiffel-project-processing.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/generated-files.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/generated-files.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/generated-files.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/generated-files.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/how-eiffelcom-wizard-works.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/how-eiffelcom-wizard-works.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/how-eiffelcom-wizard-works.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/how-eiffelcom-wizard-works.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/reusing-com-component.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/reusing-com-component.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/reusing-com-component.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/reusing-com-component.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/wizards-command-line-options.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/wizards-command-line-options.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/wizards-command-line-options.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/eiffelcom-wizard-reference/wizards-command-line-options.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/eiffelcom-wizard/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/com/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/com/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/com/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/eiffelribbon/eiffelribbon-design-tool.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/eiffelribbon/eiffelribbon-design-tool.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/eiffelribbon/eiffelribbon-design-tool.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/eiffelribbon/eiffelribbon-design-tool.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/eiffelribbon/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/eiffelribbon/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/eiffelribbon/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/eiffelribbon/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/building-net-application.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/building-net-application.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/building-net-application.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/building-net-application.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/eiffel-codedom-provider-manager.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/eiffel-codedom-provider-manager.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/eiffel-codedom-provider-manager.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/eiffel-codedom-provider-manager.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/esplitter.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/esplitter.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/esplitter.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/esplitter.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/name-mapper.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/name-mapper.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/name-mapper.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-aspnet-tools-and-administration/name-mapper.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/about-code-document-object-model-codedom.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/about-code-document-object-model-codedom.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/about-code-document-object-model-codedom.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/about-code-document-object-model-codedom.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/common-scenarios.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/common-scenarios.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/common-scenarios.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/common-scenarios.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/configuration.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/configuration.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/configuration.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/configuration.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/eiffel-implementation.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/eiffel-implementation.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/eiffel-implementation.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/eiffel-implementation.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/installation.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/installation.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/installation.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/installation.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/limitations.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/limitations.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/limitations.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/limitations.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/logging.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/logging.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/logging.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/logging.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/required-permissions.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/required-permissions.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/required-permissions.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/required-permissions.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/supported-constructs.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/supported-constructs.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/supported-constructs.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/eiffel-codedom-provider/supported-constructs.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/codedom-getting-started.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/codedom-getting-started.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/codedom-getting-started.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/codedom-getting-started.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/eiffel-aspnet-installation.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/eiffel-aspnet-installation.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/eiffel-aspnet-installation.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/eiffel-aspnet-installation.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/names-mappings.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/names-mappings.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/names-mappings.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/names-mappings.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/using-eiffel-write-aspnet-pages.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/using-eiffel-write-aspnet-pages.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/using-eiffel-write-aspnet-pages.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-aspnet-documentation/writing-aspnet-pages-eiffel/using-eiffel-write-aspnet-pages.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/constructors-and-creation-procedures.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/constructors-and-creation-procedures.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/constructors-and-creation-procedures.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/constructors-and-creation-procedures.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/eiffel-class-and-feature-names.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/eiffel-class-and-feature-names.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/eiffel-class-and-feature-names.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/eiffel-class-and-feature-names.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/eiffel-net-terminology.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/eiffel-net-terminology.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/eiffel-net-terminology.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/eiffel-net-terminology.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/eiffel-reserved-words.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/eiffel-reserved-words.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/eiffel-reserved-words.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/eiffel-reserved-words.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/similar-types-occurring-both-libraries.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/similar-types-occurring-both-libraries.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/similar-types-occurring-both-libraries.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/similar-types-occurring-both-libraries.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/type-organization.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/type-organization.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/type-organization.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/conventions/type-organization.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net-integration.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net-integration.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net-integration.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net-integration.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/adding-class-features.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/adding-class-features.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/adding-class-features.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/adding-class-features.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/design-contract-and-assertions.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/design-contract-and-assertions.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/design-contract-and-assertions.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/design-contract-and-assertions.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/eiffel-classes.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/eiffel-classes.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/eiffel-classes.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/eiffel-classes.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/eiffel-net-compliance.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/eiffel-net-compliance.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/eiffel-net-compliance.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/eiffel-net-compliance.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/event-programming-agents.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/event-programming-agents.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/event-programming-agents.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/event-programming-agents.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/exception-mechanism.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/exception-mechanism.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/exception-mechanism.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/exception-mechanism.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/genericity.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/genericity.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/genericity.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/genericity.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/inheritance.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/inheritance.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/inheritance.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/inheritance.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/referenced-assembly-type-and-feature-name-conversion.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/referenced-assembly-type-and-feature-name-conversion.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/referenced-assembly-type-and-feature-name-conversion.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/referenced-assembly-type-and-feature-name-conversion.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/using-referenced-assemblies.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/using-referenced-assemblies.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/using-referenced-assemblies.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/eiffel-net/using-referenced-assemblies.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/known-issues.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/known-issues.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/eiffel-net-language/known-issues.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/eiffel-net-language/known-issues.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/net-installation-instructions.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/net-installation-instructions.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/net-installation-instructions.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/net-installation-instructions.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/ado-net-samples/adonet-sample.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/ado-net-samples/adonet-sample.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/ado-net-samples/adonet-sample.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/ado-net-samples/adonet-sample.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/ado-net-samples/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/ado-net-samples/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/ado-net-samples/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/ado-net-samples/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/console-samples/calculator-console.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/console-samples/calculator-console.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/console-samples/calculator-console.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/console-samples/calculator-console.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/console-samples/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/console-samples/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/console-samples/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/console-samples/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/threads-samples/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/threads-samples/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/threads-samples/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/threads-samples/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/threads-samples/pools.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/threads-samples/pools.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/threads-samples/pools.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/threads-samples/pools.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/threads-samples/timers.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/threads-samples/timers.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/threads-samples/timers.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/threads-samples/timers.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/calculator-winform.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/calculator-winform.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/calculator-winform.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/calculator-winform.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/date-time-picker.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/date-time-picker.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/date-time-picker.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/date-time-picker.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/gdi-plus-text.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/gdi-plus-text.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/gdi-plus-text.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/gdi-plus-text.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/mdi/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/mdi/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/mdi/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/mdi/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/mdi/mdi-details.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/mdi/mdi-details.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/mdi/mdi-details.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/mdi/mdi-details.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/menus/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/menus/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/menus/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/menus/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/menus/menu-details.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/menus/menu-details.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/menus/menu-details.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/menus/menu-details.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/message-box.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/message-box.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/message-box.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/message-box.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/progress-bar-sample.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/progress-bar-sample.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/progress-bar-sample.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/progress-bar-sample.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/simple-data-binding.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/simple-data-binding.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/simple-data-binding.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/simple-data-binding.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/simple-hello-world-form-sample.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/simple-hello-world-form-sample.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/simple-hello-world-form-sample.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/simple-hello-world-form-sample.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/tree-view.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/tree-view.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/net/samples/winform-samples/tree-view.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/net/samples/winform-samples/tree-view.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/resourcebench/features.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/resourcebench/features.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/resourcebench/features.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/resourcebench/features.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/resourcebench/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/resourcebench/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/resourcebench/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/resourcebench/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/resourcebench/tour.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/resourcebench/tour.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/resourcebench/tour.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/resourcebench/tour.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/resourcebench/troubleshooting.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/resourcebench/troubleshooting.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/resourcebench/troubleshooting.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/resourcebench/troubleshooting.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-class-reference.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-class-reference.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-class-reference.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-class-reference.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/common-message-hooks.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-common-concepts/common-message-hooks.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/common-message-hooks.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-common-concepts/common-message-hooks.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-common-concepts/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-common-concepts/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/inheriting-wel-application.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-common-concepts/inheriting-wel-application.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/inheriting-wel-application.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-common-concepts/inheriting-wel-application.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/redefining-init-application.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-common-concepts/redefining-init-application.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/redefining-init-application.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-common-concepts/redefining-init-application.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/redefining-main-window.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-common-concepts/redefining-main-window.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-common-concepts/redefining-main-window.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-common-concepts/redefining-main-window.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-check-box-3-state.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-check-box-3-state.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-check-box-3-state.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-check-box-3-state.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-checkbox.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-checkbox.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-checkbox.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-checkbox.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-down-control.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-down-control.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-down-control.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-down-control.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-group-box.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-group-box.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-group-box.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-group-box.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-list-view.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-list-view.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-list-view.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-list-view.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-multiple-line-edit.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-multiple-line-edit.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-multiple-line-edit.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-multiple-line-edit.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-multiple-selection-list-box.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-multiple-selection-list-box.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-multiple-selection-list-box.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-multiple-selection-list-box.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-owner-draw-button.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-owner-draw-button.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-owner-draw-button.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-owner-draw-button.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-progress-bar.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-progress-bar.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-progress-bar.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-progress-bar.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-push-button.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-push-button.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-push-button.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-push-button.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-radio-button.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-radio-button.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-radio-button.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-radio-button.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-scroll-bar.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-scroll-bar.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-scroll-bar.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-scroll-bar.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-single-line-edit.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-single-line-edit.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-single-line-edit.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-single-line-edit.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-single-selection-list-box.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-single-selection-list-box.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-single-selection-list-box.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-single-selection-list-box.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-tooltip.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-tooltip.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-tooltip.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-tooltip.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-track-bar.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-track-bar.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-track-bar.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/controls-cluster/wel-track-bar.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-choose-color-dialog.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-choose-color-dialog.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-choose-color-dialog.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-choose-color-dialog.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-choose-folder-dialog.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-choose-folder-dialog.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-choose-folder-dialog.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-choose-folder-dialog.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-choose-font-dialog.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-choose-font-dialog.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-choose-font-dialog.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-choose-font-dialog.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-open-file-dialog.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-open-file-dialog.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-open-file-dialog.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-open-file-dialog.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-print-dialog.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-print-dialog.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-print-dialog.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-print-dialog.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-save-file-dialog.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-save-file-dialog.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-save-file-dialog.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/stddlgs-cluster/wel-save-file-dialog.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/windows-cluster.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/windows-cluster.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-interface-content/windows-cluster.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-interface-content/windows-cluster.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/bmpview.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/bmpview.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/bmpview.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/bmpview.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/brushes.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/brushes.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/brushes.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/brushes.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/commands.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/commands.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/commands.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/commands.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/common-controls.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/common-controls.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/common-controls.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/common-controls.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/controls-sample.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/controls-sample.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/controls-sample.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/controls-sample.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/ctlcolor.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/ctlcolor.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/ctlcolor.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/ctlcolor.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/cursors.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/cursors.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/cursors.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/cursors.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/disk-space.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/disk-space.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/disk-space.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/disk-space.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/fontenum.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/fontenum.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/fontenum.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/fontenum.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/fun.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/fun.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/fun.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/fun.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/header-control.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/header-control.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/header-control.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/header-control.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/hello-world.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/hello-world.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/hello-world.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/hello-world.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/list-view.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/list-view.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/list-view.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/list-view.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/magnify.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/magnify.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/magnify.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/magnify.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/mdi-multiple-document-interface.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/mdi-multiple-document-interface.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/mdi-multiple-document-interface.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/mdi-multiple-document-interface.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/minimal.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/minimal.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/minimal.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/minimal.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/pizza.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/pizza.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/pizza.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/pizza.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/printer.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/printer.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/printer.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/printer.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/rich-edit.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/rich-edit.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/rich-edit.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/rich-edit.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/split-area.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/split-area.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/split-area.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/split-area.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/standard-dialogs-sample.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/standard-dialogs-sample.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/standard-dialogs-sample.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/standard-dialogs-sample.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/timer.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/timer.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/timer.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/timer.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/tree-view-sample.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/tree-view-sample.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/tree-view-sample.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/tree-view-sample.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/unicode-sample.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/unicode-sample.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/unicode-sample.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/unicode-sample.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/wel-sample-menus.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/wel-sample-menus.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/wel-sample-menus.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/wel-sample-menus.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/windows-sample.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/windows-sample.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/windows-sample.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/windows-sample.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/xcell.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/xcell.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/xcell.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/xcell.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/xy-co-ordinates.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/xy-co-ordinates.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-samples/xy-co-ordinates.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-samples/xy-co-ordinates.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/index.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/index.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/index.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/index.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-1.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-1.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-1.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-1.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-2.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-2.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-2.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-2.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-3.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-3.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-3.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-3.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-4.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-4.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-4.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-4.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-5.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-5.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-5.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-5.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-6.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-6.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-6.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-6.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-7.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-7.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-7.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-7.wiki
diff --git a/documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-8.wiki b/documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-8.wiki
similarity index 100%
rename from documentation/current/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-8.wiki
rename to documentation/current/solutions/platform-specifics/microsoft-windows/wel/wel-tutorial/tutorial-step-8.wiki