First steps on "AfterControllerHook"

+ some small refactoring here and there