Reorganize plugins so vim-polyglot doesn't override everything.