Moved all the various flavors over to the new setup.