restart next generation scorekeeper tools as single src and under maven to make dependecies, etc easier