Decomposed files into modules; added test code for Elections