Refactored build project