Major refactoring of doubles and verifier structure