Refactor voting to the voting package