Reorganized plugins and configurations