Make build files consistent across all projs
Make build files consistent across all projs