Dropzone refactoring