Third phase of code refactoring: move callbacks where they belong
& drastically reduce namespace pollution.

There's no new functionality for now: PLEASE TEST THAT EVERYTHING
WORKS AS IT USED TO BEFORE.