Refactoring DropController / Drop #164