Drag restructure cont

I think this is now ready to be merged. Mainly because the rebase conflicts are no fun ...
And because I'd like you to continue your work within that new structure.