Refactoring to wiki.

Here for the record, not to be pulled.