More work on getting builds to be output in the right directory