Reorganized some mixins so they match the order of the wiki