Merged build scripts and cleaned up