Build: make withCurrentDirectory pass cwd and use it

so recursive building will use linear dirs