Moved verifiers to relevant package