Move election system into own module