dropbox refactor
merging everything with refactor