Build Refactoring