Clean up and reorganize list of feeds