Merge pull request #67 from felixcheng/solo2

Solo2
Fixed structure to agree with styling
Merge pull request #68 from bvs90/fixes

Fixed structure to agree with styling
Functional refactoring top scorers
Functional refactoring top scorers
Merge pull request #69 from davidmansy/feature

Functional refactoring of top scorers
 Moving files around for modularization