Completely review the code

I have the impression that the code is *pretty* weak because
a) it relies on an outdated version of the infrastructure (i.e. there's much more now that can be simplified
b) I *then* did know even less than now ...