diff --git a/doc/devel/html/uml/class100.html b/doc/devel/uml/class100.html
similarity index 100%
rename from doc/devel/html/uml/class100.html
rename to doc/devel/uml/class100.html
diff --git a/doc/devel/html/uml/class101.html b/doc/devel/uml/class101.html
similarity index 100%
rename from doc/devel/html/uml/class101.html
rename to doc/devel/uml/class101.html
diff --git a/doc/devel/html/uml/class102.html b/doc/devel/uml/class102.html
similarity index 100%
rename from doc/devel/html/uml/class102.html
rename to doc/devel/uml/class102.html
diff --git a/doc/devel/html/uml/class103.html b/doc/devel/uml/class103.html
similarity index 100%
rename from doc/devel/html/uml/class103.html
rename to doc/devel/uml/class103.html
diff --git a/doc/devel/html/uml/class105.html b/doc/devel/uml/class105.html
similarity index 100%
rename from doc/devel/html/uml/class105.html
rename to doc/devel/uml/class105.html
diff --git a/doc/devel/html/uml/class106.html b/doc/devel/uml/class106.html
similarity index 100%
rename from doc/devel/html/uml/class106.html
rename to doc/devel/uml/class106.html
diff --git a/doc/devel/html/uml/class107.html b/doc/devel/uml/class107.html
similarity index 100%
rename from doc/devel/html/uml/class107.html
rename to doc/devel/uml/class107.html
diff --git a/doc/devel/html/uml/class108.html b/doc/devel/uml/class108.html
similarity index 100%
rename from doc/devel/html/uml/class108.html
rename to doc/devel/uml/class108.html
diff --git a/doc/devel/html/uml/class112.html b/doc/devel/uml/class112.html
similarity index 100%
rename from doc/devel/html/uml/class112.html
rename to doc/devel/uml/class112.html
diff --git a/doc/devel/html/uml/class20.html b/doc/devel/uml/class20.html
similarity index 100%
rename from doc/devel/html/uml/class20.html
rename to doc/devel/uml/class20.html
diff --git a/doc/devel/html/uml/class23.html b/doc/devel/uml/class23.html
similarity index 100%
rename from doc/devel/html/uml/class23.html
rename to doc/devel/uml/class23.html
diff --git a/doc/devel/html/uml/class26.html b/doc/devel/uml/class26.html
similarity index 100%
rename from doc/devel/html/uml/class26.html
rename to doc/devel/uml/class26.html
diff --git a/doc/devel/html/uml/class31.html b/doc/devel/uml/class31.html
similarity index 100%
rename from doc/devel/html/uml/class31.html
rename to doc/devel/uml/class31.html
diff --git a/doc/devel/html/uml/class32.html b/doc/devel/uml/class32.html
similarity index 100%
rename from doc/devel/html/uml/class32.html
rename to doc/devel/uml/class32.html
diff --git a/doc/devel/html/uml/class34.html b/doc/devel/uml/class34.html
similarity index 100%
rename from doc/devel/html/uml/class34.html
rename to doc/devel/uml/class34.html
diff --git a/doc/devel/html/uml/class37.html b/doc/devel/uml/class37.html
similarity index 100%
rename from doc/devel/html/uml/class37.html
rename to doc/devel/uml/class37.html
diff --git a/doc/devel/html/uml/class38.html b/doc/devel/uml/class38.html
similarity index 100%
rename from doc/devel/html/uml/class38.html
rename to doc/devel/uml/class38.html
diff --git a/doc/devel/html/uml/class39.html b/doc/devel/uml/class39.html
similarity index 100%
rename from doc/devel/html/uml/class39.html
rename to doc/devel/uml/class39.html
diff --git a/doc/devel/html/uml/class40.html b/doc/devel/uml/class40.html
similarity index 100%
rename from doc/devel/html/uml/class40.html
rename to doc/devel/uml/class40.html
diff --git a/doc/devel/html/uml/class41.html b/doc/devel/uml/class41.html
similarity index 100%
rename from doc/devel/html/uml/class41.html
rename to doc/devel/uml/class41.html
diff --git a/doc/devel/html/uml/class42.html b/doc/devel/uml/class42.html
similarity index 100%
rename from doc/devel/html/uml/class42.html
rename to doc/devel/uml/class42.html
diff --git a/doc/devel/html/uml/class45.html b/doc/devel/uml/class45.html
similarity index 100%
rename from doc/devel/html/uml/class45.html
rename to doc/devel/uml/class45.html
diff --git a/doc/devel/html/uml/class46.html b/doc/devel/uml/class46.html
similarity index 100%
rename from doc/devel/html/uml/class46.html
rename to doc/devel/uml/class46.html
diff --git a/doc/devel/html/uml/class47.html b/doc/devel/uml/class47.html
similarity index 100%
rename from doc/devel/html/uml/class47.html
rename to doc/devel/uml/class47.html
diff --git a/doc/devel/html/uml/class51.html b/doc/devel/uml/class51.html
similarity index 100%
rename from doc/devel/html/uml/class51.html
rename to doc/devel/uml/class51.html
diff --git a/doc/devel/html/uml/class52.html b/doc/devel/uml/class52.html
similarity index 100%
rename from doc/devel/html/uml/class52.html
rename to doc/devel/uml/class52.html
diff --git a/doc/devel/html/uml/class53.html b/doc/devel/uml/class53.html
similarity index 100%
rename from doc/devel/html/uml/class53.html
rename to doc/devel/uml/class53.html
diff --git a/doc/devel/html/uml/class57.html b/doc/devel/uml/class57.html
similarity index 100%
rename from doc/devel/html/uml/class57.html
rename to doc/devel/uml/class57.html
diff --git a/doc/devel/html/uml/class59.html b/doc/devel/uml/class59.html
similarity index 100%
rename from doc/devel/html/uml/class59.html
rename to doc/devel/uml/class59.html
diff --git a/doc/devel/html/uml/class61.html b/doc/devel/uml/class61.html
similarity index 100%
rename from doc/devel/html/uml/class61.html
rename to doc/devel/uml/class61.html
diff --git a/doc/devel/html/uml/class63.html b/doc/devel/uml/class63.html
similarity index 100%
rename from doc/devel/html/uml/class63.html
rename to doc/devel/uml/class63.html
diff --git a/doc/devel/html/uml/class65.html b/doc/devel/uml/class65.html
similarity index 100%
rename from doc/devel/html/uml/class65.html
rename to doc/devel/uml/class65.html
diff --git a/doc/devel/html/uml/class70.html b/doc/devel/uml/class70.html
similarity index 100%
rename from doc/devel/html/uml/class70.html
rename to doc/devel/uml/class70.html
diff --git a/doc/devel/html/uml/class71.html b/doc/devel/uml/class71.html
similarity index 100%
rename from doc/devel/html/uml/class71.html
rename to doc/devel/uml/class71.html
diff --git a/doc/devel/html/uml/class73.html b/doc/devel/uml/class73.html
similarity index 100%
rename from doc/devel/html/uml/class73.html
rename to doc/devel/uml/class73.html
diff --git a/doc/devel/html/uml/class86.html b/doc/devel/uml/class86.html
similarity index 100%
rename from doc/devel/html/uml/class86.html
rename to doc/devel/uml/class86.html
diff --git a/doc/devel/html/uml/class89.html b/doc/devel/uml/class89.html
similarity index 100%
rename from doc/devel/html/uml/class89.html
rename to doc/devel/uml/class89.html
diff --git a/doc/devel/html/uml/class91.html b/doc/devel/uml/class91.html
similarity index 100%
rename from doc/devel/html/uml/class91.html
rename to doc/devel/uml/class91.html
diff --git a/doc/devel/html/uml/class92.html b/doc/devel/uml/class92.html
similarity index 100%
rename from doc/devel/html/uml/class92.html
rename to doc/devel/uml/class92.html
diff --git a/doc/devel/html/uml/class93.html b/doc/devel/uml/class93.html
similarity index 100%
rename from doc/devel/html/uml/class93.html
rename to doc/devel/uml/class93.html
diff --git a/doc/devel/html/uml/class94.html b/doc/devel/uml/class94.html
similarity index 100%
rename from doc/devel/html/uml/class94.html
rename to doc/devel/uml/class94.html
diff --git a/doc/devel/html/uml/class95.html b/doc/devel/uml/class95.html
similarity index 100%
rename from doc/devel/html/uml/class95.html
rename to doc/devel/uml/class95.html
diff --git a/doc/devel/html/uml/class96.html b/doc/devel/uml/class96.html
similarity index 100%
rename from doc/devel/html/uml/class96.html
rename to doc/devel/uml/class96.html
diff --git a/doc/devel/html/uml/class97.html b/doc/devel/uml/class97.html
similarity index 100%
rename from doc/devel/html/uml/class97.html
rename to doc/devel/uml/class97.html
diff --git a/doc/devel/html/uml/class98.html b/doc/devel/uml/class98.html
similarity index 100%
rename from doc/devel/html/uml/class98.html
rename to doc/devel/uml/class98.html
diff --git a/doc/devel/html/uml/class99.html b/doc/devel/uml/class99.html
similarity index 100%
rename from doc/devel/html/uml/class99.html
rename to doc/devel/uml/class99.html
diff --git a/doc/devel/html/uml/classdiagrams.html b/doc/devel/uml/classdiagrams.html
similarity index 100%
rename from doc/devel/html/uml/classdiagrams.html
rename to doc/devel/uml/classdiagrams.html
diff --git a/doc/devel/html/uml/classes.html b/doc/devel/uml/classes.html
similarity index 100%
rename from doc/devel/html/uml/classes.html
rename to doc/devel/uml/classes.html
diff --git a/doc/devel/html/uml/classes_list.html b/doc/devel/uml/classes_list.html
similarity index 100%
rename from doc/devel/html/uml/classes_list.html
rename to doc/devel/uml/classes_list.html
diff --git a/doc/devel/html/uml/collaborationdiagrams.html b/doc/devel/uml/collaborationdiagrams.html
similarity index 100%
rename from doc/devel/html/uml/collaborationdiagrams.html
rename to doc/devel/uml/collaborationdiagrams.html
diff --git a/doc/devel/html/uml/componentdiagrams.html b/doc/devel/uml/componentdiagrams.html
similarity index 100%
rename from doc/devel/html/uml/componentdiagrams.html
rename to doc/devel/uml/componentdiagrams.html
diff --git a/doc/devel/html/uml/deploymentdiagrams.html b/doc/devel/uml/deploymentdiagrams.html
similarity index 100%
rename from doc/devel/html/uml/deploymentdiagrams.html
rename to doc/devel/uml/deploymentdiagrams.html
diff --git a/doc/devel/html/uml/fig1.png b/doc/devel/uml/fig1.png
similarity index 100%
rename from doc/devel/html/uml/fig1.png
rename to doc/devel/uml/fig1.png
diff --git a/doc/devel/html/uml/fig1.svg b/doc/devel/uml/fig1.svg
similarity index 100%
rename from doc/devel/html/uml/fig1.svg
rename to doc/devel/uml/fig1.svg
diff --git a/doc/devel/html/uml/fig2.png b/doc/devel/uml/fig2.png
similarity index 100%
rename from doc/devel/html/uml/fig2.png
rename to doc/devel/uml/fig2.png
diff --git a/doc/devel/html/uml/fig3.png b/doc/devel/uml/fig3.png
similarity index 100%
rename from doc/devel/html/uml/fig3.png
rename to doc/devel/uml/fig3.png
diff --git a/doc/devel/html/uml/fig4.png b/doc/devel/uml/fig4.png
similarity index 100%
rename from doc/devel/html/uml/fig4.png
rename to doc/devel/uml/fig4.png
diff --git a/doc/devel/html/uml/fig5.png b/doc/devel/uml/fig5.png
similarity index 100%
rename from doc/devel/html/uml/fig5.png
rename to doc/devel/uml/fig5.png
diff --git a/doc/devel/html/uml/fig6.png b/doc/devel/uml/fig6.png
similarity index 100%
rename from doc/devel/html/uml/fig6.png
rename to doc/devel/uml/fig6.png
diff --git a/doc/devel/html/uml/index-withframe.html b/doc/devel/uml/index-withframe.html
similarity index 100%
rename from doc/devel/html/uml/index-withframe.html
rename to doc/devel/uml/index-withframe.html
diff --git a/doc/devel/html/uml/index.html b/doc/devel/uml/index.html
similarity index 100%
rename from doc/devel/html/uml/index.html
rename to doc/devel/uml/index.html
diff --git a/doc/devel/html/uml/index_65.html b/doc/devel/uml/index_65.html
similarity index 100%
rename from doc/devel/html/uml/index_65.html
rename to doc/devel/uml/index_65.html
diff --git a/doc/devel/html/uml/index_66.html b/doc/devel/uml/index_66.html
similarity index 100%
rename from doc/devel/html/uml/index_66.html
rename to doc/devel/uml/index_66.html
diff --git a/doc/devel/html/uml/index_67.html b/doc/devel/uml/index_67.html
similarity index 100%
rename from doc/devel/html/uml/index_67.html
rename to doc/devel/uml/index_67.html
diff --git a/doc/devel/html/uml/index_68.html b/doc/devel/uml/index_68.html
similarity index 100%
rename from doc/devel/html/uml/index_68.html
rename to doc/devel/uml/index_68.html
diff --git a/doc/devel/html/uml/index_69.html b/doc/devel/uml/index_69.html
similarity index 100%
rename from doc/devel/html/uml/index_69.html
rename to doc/devel/uml/index_69.html
diff --git a/doc/devel/html/uml/index_70.html b/doc/devel/uml/index_70.html
similarity index 100%
rename from doc/devel/html/uml/index_70.html
rename to doc/devel/uml/index_70.html
diff --git a/doc/devel/html/uml/index_71.html b/doc/devel/uml/index_71.html
similarity index 100%
rename from doc/devel/html/uml/index_71.html
rename to doc/devel/uml/index_71.html
diff --git a/doc/devel/html/uml/index_72.html b/doc/devel/uml/index_72.html
similarity index 100%
rename from doc/devel/html/uml/index_72.html
rename to doc/devel/uml/index_72.html
diff --git a/doc/devel/html/uml/index_76.html b/doc/devel/uml/index_76.html
similarity index 100%
rename from doc/devel/html/uml/index_76.html
rename to doc/devel/uml/index_76.html
diff --git a/doc/devel/html/uml/index_77.html b/doc/devel/uml/index_77.html
similarity index 100%
rename from doc/devel/html/uml/index_77.html
rename to doc/devel/uml/index_77.html
diff --git a/doc/devel/html/uml/index_79.html b/doc/devel/uml/index_79.html
similarity index 100%
rename from doc/devel/html/uml/index_79.html
rename to doc/devel/uml/index_79.html
diff --git a/doc/devel/html/uml/index_80.html b/doc/devel/uml/index_80.html
similarity index 100%
rename from doc/devel/html/uml/index_80.html
rename to doc/devel/uml/index_80.html
diff --git a/doc/devel/html/uml/index_82.html b/doc/devel/uml/index_82.html
similarity index 100%
rename from doc/devel/html/uml/index_82.html
rename to doc/devel/uml/index_82.html
diff --git a/doc/devel/html/uml/index_83.html b/doc/devel/uml/index_83.html
similarity index 100%
rename from doc/devel/html/uml/index_83.html
rename to doc/devel/uml/index_83.html
diff --git a/doc/devel/html/uml/index_84.html b/doc/devel/uml/index_84.html
similarity index 100%
rename from doc/devel/html/uml/index_84.html
rename to doc/devel/uml/index_84.html
diff --git a/doc/devel/html/uml/index_86.html b/doc/devel/uml/index_86.html
similarity index 100%
rename from doc/devel/html/uml/index_86.html
rename to doc/devel/uml/index_86.html
diff --git a/doc/devel/html/uml/index_87.html b/doc/devel/uml/index_87.html
similarity index 100%
rename from doc/devel/html/uml/index_87.html
rename to doc/devel/uml/index_87.html
diff --git a/doc/devel/html/uml/navig.html b/doc/devel/uml/navig.html
similarity index 100%
rename from doc/devel/html/uml/navig.html
rename to doc/devel/uml/navig.html
diff --git a/doc/devel/html/uml/packages.html b/doc/devel/uml/packages.html
similarity index 100%
rename from doc/devel/html/uml/packages.html
rename to doc/devel/uml/packages.html
diff --git a/doc/devel/html/uml/public_operations.html b/doc/devel/uml/public_operations.html
similarity index 100%
rename from doc/devel/html/uml/public_operations.html
rename to doc/devel/uml/public_operations.html
diff --git a/doc/devel/html/uml/style.css b/doc/devel/uml/style.css
similarity index 100%
rename from doc/devel/html/uml/style.css
rename to doc/devel/uml/style.css
diff --git a/wiki/uml b/wiki/uml
new file mode 120000
index 000000000..a59e206ca
--- /dev/null
+++ b/wiki/uml
@@ -0,0 +1 @@
+../doc/devel/uml
\ No newline at end of file