Reorganized mwtemps into something sane