Rejig ordering of timeout
This dir needs a pkg.go because
Fixing all those build tags :stars: