Several wiki changes + conventions + code refactor

Fixed #13
It needed a lot of effort, refactoring and love!