diff --git a/Documentation/Doxygen/2-UserManual/MITKPluginManualsList.dox b/Documentation/Doxygen/2-UserManual/MITKPluginManualsList.dox
index c4d4470da7..86e8fa6f2c 100644
--- a/Documentation/Doxygen/2-UserManual/MITKPluginManualsList.dox
+++ b/Documentation/Doxygen/2-UserManual/MITKPluginManualsList.dox
@@ -1,84 +1,84 @@
 /**
 \page PluginListPage MITK Plugin Manuals
 
 The plugins and bundles provide much of the extended functionality of MITK. Each encapsulates a solution to a problem and associated features. This way one can easily assemble the necessary capabilites for a workflow without adding a lot of bloat, by combining plugins as needed.
 
 
 \subpage PluginListGeneralPage
 
 <ul>
   <li> \ref  org_mitk_views_basicimageprocessing </li>
   <li> \ref  org_mitk_views_datamanager </li>
   <li> \ref  org_mitk_editors_dicombrowser </li>
   <li> \ref  org_mitk_gui_qt_dicominspector </li>
   <li> \ref  org_mitk_gui_qt_flowapplication </li>
   <li> \ref  org_mitk_views_imagecropper </li>
   <li> \ref  org_mitk_views_imagenavigator </li>
   <li> \ref  org_blueberry_views_logview </li>
   <li> \ref  org_mitk_views_matchpoint_algorithm_browser</li>
   <li> \ref  org_mitk_views_matchpoint_algorithm_control</li>
   <li> \ref  org_mitk_views_matchpoint_evaluator</li>
   <li> \ref  org_mitk_views_matchpoint_framereg</li>
   <li> \ref  org_mitk_views_matchpoint_manipulator</li>
   <li> \ref  org_mitk_views_matchpoint_mapper</li>
   <li> \ref  org_mitk_views_matchpoint_visualizer</li>
   <li> \ref  org_mitk_gui_qt_measurementtoolbox </li>
   <li> \ref  org_mitk_views_moviemaker </li>
   <li> \ref  org_mitk_views_multilabelsegmentation </li>
   <li> \ref  org_mitk_views_pointsetinteraction </li>
   <li> \ref  org_mitk_gui_qt_python </li>
   <li> \ref  org_mitk_gui_qt_remeshing </li>
   <li> \ref  org_mitk_views_screenshotmaker </li>
   <li> \ref  org_mitk_views_segmentation </li>
   <li> \ref  org_mitk_gui_qt_flow_segmentation </li>
   <li> \ref  org_mitk_gui_qt_viewnavigator </li>
   <li> \ref  org_mitk_views_volumevisualization</li>
   <li> \ref  org_mitk_views_properties </li>
 
 </ul>
 
 \subpage PluginListSpecificPage
 
 <ul>
   <li> \ref  org_mitk_gui_qt_aicpregistration </li>
   <li> \ref  org_mitk_gui_qt_cest </li>
   <li> \ref  org_mitk_gui_qt_classificationsegmentation </li>
   <li> \ref  org_mitk_views_cmdlinemodules </li>
   <li> \ref  org_mitk_views_pharmacokinetics_concentration_mri</li>
   <li> \ref  org_mitk_views_pharmacokinetics_mri</li>
   <li> \ref  org_mitk_gui_qt_pharmacokinetics_pet</li>
   <li> \ref  org_mitk_gui_qt_eventrecorder </li>
   <li> \ref  org_mitk_gui_qt_examples </li>
   <li> \ref  org_mitk_gui_qt_geometrytools </li>
   <li> \ref  org_mitk_gui_qt_igtexample </li>
   <li> \ref  org_mitk_gui_qt_igtlplugin</li>
   <li> \ref  org_mitk_gui_qt_igttracking</li>
   <li> \ref  org_mitk_gui_qt_igttrackingsemiautomaticmeasurement</li>
   <li> \ref  org_mitk_views_imagestatistics</li>
   <li> \ref  org_mitk_gui_qt_lasercontrol</li>
   <li> \ref  org_mitk_views_fit_demo </li>
   <li> \ref  org_mitk_gui_qt_fit_genericfitting </li>
   <li> \ref  org_mitk_views_fit_inspector </li>
   <li> \ref  org_mitkexamplesopencv</li>
   <li> \ref  org_mitk_gui_qt_overlaymanager</li>
   <li> \ref  org_mitk_gui_qt_mitkphenotyping</li>
   <li> \ref  org_mitk_gui_qt_photoacoustics_pausmotioncompensation</li>
   <li> \ref  org_mitk_example_gui_pcaexample</li>
   <li>  \ref org_mitk_gui_qt_preprocessing_resampling</li>
   <li> \ref  org_mitk_views_pharmacokinetics_curvedescriptor</li>
-  <li> \ref  org_mitk_gui_qt_photoacoustics_imageprocessing</li>
+  <li> \ref  org_mitk_views_photoacoustics_imageprocessing</li>
   <li> \ref  org_mitk_gui_qt_pharmacokinetics_simulation</li>
   <li> \ref  org_mitk_gui_qt_pointsetinteractionmultispectrum</li>
   <li> \ref  org_mitk_gui_qt_renderwindowmanager</li>
   <li> \ref  org_mitk_gui_qt_photoacoustics_spectralunmixing</li>
   <li> \ref  org_mitk_gui_qt_spectrocamrecorder</li>
   <li> \ref  org_surfacematerialeditor</li>
   <li> \ref  org_toftutorial</li>
   <li> \ref  org_blueberry_ui_qt_objectinspector</li>
   <li> \ref  org_mitk_gui_qt_ultrasound</li>
   <li> \ref  org_mitk_gui_qt_igt_app_echotrack </li>
   <li> \ref  org_mitk_gui_qt_xnat</li>
 </ul>
 
 
 */
