diff --git a/docs/Jamfile b/doc/Jamfile
similarity index 100%
rename from docs/Jamfile
rename to doc/Jamfile
diff --git a/docs/asciidoc/README b/doc/asciidoc/README
similarity index 100%
rename from docs/asciidoc/README
rename to doc/asciidoc/README
diff --git a/docs/asciidoc/a2x b/doc/asciidoc/a2x
similarity index 100%
rename from docs/asciidoc/a2x
rename to doc/asciidoc/a2x
diff --git a/docs/asciidoc/asciidoc.conf b/doc/asciidoc/asciidoc.conf
similarity index 100%
rename from docs/asciidoc/asciidoc.conf
rename to doc/asciidoc/asciidoc.conf
diff --git a/docs/asciidoc/asciidoc.py b/doc/asciidoc/asciidoc.py
similarity index 100%
rename from docs/asciidoc/asciidoc.py
rename to doc/asciidoc/asciidoc.py
diff --git a/docs/asciidoc/docbook-xsl/asciidoc-docbook-xsl.txt b/doc/asciidoc/docbook-xsl/asciidoc-docbook-xsl.txt
similarity index 100%
rename from docs/asciidoc/docbook-xsl/asciidoc-docbook-xsl.txt
rename to doc/asciidoc/docbook-xsl/asciidoc-docbook-xsl.txt
diff --git a/docs/asciidoc/docbook-xsl/chunked.xsl b/doc/asciidoc/docbook-xsl/chunked.xsl
similarity index 100%
rename from docs/asciidoc/docbook-xsl/chunked.xsl
rename to doc/asciidoc/docbook-xsl/chunked.xsl
diff --git a/docs/asciidoc/docbook-xsl/common.xsl b/doc/asciidoc/docbook-xsl/common.xsl
similarity index 100%
rename from docs/asciidoc/docbook-xsl/common.xsl
rename to doc/asciidoc/docbook-xsl/common.xsl
diff --git a/docs/asciidoc/docbook-xsl/fo.xsl b/doc/asciidoc/docbook-xsl/fo.xsl
similarity index 100%
rename from docs/asciidoc/docbook-xsl/fo.xsl
rename to doc/asciidoc/docbook-xsl/fo.xsl
diff --git a/docs/asciidoc/docbook-xsl/htmlhelp.xsl b/doc/asciidoc/docbook-xsl/htmlhelp.xsl
similarity index 100%
rename from docs/asciidoc/docbook-xsl/htmlhelp.xsl
rename to doc/asciidoc/docbook-xsl/htmlhelp.xsl
diff --git a/docs/asciidoc/docbook-xsl/manpage-sp.patch b/doc/asciidoc/docbook-xsl/manpage-sp.patch
similarity index 100%
rename from docs/asciidoc/docbook-xsl/manpage-sp.patch
rename to doc/asciidoc/docbook-xsl/manpage-sp.patch
diff --git a/docs/asciidoc/docbook-xsl/manpage.xsl b/doc/asciidoc/docbook-xsl/manpage.xsl
similarity index 100%
rename from docs/asciidoc/docbook-xsl/manpage.xsl
rename to doc/asciidoc/docbook-xsl/manpage.xsl
diff --git a/docs/asciidoc/docbook-xsl/shaded-literallayout.patch b/doc/asciidoc/docbook-xsl/shaded-literallayout.patch
similarity index 100%
rename from docs/asciidoc/docbook-xsl/shaded-literallayout.patch
rename to doc/asciidoc/docbook-xsl/shaded-literallayout.patch
diff --git a/docs/asciidoc/docbook-xsl/xhtml.xsl b/doc/asciidoc/docbook-xsl/xhtml.xsl
similarity index 100%
rename from docs/asciidoc/docbook-xsl/xhtml.xsl
rename to doc/asciidoc/docbook-xsl/xhtml.xsl
diff --git a/docs/asciidoc/docbook.conf b/doc/asciidoc/docbook.conf
similarity index 100%
rename from docs/asciidoc/docbook.conf
rename to doc/asciidoc/docbook.conf
diff --git a/docs/asciidoc/filters/code-filter-readme.txt b/doc/asciidoc/filters/code-filter-readme.txt
similarity index 100%
rename from docs/asciidoc/filters/code-filter-readme.txt
rename to doc/asciidoc/filters/code-filter-readme.txt
diff --git a/docs/asciidoc/filters/code-filter-test-c++.txt b/doc/asciidoc/filters/code-filter-test-c++.txt
similarity index 100%
rename from docs/asciidoc/filters/code-filter-test-c++.txt
rename to doc/asciidoc/filters/code-filter-test-c++.txt
diff --git a/docs/asciidoc/filters/code-filter-test.txt b/doc/asciidoc/filters/code-filter-test.txt
similarity index 100%
rename from docs/asciidoc/filters/code-filter-test.txt
rename to doc/asciidoc/filters/code-filter-test.txt
diff --git a/docs/asciidoc/filters/code-filter.conf b/doc/asciidoc/filters/code-filter.conf
similarity index 100%
rename from docs/asciidoc/filters/code-filter.conf
rename to doc/asciidoc/filters/code-filter.conf
diff --git a/docs/asciidoc/filters/code-filter.py b/doc/asciidoc/filters/code-filter.py
similarity index 100%
rename from docs/asciidoc/filters/code-filter.py
rename to doc/asciidoc/filters/code-filter.py
diff --git a/docs/asciidoc/filters/music-filter-test.txt b/doc/asciidoc/filters/music-filter-test.txt
similarity index 100%
rename from docs/asciidoc/filters/music-filter-test.txt
rename to doc/asciidoc/filters/music-filter-test.txt
diff --git a/docs/asciidoc/filters/music-filter.conf b/doc/asciidoc/filters/music-filter.conf
similarity index 100%
rename from docs/asciidoc/filters/music-filter.conf
rename to doc/asciidoc/filters/music-filter.conf
diff --git a/docs/asciidoc/filters/music2png.py b/doc/asciidoc/filters/music2png.py
similarity index 100%
rename from docs/asciidoc/filters/music2png.py
rename to doc/asciidoc/filters/music2png.py
diff --git a/docs/asciidoc/filters/source-highlight-filter-test.txt b/doc/asciidoc/filters/source-highlight-filter-test.txt
similarity index 100%
rename from docs/asciidoc/filters/source-highlight-filter-test.txt
rename to doc/asciidoc/filters/source-highlight-filter-test.txt
diff --git a/docs/asciidoc/filters/source-highlight-filter.conf b/doc/asciidoc/filters/source-highlight-filter.conf
similarity index 100%
rename from docs/asciidoc/filters/source-highlight-filter.conf
rename to doc/asciidoc/filters/source-highlight-filter.conf
diff --git a/docs/asciidoc/help.conf b/doc/asciidoc/help.conf
similarity index 100%
rename from docs/asciidoc/help.conf
rename to doc/asciidoc/help.conf
diff --git a/docs/asciidoc/html4.conf b/doc/asciidoc/html4.conf
similarity index 100%
rename from docs/asciidoc/html4.conf
rename to doc/asciidoc/html4.conf
diff --git a/docs/asciidoc/images/icons/README b/doc/asciidoc/images/icons/README
similarity index 100%
rename from docs/asciidoc/images/icons/README
rename to doc/asciidoc/images/icons/README
diff --git a/docs/asciidoc/images/icons/callouts/1.png b/doc/asciidoc/images/icons/callouts/1.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/1.png
rename to doc/asciidoc/images/icons/callouts/1.png
diff --git a/docs/asciidoc/images/icons/callouts/10.png b/doc/asciidoc/images/icons/callouts/10.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/10.png
rename to doc/asciidoc/images/icons/callouts/10.png
diff --git a/docs/asciidoc/images/icons/callouts/11.png b/doc/asciidoc/images/icons/callouts/11.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/11.png
rename to doc/asciidoc/images/icons/callouts/11.png
diff --git a/docs/asciidoc/images/icons/callouts/12.png b/doc/asciidoc/images/icons/callouts/12.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/12.png
rename to doc/asciidoc/images/icons/callouts/12.png
diff --git a/docs/asciidoc/images/icons/callouts/13.png b/doc/asciidoc/images/icons/callouts/13.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/13.png
rename to doc/asciidoc/images/icons/callouts/13.png
diff --git a/docs/asciidoc/images/icons/callouts/14.png b/doc/asciidoc/images/icons/callouts/14.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/14.png
rename to doc/asciidoc/images/icons/callouts/14.png
diff --git a/docs/asciidoc/images/icons/callouts/15.png b/doc/asciidoc/images/icons/callouts/15.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/15.png
rename to doc/asciidoc/images/icons/callouts/15.png
diff --git a/docs/asciidoc/images/icons/callouts/2.png b/doc/asciidoc/images/icons/callouts/2.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/2.png
rename to doc/asciidoc/images/icons/callouts/2.png
diff --git a/docs/asciidoc/images/icons/callouts/3.png b/doc/asciidoc/images/icons/callouts/3.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/3.png
rename to doc/asciidoc/images/icons/callouts/3.png
diff --git a/docs/asciidoc/images/icons/callouts/4.png b/doc/asciidoc/images/icons/callouts/4.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/4.png
rename to doc/asciidoc/images/icons/callouts/4.png
diff --git a/docs/asciidoc/images/icons/callouts/5.png b/doc/asciidoc/images/icons/callouts/5.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/5.png
rename to doc/asciidoc/images/icons/callouts/5.png
diff --git a/docs/asciidoc/images/icons/callouts/6.png b/doc/asciidoc/images/icons/callouts/6.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/6.png
rename to doc/asciidoc/images/icons/callouts/6.png
diff --git a/docs/asciidoc/images/icons/callouts/7.png b/doc/asciidoc/images/icons/callouts/7.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/7.png
rename to doc/asciidoc/images/icons/callouts/7.png
diff --git a/docs/asciidoc/images/icons/callouts/8.png b/doc/asciidoc/images/icons/callouts/8.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/8.png
rename to doc/asciidoc/images/icons/callouts/8.png
diff --git a/docs/asciidoc/images/icons/callouts/9.png b/doc/asciidoc/images/icons/callouts/9.png
similarity index 100%
rename from docs/asciidoc/images/icons/callouts/9.png
rename to doc/asciidoc/images/icons/callouts/9.png
diff --git a/docs/asciidoc/images/icons/caution.png b/doc/asciidoc/images/icons/caution.png
similarity index 100%
rename from docs/asciidoc/images/icons/caution.png
rename to doc/asciidoc/images/icons/caution.png
diff --git a/docs/asciidoc/images/icons/example.png b/doc/asciidoc/images/icons/example.png
similarity index 100%
rename from docs/asciidoc/images/icons/example.png
rename to doc/asciidoc/images/icons/example.png
diff --git a/docs/asciidoc/images/icons/home.png b/doc/asciidoc/images/icons/home.png
similarity index 100%
rename from docs/asciidoc/images/icons/home.png
rename to doc/asciidoc/images/icons/home.png
diff --git a/docs/asciidoc/images/icons/important.png b/doc/asciidoc/images/icons/important.png
similarity index 100%
rename from docs/asciidoc/images/icons/important.png
rename to doc/asciidoc/images/icons/important.png
diff --git a/docs/asciidoc/images/icons/next.png b/doc/asciidoc/images/icons/next.png
similarity index 100%
rename from docs/asciidoc/images/icons/next.png
rename to doc/asciidoc/images/icons/next.png
diff --git a/docs/asciidoc/images/icons/note.png b/doc/asciidoc/images/icons/note.png
similarity index 100%
rename from docs/asciidoc/images/icons/note.png
rename to doc/asciidoc/images/icons/note.png
diff --git a/docs/asciidoc/images/icons/prev.png b/doc/asciidoc/images/icons/prev.png
similarity index 100%
rename from docs/asciidoc/images/icons/prev.png
rename to doc/asciidoc/images/icons/prev.png
diff --git a/docs/asciidoc/images/icons/tip.png b/doc/asciidoc/images/icons/tip.png
similarity index 100%
rename from docs/asciidoc/images/icons/tip.png
rename to doc/asciidoc/images/icons/tip.png
diff --git a/docs/asciidoc/images/icons/up.png b/doc/asciidoc/images/icons/up.png
similarity index 100%
rename from docs/asciidoc/images/icons/up.png
rename to doc/asciidoc/images/icons/up.png
diff --git a/docs/asciidoc/images/icons/warning.png b/doc/asciidoc/images/icons/warning.png
similarity index 100%
rename from docs/asciidoc/images/icons/warning.png
rename to doc/asciidoc/images/icons/warning.png
diff --git a/docs/asciidoc/javascripts/ASCIIMathML.js b/doc/asciidoc/javascripts/ASCIIMathML.js
similarity index 100%
rename from docs/asciidoc/javascripts/ASCIIMathML.js
rename to doc/asciidoc/javascripts/ASCIIMathML.js
diff --git a/docs/asciidoc/javascripts/toc.js b/doc/asciidoc/javascripts/toc.js
similarity index 100%
rename from docs/asciidoc/javascripts/toc.js
rename to doc/asciidoc/javascripts/toc.js
diff --git a/docs/asciidoc/latex.conf b/doc/asciidoc/latex.conf
similarity index 100%
rename from docs/asciidoc/latex.conf
rename to doc/asciidoc/latex.conf
diff --git a/docs/asciidoc/linuxdoc.conf b/doc/asciidoc/linuxdoc.conf
similarity index 100%
rename from docs/asciidoc/linuxdoc.conf
rename to doc/asciidoc/linuxdoc.conf
diff --git a/docs/asciidoc/stylesheets/docbook-xsl.css b/doc/asciidoc/stylesheets/docbook-xsl.css
similarity index 100%
rename from docs/asciidoc/stylesheets/docbook-xsl.css
rename to doc/asciidoc/stylesheets/docbook-xsl.css
diff --git a/docs/asciidoc/stylesheets/xhtml-deprecated-manpage.css b/doc/asciidoc/stylesheets/xhtml-deprecated-manpage.css
similarity index 100%
rename from docs/asciidoc/stylesheets/xhtml-deprecated-manpage.css
rename to doc/asciidoc/stylesheets/xhtml-deprecated-manpage.css
diff --git a/docs/asciidoc/stylesheets/xhtml-deprecated.css b/doc/asciidoc/stylesheets/xhtml-deprecated.css
similarity index 100%
rename from docs/asciidoc/stylesheets/xhtml-deprecated.css
rename to doc/asciidoc/stylesheets/xhtml-deprecated.css
diff --git a/docs/asciidoc/stylesheets/xhtml11-manpage.css b/doc/asciidoc/stylesheets/xhtml11-manpage.css
similarity index 100%
rename from docs/asciidoc/stylesheets/xhtml11-manpage.css
rename to doc/asciidoc/stylesheets/xhtml11-manpage.css
diff --git a/docs/asciidoc/stylesheets/xhtml11-quirks.css b/doc/asciidoc/stylesheets/xhtml11-quirks.css
similarity index 100%
rename from docs/asciidoc/stylesheets/xhtml11-quirks.css
rename to doc/asciidoc/stylesheets/xhtml11-quirks.css
diff --git a/docs/asciidoc/stylesheets/xhtml11.css b/doc/asciidoc/stylesheets/xhtml11.css
similarity index 100%
rename from docs/asciidoc/stylesheets/xhtml11.css
rename to doc/asciidoc/stylesheets/xhtml11.css
diff --git a/docs/asciidoc/text.conf b/doc/asciidoc/text.conf
similarity index 100%
rename from docs/asciidoc/text.conf
rename to doc/asciidoc/text.conf
diff --git a/docs/asciidoc/xhtml-deprecated-css.conf b/doc/asciidoc/xhtml-deprecated-css.conf
similarity index 100%
rename from docs/asciidoc/xhtml-deprecated-css.conf
rename to doc/asciidoc/xhtml-deprecated-css.conf
diff --git a/docs/asciidoc/xhtml-deprecated.conf b/doc/asciidoc/xhtml-deprecated.conf
similarity index 100%
rename from docs/asciidoc/xhtml-deprecated.conf
rename to doc/asciidoc/xhtml-deprecated.conf
diff --git a/docs/asciidoc/xhtml11-quirks.conf b/doc/asciidoc/xhtml11-quirks.conf
similarity index 100%
rename from docs/asciidoc/xhtml11-quirks.conf
rename to doc/asciidoc/xhtml11-quirks.conf
diff --git a/docs/asciidoc/xhtml11.conf b/doc/asciidoc/xhtml11.conf
similarity index 100%
rename from docs/asciidoc/xhtml11.conf
rename to doc/asciidoc/xhtml11.conf
diff --git a/docs/dbus-usage.txt b/doc/dbus-usage.txt
similarity index 100%
rename from docs/dbus-usage.txt
rename to doc/dbus-usage.txt
diff --git a/docs/index.txt b/doc/index.txt
similarity index 100%
rename from docs/index.txt
rename to doc/index.txt
diff --git a/docs/introduction.txt b/doc/introduction.txt
similarity index 100%
rename from docs/introduction.txt
rename to doc/introduction.txt
diff --git a/docs/jambuild.txt b/doc/jambuild.txt
similarity index 100%
rename from docs/jambuild.txt
rename to doc/jambuild.txt
diff --git a/docs/manual/images/README b/doc/manual/images/README
similarity index 100%
rename from docs/manual/images/README
rename to doc/manual/images/README
diff --git a/docs/manual/images/callouts/1.png b/doc/manual/images/callouts/1.png
similarity index 100%
rename from docs/manual/images/callouts/1.png
rename to doc/manual/images/callouts/1.png
diff --git a/docs/manual/images/callouts/10.png b/doc/manual/images/callouts/10.png
similarity index 100%
rename from docs/manual/images/callouts/10.png
rename to doc/manual/images/callouts/10.png
diff --git a/docs/manual/images/callouts/11.png b/doc/manual/images/callouts/11.png
similarity index 100%
rename from docs/manual/images/callouts/11.png
rename to doc/manual/images/callouts/11.png
diff --git a/docs/manual/images/callouts/12.png b/doc/manual/images/callouts/12.png
similarity index 100%
rename from docs/manual/images/callouts/12.png
rename to doc/manual/images/callouts/12.png
diff --git a/docs/manual/images/callouts/13.png b/doc/manual/images/callouts/13.png
similarity index 100%
rename from docs/manual/images/callouts/13.png
rename to doc/manual/images/callouts/13.png
diff --git a/docs/manual/images/callouts/14.png b/doc/manual/images/callouts/14.png
similarity index 100%
rename from docs/manual/images/callouts/14.png
rename to doc/manual/images/callouts/14.png
diff --git a/docs/manual/images/callouts/15.png b/doc/manual/images/callouts/15.png
similarity index 100%
rename from docs/manual/images/callouts/15.png
rename to doc/manual/images/callouts/15.png
diff --git a/docs/manual/images/callouts/2.png b/doc/manual/images/callouts/2.png
similarity index 100%
rename from docs/manual/images/callouts/2.png
rename to doc/manual/images/callouts/2.png
diff --git a/docs/manual/images/callouts/3.png b/doc/manual/images/callouts/3.png
similarity index 100%
rename from docs/manual/images/callouts/3.png
rename to doc/manual/images/callouts/3.png
diff --git a/docs/manual/images/callouts/4.png b/doc/manual/images/callouts/4.png
similarity index 100%
rename from docs/manual/images/callouts/4.png
rename to doc/manual/images/callouts/4.png
diff --git a/docs/manual/images/callouts/5.png b/doc/manual/images/callouts/5.png
similarity index 100%
rename from docs/manual/images/callouts/5.png
rename to doc/manual/images/callouts/5.png
diff --git a/docs/manual/images/callouts/6.png b/doc/manual/images/callouts/6.png
similarity index 100%
rename from docs/manual/images/callouts/6.png
rename to doc/manual/images/callouts/6.png
diff --git a/docs/manual/images/callouts/7.png b/doc/manual/images/callouts/7.png
similarity index 100%
rename from docs/manual/images/callouts/7.png
rename to doc/manual/images/callouts/7.png
diff --git a/docs/manual/images/callouts/8.png b/doc/manual/images/callouts/8.png
similarity index 100%
rename from docs/manual/images/callouts/8.png
rename to doc/manual/images/callouts/8.png
diff --git a/docs/manual/images/callouts/9.png b/doc/manual/images/callouts/9.png
similarity index 100%
rename from docs/manual/images/callouts/9.png
rename to doc/manual/images/callouts/9.png
diff --git a/docs/manual/images/caution.png b/doc/manual/images/caution.png
similarity index 100%
rename from docs/manual/images/caution.png
rename to doc/manual/images/caution.png
diff --git a/docs/manual/images/example.png b/doc/manual/images/example.png
similarity index 100%
rename from docs/manual/images/example.png
rename to doc/manual/images/example.png
diff --git a/docs/manual/images/home.png b/doc/manual/images/home.png
similarity index 100%
rename from docs/manual/images/home.png
rename to doc/manual/images/home.png
diff --git a/docs/manual/images/important.png b/doc/manual/images/important.png
similarity index 100%
rename from docs/manual/images/important.png
rename to doc/manual/images/important.png
diff --git a/docs/manual/images/next.png b/doc/manual/images/next.png
similarity index 100%
rename from docs/manual/images/next.png
rename to doc/manual/images/next.png
diff --git a/docs/manual/images/note.png b/doc/manual/images/note.png
similarity index 100%
rename from docs/manual/images/note.png
rename to doc/manual/images/note.png
diff --git a/docs/manual/images/prev.png b/doc/manual/images/prev.png
similarity index 100%
rename from docs/manual/images/prev.png
rename to doc/manual/images/prev.png
diff --git a/docs/manual/images/tip.png b/doc/manual/images/tip.png
similarity index 100%
rename from docs/manual/images/tip.png
rename to doc/manual/images/tip.png
diff --git a/docs/manual/images/up.png b/doc/manual/images/up.png
similarity index 100%
rename from docs/manual/images/up.png
rename to doc/manual/images/up.png
diff --git a/docs/manual/images/warning.png b/doc/manual/images/warning.png
similarity index 100%
rename from docs/manual/images/warning.png
rename to doc/manual/images/warning.png
diff --git a/docs/vedran.plan b/doc/vedran.plan
similarity index 100%
rename from docs/vedran.plan
rename to doc/vedran.plan