Started to refactor dropbox