Refactor/management

in my tests, this is almost working for the cli. It still needs to catch the ping-restart from the management logs.

I'm still working on rebasing the e2e/functional tests on top of this.

Please start review, there's a lot of moving ground in here :)

Also, please give feedback about the simplification of the modules/classes, and if you see there's something else that can be done to add more sanity to the levels of indirection.