Reorganized makefiles and commented out progenitor_media.