Refactored build paths