Don't override source if folder exists

* Bump SDK version to 6.1
* Minor improvements on logging