Moved files and implemented the vote count layout
Fixed merge conflicts