Adding better build scripts