progress on Google Drive, Dropbox refactoring