Reorganize dedupe class