Beautify integration

Mostly beautification, but also found a couple of bugs. The TransformationClient is worrysome (untouched here) as there is one method in there that probably does not do what it should...
Certain bugs cannot be fixed by me (i.e. StorageFactory), added FIXME.
Sorry for the long list of files touched. Maybe I should have done them per package...