Structure changes to Wiki-Docs
more changes
Merge pull request #386 from akvo/wiki-docs-adrian-1

Confirmed changes.