Refactored the build scripts a bit.