Drop Handler refactoring and Fixups.

Core:\n- Refactoring to the DropHandler.\n- CompanionThread improved.