Consolidate build scripts and remove HDI specific files