THE GREAT REFACTOR.

Signed-off-by: Atheriel <atheriel@gmail.com>