Move ScorecardModel to water/score

Fix merge conflicts