integrated scorekeeper and android, need to restructure repo