Significant reorganization to follow organization used for VoteATX app.