diff --git a/src/main/resources/plugins.config b/src/main/resources/plugins.config
index 9a9c1256c..0092286c4 100644
--- a/src/main/resources/plugins.config
+++ b/src/main/resources/plugins.config
@@ -23,35 +23,32 @@
 #
 # Plugins from the spimreconstructions
 #
-Plugins>Multiview Reconstruction, "MultiView Reconstruction Application", net.preibisch.mvrecon.fiji.plugin.Data_Explorer
-Plugins>Multiview Reconstruction>Batch Processing, "Define Multi-View Dataset", net.preibisch.mvrecon.fiji.plugin.Define_Multi_View_Dataset
-Plugins>Multiview Reconstruction>Batch Processing, "Detect Interest Points for Registration", net.preibisch.mvrecon.fiji.plugin.Interest_Point_Detection
-Plugins>Multiview Reconstruction>Batch Processing, "Register Dataset based on Interest Points", net.preibisch.mvrecon.fiji.plugin.Interest_Point_Registration
-Plugins>Multiview Reconstruction>Batch Processing, "Fuse", net.preibisch.mvrecon.fiji.plugin.Image_Fusion
-Plugins>Multiview Reconstruction>Batch Processing, "Quality Estimation", net.preibisch.mvrecon.fiji.plugin.Image_Quality
-Plugins>Multiview Reconstruction>Batch Processing, "Deconvolve", net.preibisch.mvrecon.fiji.plugin.Image_Deconvolution
-Plugins>Multiview Reconstruction>Batch Processing, "Extract PSFs", net.preibisch.mvrecon.fiji.plugin.PSF_Extract
-Plugins>Multiview Reconstruction>Batch Processing>Tools, "Apply Transformations", net.preibisch.mvrecon.fiji.plugin.Apply_Transformation
-Plugins>Multiview Reconstruction>Batch Processing>Tools, "Define Bounding Box", net.preibisch.mvrecon.fiji.plugin.Define_Bounding_Box
-Plugins>Multiview Reconstruction>Batch Processing>Tools, "Duplicate Transformations", net.preibisch.mvrecon.fiji.plugin.Duplicate_Transformation
-Plugins>Multiview Reconstruction>Batch Processing>Tools, "Display View", net.preibisch.mvrecon.fiji.plugin.Display_View
-Plugins>Multiview Reconstruction>Batch Processing>Tools, "Specify Calibration", net.preibisch.mvrecon.fiji.plugin.Specify_Calibration
-Plugins>Multiview Reconstruction>Batch Processing>Tools, "Visualize Detections", net.preibisch.mvrecon.fiji.plugin.Visualize_Detections
-Plugins>Multiview Reconstruction>Batch Processing>Tools, "Create Detections from Correspondences", net.preibisch.mvrecon.fiji.plugin.CreateFromCorresponding_Detections
-Plugins>Multiview Reconstruction>Batch Processing>Tools, "Show Detection Distance Histogram", net.preibisch.mvrecon.fiji.plugin.Show_Histogram
-Plugins>Multiview Reconstruction>Batch Processing>Tools, "Show Relative Detection Distance Histogram", net.preibisch.mvrecon.fiji.plugin.Show_Relative_Histogram
-Plugins>Multiview Reconstruction>Batch Processing>Tools, "Remove Detections by Distance", net.preibisch.mvrecon.fiji.plugin.ThinOut_Detections
-Plugins>Multiview Reconstruction>Batch Processing>Tools, "Remove Detections by relative Distance", net.preibisch.mvrecon.fiji.plugin.RelativeThinOut_Detections
-Plugins>Multiview Reconstruction>Batch Processing>Tools, "Visualize smFISH detections (hack)", net.preibisch.mvrecon.headless.interestpointdetection.VisualizeSmFISH
-Plugins>Multiview Reconstruction>Batch Processing>Tools>PSF, "View PSFs", net.preibisch.mvrecon.fiji.plugin.PSF_View
-Plugins>Multiview Reconstruction>Batch Processing>Tools>PSF, "Average PSFs", net.preibisch.mvrecon.fiji.plugin.PSF_Average
-Plugins>Multiview Reconstruction>Batch Processing>Tools>PSF, "Assign PSFs", net.preibisch.mvrecon.fiji.plugin.PSF_Assign
-Plugins>Multiview Reconstruction>Batch Processing>Tools>Intensity, "Adjust Intensities", net.preibisch.mvrecon.fiji.plugin.Intensity_Adjustment
-Plugins>Multiview Reconstruction>Batch Processing>Tools>Intensity, "Remove Intensitiy Adjustments", net.preibisch.mvrecon.fiji.plugin.RemoveIntensity_Adjustment
-Plugins>Multiview Reconstruction>Batch Processing>Resave, "As HDF5", net.preibisch.mvrecon.fiji.plugin.resave.Resave_HDF5
-Plugins>Multiview Reconstruction>Batch Processing>Resave, "As N5", net.preibisch.mvrecon.fiji.plugin.resave.Resave_N5
-Plugins>Multiview Reconstruction>Batch Processing>Resave, "As TIFF", net.preibisch.mvrecon.fiji.plugin.resave.Resave_TIFF
-Plugins>Multiview Reconstruction>Batch Processing>Tools>Cluster, "Toggle Cluster Processing", net.preibisch.mvrecon.fiji.plugin.Toggle_Cluster_Options
-Plugins>Multiview Reconstruction>Batch Processing>Tools>Cluster, "Merge Cluster Jobs", net.preibisch.mvrecon.fiji.plugin.Merge_Cluster_Jobs
-Plugins>BigStitcher>Tools, "Resave Luxendo XML for BigStitcher", net.preibisch.mvrecon.headless.definedataset.Rewrite_LuxendoXML
+Plugins>BigStitcher>General, "Define Multi-View Dataset", net.preibisch.mvrecon.fiji.plugin.Define_Multi_View_Dataset
+Plugins>BigStitcher>General, "Image Fusion", net.preibisch.mvrecon.fiji.plugin.Image_Fusion
+Plugins>BigStitcher>General, "Quality Estimation", net.preibisch.mvrecon.fiji.plugin.Image_Quality
+Plugins>BigStitcher>General, "Deconvolution", net.preibisch.mvrecon.fiji.plugin.Image_Deconvolution
+Plugins>BigStitcher>General>Tools, "Apply Transformations", net.preibisch.mvrecon.fiji.plugin.Apply_Transformation
+Plugins>BigStitcher>General>Tools, "Define Bounding Box", net.preibisch.mvrecon.fiji.plugin.Define_Bounding_Box
+Plugins>BigStitcher>General>Tools, "Duplicate Transformations", net.preibisch.mvrecon.fiji.plugin.Duplicate_Transformation
+Plugins>BigStitcher>General>Tools, "Display View", net.preibisch.mvrecon.fiji.plugin.Display_View
+Plugins>BigStitcher>General>Tools, "Specify Calibration", net.preibisch.mvrecon.fiji.plugin.Specify_Calibration
+Plugins>BigStitcher>General>Tools>PSF, "View PSFs", net.preibisch.mvrecon.fiji.plugin.PSF_View
+Plugins>BigStitcher>General>Tools>PSF, "Average PSFs", net.preibisch.mvrecon.fiji.plugin.PSF_Average
+Plugins>BigStitcher>General>Tools>PSF, "Assign PSFs", net.preibisch.mvrecon.fiji.plugin.PSF_Assign
+Plugins>BigStitcher>General>Tools>Intensity, "Adjust Intensities", net.preibisch.mvrecon.fiji.plugin.Intensity_Adjustment
+Plugins>BigStitcher>General>Tools>Intensity, "Remove Intensitiy Adjustments", net.preibisch.mvrecon.fiji.plugin.RemoveIntensity_Adjustment
+Plugins>BigStitcher>Interest Points, "Detect Interest Points for Registration", net.preibisch.mvrecon.fiji.plugin.Interest_Point_Detection
+Plugins>BigStitcher>Interest Points, "Register Dataset based on Interest Points", net.preibisch.mvrecon.fiji.plugin.Interest_Point_Registration
+Plugins>BigStitcher>Interest Points, "Extract PSFs", net.preibisch.mvrecon.fiji.plugin.PSF_Extract
+Plugins>BigStitcher>Interest Points>Tools, "Visualize Detections", net.preibisch.mvrecon.fiji.plugin.Visualize_Detections
+Plugins>BigStitcher>Interest Points>Tools, "Create Detections from Correspondences", net.preibisch.mvrecon.fiji.plugin.CreateFromCorresponding_Detections
+Plugins>BigStitcher>Interest Points>Tools, "Show Detection Distance Histogram", net.preibisch.mvrecon.fiji.plugin.Show_Histogram
+Plugins>BigStitcher>Interest Points>Tools, "Show Relative Detection Distance Histogram", net.preibisch.mvrecon.fiji.plugin.Show_Relative_Histogram
+Plugins>BigStitcher>Interest Points>Tools, "Remove Detections by Distance", net.preibisch.mvrecon.fiji.plugin.ThinOut_Detections
+Plugins>BigStitcher>Interest Points>Tools, "Remove Detections by relative Distance", net.preibisch.mvrecon.fiji.plugin.RelativeThinOut_Detections
+Plugins>BigStitcher>I/O, "Resave as HDF5 (local)", net.preibisch.mvrecon.fiji.plugin.resave.Resave_HDF5
+Plugins>BigStitcher>I/O, "Resave as N5 (local, cloud)", net.preibisch.mvrecon.fiji.plugin.resave.Resave_N5
+Plugins>BigStitcher>I/O, "Resave As TIFF (local)", net.preibisch.mvrecon.fiji.plugin.resave.Resave_TIFF
+Plugins>BigStitcher>I/O, "Save as ...", net.preibisch.mvrecon.fiji.plugin.XMLSaveAs
+Plugins>BigStitcher>I/O, "Resave Luxendo XML for BigStitcher", net.preibisch.mvrecon.headless.definedataset.Rewrite_LuxendoXML