cleaned up build scripts, tried using the same folder structure in the sh and the bat file.