Tweaking to remove build folders