final refactoring, separated wiki stuff.