Changed handling of build dir. We cannot remove the build dir itself, instead we remove directories that were created during the build process itself
Tweaks to build directory