diff --git a/Documentation/Doxygen/2-UserManual/MITKPluginSpecificManualsList.dox b/Documentation/Doxygen/2-UserManual/MITKPluginSpecificManualsList.dox
index c470916167..efa68b94a4 100644
--- a/Documentation/Doxygen/2-UserManual/MITKPluginSpecificManualsList.dox
+++ b/Documentation/Doxygen/2-UserManual/MITKPluginSpecificManualsList.dox
@@ -1,45 +1,45 @@
 /**
 \page PluginListSpecificPage List of Application-specific Plugins
 
   \li \subpage org_mitk_gui_qt_aicpregistration
   \li \subpage org_mitk_gui_qt_cest
   \li \subpage org_mitk_gui_qt_classificationsegmentation
   \li \subpage org_mitk_gui_qt_flowapplication
   \li \subpage org_mitk_views_cmdlinemodules
   \li \subpage org_mitk_views_pharmacokinetics_concentration_mri
   \li \subpage org_mitk_views_pharmacokinetics_mri
   \li \subpage org_mitk_gui_qt_pharmacokinetics_pet
   \li \subpage org_mitk_gui_qt_eventrecorder
   \li \subpage org_mitk_gui_qt_examples
   \li \subpage org_mitk_gui_qt_geometrytools
   \li \subpage org_mitk_gui_qt_igtexample
   \li \subpage org_mitk_gui_qt_igtlplugin
   \li \subpage org_mitk_gui_qt_igttracking
   \li \subpage org_mitk_gui_qt_igttrackingsemiautomaticmeasurement
   \li \subpage org_mitk_views_imagestatistics
   \li \subpage org_mitk_gui_qt_lasercontrol
   \li \subpage org_mitk_views_fit_demo
   \li \subpage org_mitk_gui_qt_fit_genericfitting
   \li \subpage org_mitk_views_fit_inspector
   \li \subpage org_mitkexamplesopencv
   \li \subpage org_mitk_gui_qt_overlaymanager
   \li \subpage org_mitk_gui_qt_mitkphenotyping
   \li \subpage org_mitk_gui_qt_photoacoustics_pausmotioncompensation
   \li \subpage org_mitk_example_gui_pcaexample
   \li \subpage org_mitk_gui_qt_preprocessing_resampling
   \li \subpage org_mitk_views_pharmacokinetics_curvedescriptor
-  \li \subpage org_mitk_gui_qt_photoacoustics_imageprocessing
+  \li \subpage org_mitk_views_photoacoustics_imageprocessing
   \li \subpage org_mitk_gui_qt_pharmacokinetics_simulation
   \li \subpage org_mitk_gui_qt_pointsetinteractionmultispectrum
   \li \subpage org_mitk_gui_qt_renderwindowmanager
   \li \subpage org_mitk_gui_qt_photoacoustics_spectralunmixing
   \li \subpage org_mitk_gui_qt_spectrocamrecorder
   \li \subpage org_surfacematerialeditor
   \li \subpage org_blueberry_ui_qt_objectinspector
   \li \subpage org_toftutorial
   \li \subpage org_mitk_gui_qt_ultrasound
   \li \subpage org_mitk_gui_qt_igt_app_echotrack
   \li \subpage org_mitk_gui_qt_xnat
 
 
 */
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.photoacoustics.imageprocessing/documentation/UserManual/Manual.dox b/Plugins/org.mitk.gui.qt.photoacoustics.imageprocessing/documentation/UserManual/Manual.dox
index e13c48d0b5..ee77922748 100644
--- a/Plugins/org.mitk.gui.qt.photoacoustics.imageprocessing/documentation/UserManual/Manual.dox
+++ b/Plugins/org.mitk.gui.qt.photoacoustics.imageprocessing/documentation/UserManual/Manual.dox
@@ -1,66 +1,66 @@
 /**
-\page org_mitk_gui_qt_photoacoustics_imageprocessing The Photoacoustics Imageprocessing Plugin
+\page org_mitk_views_photoacoustics_imageprocessing The Photoacoustics Imageprocessing Plugin
 
 \imageMacro{pai.png,"Icon of Imageprocessing",2.00}
 
 \tableofcontents
 
 \section org_mitk_gui_qt_photoacoustics_imageprocessingOverview Overview
 This plugin offers an interface to perform image processing on photoacoustic, as well as ultrasound images, i.e. to use beamforming and post-processing filters. 
 For convenience, image processing can be done automatically for a whole batch of files containing PA or US data.
 
 \section org_mitk_gui_qt_photoacoustics_imageprocessingPrerequisites  Prerequisites
 To use the much more performant openCL filters which run on the graphics card, MITK has to be able to use openCL, for which it is necessary to install the openCL implementation provided by your graphics card vendor.
 
 \section org_mitk_gui_qt_photoacoustics_imageprocessingFiltering Using the filters
 To perform image processing, simply load an image into MITK and select it in the Data manager. Only the selected image will be processed by the filters.
 \imageMacro{QmikPhotoacousticsImageProcessing_DataManager.png,"Select the image to be processed",7.62}
 Before performing reconstruction or using other filters those can be configured using the plugin's settings panel.
 \imageMacro{QmikPhotoacousticsImageProcessing_Settings.png,"The plugin's GUI",7.62}
 
 \subsection org_mitk_gui_qt_photoacoustics_imageprocessingImageDetails Image Details
 To create the .nrrd images necessary for the plugin from raw data, one can use e.g. <a href="https://github.com/mhe/pynrrd">pynrrd</a>, a python package for very straightforward creation of .nrrd images.
 The Beamforming Filter is also able to read certain paramters, as the scan depth and the transducer pitch from the selected image. To this end, the image must have a time-axis spacing in µs and a horizontal spacing in mm.
 
 \subsection org_mitk_gui_qt_photoacoustics_imageprocessingBeamforming The Beamforming Settings
 For beamforming, three beamforming algorithms are available:
 <ul>
 <li>DAS (Delay And Sum)
 <li>DMAS (Delay Multiply And Sum)
 <li>sDMAS (signed Delay Multiply And Sum)
 </ul>
 Each of those can be coupled with either spherical delay calculation or a quadratic approximation for the delays. To supress noise, one of the following apodizations can be chosen to be used when beamforming:
 <ul>
 <li>Box (No apodization)
 <li>Hamming
 <li>Von Hann
 </ul>
 Other Standard beamforming parameters are available, which have to be chosen depending on the source image to attain a correctly reconstructed image.
 As mentioned above, Plugin is able to calculate the used scan depth as well as the transducer pitch from the selected image if the time-axis spacing is in microseconds, and the horizontal spacing in mm. If such a spacing is given, 
 check the box "Auto Get Depth" to make the plugin read those values by itself.
 If the US source or the laser used for imaging is not located at the top of the image, an option is given to cut off pixels at the top of the image until the source. This value should be calibrated by the user 
 to match the used hardware.
 If one wishes to beamform only certain slices of a given image, those can be selected by checking "select slices" and setting the "min" and "max" values accordingly, which are to be understood as closed interval boundaries.
 
 \subsection org_mitk_gui_qt_photoacoustics_imageprocessingBandpass The Bandpass Settings
 The bandpass uses an itk implementation of an 1D Fast Fourier Transform (FFT) to transform the image vertically, then filters the image using a Tukey window in the frequency domain and performs an inverse 1D FFT to get the filtered image.
 The "smoothness" of the tukey window can be chosen by using the "Tukey window alpha" parameter. The Tukey window interpolates between a Box window (alpha = 0) and a Von Hann window (alpha = 1).
 The filtered frequencies can be set by defining the High and Low pass frequencies.
 
 \subsection org_mitk_gui_qt_photoacoustics_imageprocessingCrop The Crop Filter Settings
 The crop filter cuts off parts of the image at the top and the bottom. The amount of pixels cut off can be configured using the "Cut Top" and "Cut Bottom" parameters.
 
 \subsection org_mitk_gui_qt_photoacoustics_imageprocessingBMode The BMode Filter Settings
 The B-mode filters available are:
 <ul>
 <li>An absolute filter
 <li>An envelope detection filter
 </ul>
 If desired, the filter can also resample the image to a given spacing; to do this, check the "Do Resampling" box and set the desired spacing in mm.
 Afterwards a logarithmic filter can be applied, if "Add Logfilter" is checked.
 
 \subsection org_mitk_gui_qt_photoacoustics_imageprocessingBatch Batch Processing
 When processing large amounts of data, an option is available to automatically process multiple images by applying all filters in order to those images and saving the resulting images. 
 In the first row of the Batch Processing Panel one can select which filters should be applied to the image; in the second row one can select whether the resulting image from the filter should be saved.
 After pressing the "Start Batch Processing" button, one can choose first the images to be processed, and then the folder where they will be saved.
 */