Adapt to new directory layout of build/