Adding wiki and refactoring