Reorganized some of the file names. Do we really need short_fast here?