Yea, that top level change was quite rough. Sorry :-/. There won't be anything that drastic to merge with going forward.