moving some things around to seperate lib base and the styles for the scorecard
fixing conflicts
Merge pull request #2 from marchdoe/cleaning-up

Cleaning up