Change directory name and add cleanup to build script