Re: Unified build directories / adaptation to the new API