More refactors, adds in gollum wiki