dirvote: Reorganize the dirvote.h file