More cleanup in DisjointSets.
Move clustering code in the gamelogic.