Refactored code.

Merge from previous dropbox.factor, code for specific folder now in do-folder-name.