Simplify TDS structure a bit

This reflects using l3build for release, but really there is little
need for an additional dir here anyway.