JOHNE - Unify our build paths (and Resource File comments)