Thanks, that make it much easier to review it.

It would be great to have a diff that showed different the code that was moved around. Makes the diff huge and nothing really changed.