Move DropResult and DropResultPair to a new class