Changed name of dropbox controller; Removed files accidentally merged