Reorganized plugins to match only working ones.