Refactored and cleaned up build scripts.