refactor wiki setup
more wiki refactoring