Move score into scoreboard service