Restructure to add multiple centroidlists