JOHNE - Unify our build paths