After another look at the current changes, switch directly to the in-tree
drwxr-xr-x - contrib