How about splitting the version-specific code into separate modules? similar to what we have already in soapbox.soap/.soap11/.soap12? That way we should be able to get rid of the '11'/'12' suffix (which I find a bit ugly).