Re-writing the clusters into a more sane structure