Changed build dir names, minor tweaks