Revert "tools tarballs now live in a directory named after their stream"

Reverts juju/juju#968

reverting per request of QA: https://bugs.launchpad.net/juju-core/+bug/1386766