Refactoring

caution

Note, this article is not finished! You can help by editing this doc page.