diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/DataImport/QmitkDiffusionImagingDataImportPage.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/DataImport/QmitkDiffusionImagingDataImportPage.dox
new file mode 100644
index 0000000000..26cb3a4fa3
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/DataImport/QmitkDiffusionImagingDataImportPage.dox
@@ -0,0 +1,24 @@
+/**
+\page QmitkDiffusionImagingDataImportPage Importing Data
+
+\section QmitkDiffusionImagingUserManualDicomImport Dicom Import
+
+The dicom import does not cover all hardware manufacturers but only Siemens dicom images. MITK-DI is also capable of reading the nrrd format, which is documented elsewhere [1, 2]. These files can be created by combining the raw image data with a corresponding textual header file. The file extension should be changed from *.nrrd to *.dwi or from *.nhdr to *.hdwi respectively in order to let MITK-DI recognize the diffusion related header information provided in the files.
+
+In case your dicom images are readable by MITK-DI, select one or more input dicom folders and click import. Each input folder must only contain DICOM-images that can be combined into one vector-valued 3D output volume. Different patients must be loaded from different input-folders. The folders must not contain other acquisitions (e.g. T1,T2,localizer).
+
+In case many imports are performed at once, it is recommended to set the the optional output folder argument. This prevents the images from being kept in memory.
+
+\imageMacro{dicom1.png,"Dicom import",9.59}
+
+The option "Average duplicate gradients" accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a "blur radius" > 0 is configured.
+
+\section QmitkDiffusionImagingUserManualFslImport FSL Import
+
+FSL diffusion data can be imported with MITK Diffusion. FSL diffusion datasets consist of 3 files: a nifty file (filename.nii.gz or filename.nii), a bvecs file (filename.bvecs), which is a text file containing the gradient vectors, and a bvals file (filename.bvecs), containing the b-values. Due to the system that selects suitable file readers, MITK will not recognize these files as diffusion datasets. In order to make MITK recognize it as diffusion, the extension must be changed from .nii.gz to .fslgz (so the new name is filename.fslgz) or from filename.nii to filename.fsl. The bvecs and bvals files have to be renamed as well(to filename.fsl.bvecs/filenames.fsl.bvecs or to filename.fslgz.bvecs/filename.fslgz.bvals).
+
+MITK can also save diffusion weighted images in FSL format. To do this the extension of the new file should be changed to .fsl or .fslgz upon saving the file.
+
+\imageMacro{fslsave.png,"Save a dwi dataset as fsl",16.00}
+
+*/
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/dicom1.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/DataImport/dicom1.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/dicom1.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/DataImport/dicom1.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fslsave.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/DataImport/fslsave.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fslsave.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/DataImport/fslsave.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Fiberfox-Fiducial.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/Fiberfox-Fiducial.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Fiberfox-Fiducial.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/Fiberfox-Fiducial.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Fiberfox.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/Fiberfox.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Fiberfox.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/Fiberfox.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberfoxExamples.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/FiberfoxExamples.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberfoxExamples.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/FiberfoxExamples.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberExtractionViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkFiberExtractionViewUserManual.dox
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberExtractionViewUserManual.dox
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkFiberExtractionViewUserManual.dox
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberProcessingViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkFiberProcessingViewUserManual.dox
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberProcessingViewUserManual.dox
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkFiberProcessingViewUserManual.dox
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberfoxViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkFiberfoxViewUserManual.dox
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberfoxViewUserManual.dox
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkFiberfoxViewUserManual.dox
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFieldmapGeneratorViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkFieldmapGeneratorViewUserManual.dox
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFieldmapGeneratorViewUserManual.dox
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkFieldmapGeneratorViewUserManual.dox
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkGibbsTrackingViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkGibbsTrackingViewUserManual.dox
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkGibbsTrackingViewUserManual.dox
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkGibbsTrackingViewUserManual.dox
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkStochasticTrackingViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkStochasticTrackingViewUserManual.dox
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkStochasticTrackingViewUserManual.dox
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkStochasticTrackingViewUserManual.dox
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkStreamlineTrackingViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkStreamlineTrackingViewUserManual.dox
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkStreamlineTrackingViewUserManual.dox
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/QmitkStreamlineTrackingViewUserManual.dox
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fieldmapGenerator.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/fieldmapGenerator.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fieldmapGenerator.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/fieldmapGenerator.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/gibbstrackingview.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/gibbstrackingview.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/gibbstrackingview.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/gibbstrackingview.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/gibbstrackingviewadvanced.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/gibbstrackingviewadvanced.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/gibbstrackingviewadvanced.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/gibbstrackingviewadvanced.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/stochastictrackingview.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/stochastictrackingview.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/stochastictrackingview.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/stochastictrackingview.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/streamlinetrackingview.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/streamlinetrackingview.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/streamlinetrackingview.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/FiberTracking/streamlinetrackingview.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/GaussianFilter.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/GaussianFilter.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/GaussianFilter.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/GaussianFilter.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/NLM.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/NLM.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/NLM.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/NLM.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDenoisingViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDenoisingViewUserManual.dox
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDenoisingViewUserManual.dox
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDenoisingViewUserManual.dox
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingPreprocessingPage.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingPreprocessingPage.dox
new file mode 100644
index 0000000000..d22b91e24f
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingPreprocessingPage.dox
@@ -0,0 +1,10 @@
+/**
+\page QmitkDiffusionImagingUserManualPreprocessingPage Preprocessing of Diffusion Images
+
+
+
+\section QmitkDiffusionImagingUserManualPreprocessing Preprocessing
+
+The preprocessing view gives an overview over the important features of a diffusion weighted image like the number of gradient directions, b-value and the measurement frame. Additionally it allows the extraction of the B0 image, reduction of gradient directions and the generation of a binary brain mask. The image volume can be modified by applying a new mesurement frame, which is useful if the measurement frame is not set correctly in the image header, or by averaging redundant gradient directions.
+
+\imageMacro{prepro1.png,"Preprocessing",9.97}
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingReconstruction.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingReconstruction.dox
new file mode 100644
index 0000000000..11005d5672
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingReconstruction.dox
@@ -0,0 +1,39 @@
+/**
+\page QmitkDiffusionImagingReconstructionPage Reconstruction
+
+\section QmitkDiffusionImagingUserManualTensorReconstruction Tensor Reconstruction
+
+The tensor reconstruction view allows ITK based tensor reconstruction [3]. The advanced settings for ITK reconstruction let you configure a manual threshold on the non-diffusion weighted image. All voxels below this threshold will not be reconstructed and left blank. It is also possible to check for negative eigenvalues. The according voxels are also left blank.
+
+\imageMacro{tensor1.png,"ITK tensor reconstruction", 9.97}
+
+A few seconds (depending on the image size) after the reconstruction button is hit, a colored image should appear in the main window.
+
+\imageMacro{tensor4.png,"Tensor image after reconstruction",16.00}
+
+To assess the quality of the tensor fit it has been proposed to calculate the model residual [9]. This calculates the residual between the measured signal and the signal predicted by the model. Large residuals indicate an inadequacy of the model or the presence of artefacts in the signal intensity (noise, head motion, etc.). To use this option: Select a DWI dataset, estimate a tensor, select both the DWI node and the tensor node in the datamanager and press Residual Image Calculation. MITK-Diffusion can show the residual for every voxel averaged over all volumes or (in the plot widget) summarized per volume or for every slice in every volume. Clicking in the widget where the residual is shown per slice will automatically let the cross-hair jump to that position in the DWI dataset. If Percentage of outliers is checked, the per volume plot will show the percentage of outliers per volume. Otherwise it will show the mean together with the first and third quantile of residuals. See [9] for more information.
+
+\imageMacro{residuals.png,"The residual widget",16.00}
+
+The view also allows the generation of artificial diffusion weighted or Q-Ball images from the selected tensor image. The ODFs of the Q-Ball image are directly initialized from the tensor values and afterwards normalized. The diffusion weighted image is estimated using the l2-norm image of the tensor image as B0. The gradient images are afterwards generated using the standard tensor equation.
+
+\section QmitkDiffusionImagingUserManualQBallReconstruction Q-Ball Reconstruction
+
+The q-ball reonstruction view implements a variety of reconstruction methods. The different reconstruction methods are described in the following:
+\li Numerical: The original, numerical q-ball reconstruction presented by Tuch et al. [5]
+\li Standard (SH): Descoteaux's reconstruction based on spherical harmonic basis functions [6]
+\li Solid Angle (SH): Aganj's reconstruction with solid angle consideration [7]
+\li ADC-profile only: The ADC-profile reconstructed with spherical harmonic basis functions
+\li Raw signal only: The raw signal reconstructed with spherical harmonic basis functions
+
+\imageMacro{qballs1.png,"The q-ball resonstruction view",9.99}
+
+B0 threshold works the same as in tensor reconstruction. The maximum l-level configures the size of the spherical harmonics basis. Larger l-values (e.g. l=8) allow higher levels of detail, lower levels are more stable against noise (e.g. l=4). Lambda is a regularisation parameter. Set it to 0 for no regularisation. lambda = 0.006 has proven to be a stable choice under various settings.
+
+\imageMacro{qballs2.png,"Advanced q-ball reconstruction settings",8.00}
+
+This is how a q-ball image should initially look after reconstruction. Standard q-balls feature a relatively low GFA and thus appear rather dark. Adjust the level-window to solve this.
+
+\imageMacro{qballs3.png,"q-ball image after reconstruction",16.00}
+
+*/
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingRegistration.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingRegistration.dox
new file mode 100644
index 0000000000..354700a564
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingRegistration.dox
@@ -0,0 +1,16 @@
+/**
+\page QmitkDiffusionImagingDWIRegistrationPage DWI Registration
+
+\section QmitkDiffusionImagingUserManualDWIRegistration DWI Registration
+
+The DWI registration view allows head-motion and eddy-current correction. First the b=0 images (if more than 1) are registered and averaged. The averaged image then serves as fixed image for the alignment of the remaining (weighted, b>0) images.
+
+\imageMacro{registration_basic.png,"Basic DWI Registration Interface",8.00}
+
+In the basic settings, a selected DW image in the Data Manager is marked as Input Data and the Start Head Motion Correction button is enabled. If more than one DW images are selected, they will be processed in a consecutive manner. For larger sets of dw images to be processed, the Advanced settings can be used.
+
+\imageMacro{registration_batch.png,"Batch Processing DWI Registration Interface",8.00}
+
+Here all valid .dwi data located in the given input folder will be processed through the head motion correction and the output will be stored in the current working directory or in a custom folder if specified in the user interface. The output image will have the _MC postfix attached to the input's name.
+
+*/
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingUserManual.dox
new file mode 100644
index 0000000000..4f6a680c41
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkDiffusionImagingUserManual.dox
@@ -0,0 +1,19 @@
+/**
+\page QmitkDiffusionImagingVisualization ODF Visualization
+
+\section QmitkDiffusionImagingUserManualVisualizationSettings ODF Visualization Setting
+
+In this small view, the visualization of ODFs and diffusion images can be configured. Depending on the selected image in the data storage, different options are shown here.
+
+For tensor or q-ball images, the visibility of glyphs in the different render windows (T)ransversal, (S)agittal, and (C)oronal can be configured here. The maximal number of glyphs to display can also be configured here for. This is usefull to keep the system response time during rendering feasible. The other options configure normalization and scaling of the glyphs.
+
+In diffusion images, a slider lets you choose the desired image channel from the vector of images (each gradient direction one image) for rendering. Furthermore reinit can be performed and texture interpolation toggled.
+
+This is how a visualization with activated glyphs should look like:
+
+\imageMacro{visualization3.png,"Q-ball image with ODF glyph visibility toggled ON",16.00}
+
+
+
+
+*/
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfDetailsViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkOdfDetailsViewUserManual.dox
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfDetailsViewUserManual.dox
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkOdfDetailsViewUserManual.dox
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfMaximaExtractionViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkOdfMaximaExtractionViewUserManual.dox
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfMaximaExtractionViewUserManual.dox
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/QmitkOdfMaximaExtractionViewUserManual.dox
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/crossingmaxima.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/crossingmaxima.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/crossingmaxima.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/crossingmaxima.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/odfdetails.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/odfdetails.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/odfdetails.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/odfdetails.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/prepro1.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/prepro1.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/prepro1.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/prepro1.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs1.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/qballs1.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs1.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/qballs1.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs2.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/qballs2.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs2.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/qballs2.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs3.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/qballs3.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs3.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/qballs3.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/registration_basic.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/registration_basic.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/registration_basic.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/registration_basic.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/registration_batch.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/registration_batch.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/registration_batch.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/registration_batch.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/residuals.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/residuals.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/residuals.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/residuals.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tensor1.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/tensor1.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tensor1.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/tensor1.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tensor4.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/tensor4.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tensor4.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/tensor4.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization3.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/visualization3.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization3.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Preproc_Recons/visualization3.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingPortalPage.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingPortalPage.dox
new file mode 100644
index 0000000000..2d5b3fae0e
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingPortalPage.dox
@@ -0,0 +1,82 @@
+/**
+\page org_mitk_gui_qt_diffusionimaging MITK Diffusion Imaging (MITK-DI)
+
+\tableofcontents
+
+This module provides means to diffusion weighted image reconstruction, visualization and quantification. Diffusion tensors as well as different q-ball reconstruction schemes are supported. Q-ball imaging aims at recovering more detailed information about the orientations of fibers from diffusion MRI measurements and, in particular, to resolve the orientations of crossing fibers.
+
+\section org_mitk_gui_qt_diffusionimagingComponents Components
+
+MITK Diffusion consists of further components, which have their own documentation, see:
+
+\subsection org_mitk_gui_qt_diffusionimagingComponentsDataImport Data Import
+
+ \li \subpage QmitkDiffusionImagingDataImportPage
+
+\subsection org_mitk_gui_qt_diffusionimagingComponentsPreprocessingAndReconstruction Preprocessing and Reconstruction
+
+Register or denoise original data and convert it into tensor or q-ball images.
+
+ \li \subpage QmitkDiffusionImagingDWIRegistrationPage
+ \li \subpage QmitkDiffusionImagingUserManualPreprocessingPage
+ \li \subpage QmitkDiffusionImagingReconstructionPage
+ \li \subpage org_mitk_views_odfdetails
+ \li \subpage org_mitk_views_odfmaximaextraction
+ \li \subpage org_mitk_views_denoisingview
+
+\subsection org_mitk_gui_qt_diffusionimagingComponentsFiberTracking Fiber Tracking
+
+Create and work with fiber tractographies.
+
+ \li \subpage org_mitk_views_fiberprocessing
+ \li \subpage org_mitk_views_gibbstracking
+ \li \subpage org_mitk_views_stochasticfibertracking
+ \li \subpage org_mitk_views_fiberextraction
+ \li \subpage org_mitk_views_fiberprocessing
+ \li \subpage org_mitk_views_streamlinetracking
+ \li \subpage org_mitk_views_fiberfoxview
+ \li \subpage org_mitk_views_fieldmapgenerator
+
+\subsection org_mitk_gui_qt_diffusionimagingComponentsQuantification Quantification
+
+Create parameter maps and quantify different properties.
+
+ \li \subpage org_mitk_views_ivim
+ \li \subpage org_mitk_views_partialvolumeanalysisview
+ \li \subpage org_mitk_views_tractbasedspatialstatistics
+
+\subsection org_mitk_gui_qt_diffusionimagingComponentsConnectomics Connectomics
+
+Create and analyse connectome networks.
+
+ \li \subpage org_mitk_diffusionimagingapp_perspectives_connectomics
+
+\section org_mitk_gui_qt_diffusionimagingIssues Known Issues
+
+\li Dicom Import: The dicom import has so far only been implemented for Siemens dicom images. MITK-DI is capable of reading the nrrd format, which is documented elsewhere [1, 2]. These files can be created by combining the raw image data with a corresponding textual header file. The file extension should be changed from *.nrrd to *.dwi or from *.nhdr to *.hdwi respectively in order to let MITK-DI recognize the diffusion related header information provided in the files.
+
+\section org_mitk_gui_qt_diffusionimagingTechnicalDetails Technical Information for Developers
+
+The diffusion imaging module uses additional properties beside the ones in use in other modules, for further information see \ref DiffusionImagingPropertiesPage .
+
+\section org_mitk_gui_qt_diffusionimagingReferences References
+
+Further reading regarding diffusion:
+
+1. http://teem.sourceforge.net/nrrd/format.html
+
+2. http://www.cmake.org/Wiki/Getting_Started_with_the_NRRD_Format
+
+3. C.F.Westin, S.E.Maier, H.Mamata, A.Nabavi, F.A.Jolesz, R.Kikinis, "Processing and visualization for Diffusion tensor MRI", Medical image Analysis, 2002, pp 93-108
+
+5. Tuch, D.S., 2004. Q-ball imaging. Magn Reson Med 52, 1358-1372.
+
+6. Descoteaux, M., Angelino, E., Fitzgibbons, S., Deriche, R., 2007. Regularized, fast, and robust analytical Q-ball imaging. Magn Reson Med 58, 497-510.
+
+7. Aganj, I., Lenglet, C., Sapiro, G., 2009. ODF reconstruction in q-ball imaging with solid angle consideration. Proceedings of the Sixth IEEE International Symposium on Biomedical Imaging Boston, MA.
+
+8. Goh, A., Lenglet, C., Thompson, P.M., Vidal, R., 2009. Estimating Orientation Distribution Functions with Probability Density Constraints and Spatial Regularity. Med Image Comput Comput Assist Interv Int Conf Med Image Comput Comput Assist Interv LNCS 5761, 877 ff.
+
+9. J.-D. Tournier, S. Mori, A. Leemans., 2011. Diffusion Tensor Imaging and Beyond. Magn Reson Med 65, 1532-1556.
+
+*/
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.dox
deleted file mode 100644
index 769b664537..0000000000
--- a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.dox
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
-\page org_mitk_gui_qt_diffusionimaging MITK Diffusion Imaging (MITK-DI)
-
-\tableofcontents
-
-This module provides means to diffusion weighted image reconstruction, visualization and quantification. Diffusion tensors as well as different q-ball reconstruction schemes are supported. Q-ball imaging aims at recovering more detailed information about the orientations of fibers from diffusion MRI measurements and, in particular, to resolve the orientations of crossing fibers.
-
-\section QmitkDiffusionImagingUserManualIssues Known Issues
-
-\li Dicom Import: The dicom import has so far only been implemented for Siemens dicom images. MITK-DI is capable of reading the nrrd format, which is documented elsewhere [1, 2]. These files can be created by combining the raw image data with a corresponding textual header file. The file extension should be changed from *.nrrd to *.dwi or from *.nhdr to *.hdwi respectively in order to let MITK-DI recognize the diffusion related header information provided in the files.
-
-\section QmitkDiffusionImagingUserManualPreprocessing Preprocessing
-
-The preprocessing view gives an overview over the important features of a diffusion weighted image like the number of gradient directions, b-value and the measurement frame. Additionally it allows the extraction of the B0 image, reduction of gradient directions and the generation of a binary brain mask. The image volume can be modified by applying a new mesurement frame, which is useful if the measurement frame is not set correctly in the image header, or by averaging redundant gradient directions.
-
-\imageMacro{prepro1.png,"Preprocessing",9.97}
-
-\section QmitkDiffusionImagingUserManualDWIRegistration DWI Registration
-
-The DWI registration view allows head-motion and eddy-current correction. First the b=0 images (if more than 1) are registered and averaged. The averaged image then serves as fixed image for the alignment of the remaining (weighted, b>0) images.
-
-\imageMacro{registration_basic.png,"Basic DWI Registration Interface",8.00}
-
-In the basic settings, a selected DW image in the Data Manager is marked as Input Data and the Start Head Motion Correction button is enabled. If more than one DW images are selected, they will be processed in a consecutive manner. For larger sets of dw images to be processed, the Advanced settings can be used.
-
-\imageMacro{registration_batch.png,"Batch Processing DWI Registration Interface",8.00}
-
-Here all valid .dwi data located in the given input folder will be processed through the head motion correction and the output will be stored in the current working directory or in a custom folder if specified in the user interface. The output image will have the _MC postfix attached to the input's name.
-
-\section QmitkDiffusionImagingUserManualTensorReconstruction Tensor Reconstruction
-
-The tensor reconstruction view allows ITK based tensor reconstruction [3]. The advanced settings for ITK reconstruction let you configure a manual threshold on the non-diffusion weighted image. All voxels below this threshold will not be reconstructed and left blank. It is also possible to check for negative eigenvalues. The according voxels are also left blank.
-
-\imageMacro{tensor1.png,"ITK tensor reconstruction", 9.97}
-
-A few seconds (depending on the image size) after the reconstruction button is hit, a colored image should appear in the main window.
-
-\imageMacro{tensor4.png,"Tensor image after reconstruction",16.00}
-
-To assess the quality of the tensor fit it has been proposed to calculate the model residual [9]. This calculates the residual between the measured signal and the signal predicted by the model. Large residuals indicate an inadequacy of the model or the presence of artefacts in the signal intensity (noise, head motion, etc.). To use this option: Select a DWI dataset, estimate a tensor, select both the DWI node and the tensor node in the datamanager and press Residual Image Calculation. MITK-Diffusion can show the residual for every voxel averaged over all volumes or (in the plot widget) summarized per volume or for every slice in every volume. Clicking in the widget where the residual is shown per slice will automatically let the cross-hair jump to that position in the DWI dataset. If Percentage of outliers is checked, the per volume plot will show the percentage of outliers per volume. Otherwise it will show the mean together with the first and third quantile of residuals. See [9] for more information.
-
-\imageMacro{residuals.png,"The residual widget",16.00}
-
-The view also allows the generation of artificial diffusion weighted or Q-Ball images from the selected tensor image. The ODFs of the Q-Ball image are directly initialized from the tensor values and afterwards normalized. The diffusion weighted image is estimated using the l2-norm image of the tensor image as B0. The gradient images are afterwards generated using the standard tensor equation.
-
-\section QmitkDiffusionImagingUserManualQBallReconstruction Q-Ball Reconstruction
-
-The q-ball reonstruction view implements a variety of reconstruction methods. The different reconstruction methods are described in the following:
-\li Numerical: The original, numerical q-ball reconstruction presented by Tuch et al. [5]
-\li Standard (SH): Descoteaux's reconstruction based on spherical harmonic basis functions [6]
-\li Solid Angle (SH): Aganj's reconstruction with solid angle consideration [7]
-\li ADC-profile only: The ADC-profile reconstructed with spherical harmonic basis functions
-\li Raw signal only: The raw signal reconstructed with spherical harmonic basis functions
-
-\imageMacro{qballs1.png,"The q-ball resonstruction view",9.99}
-
-B0 threshold works the same as in tensor reconstruction. The maximum l-level configures the size of the spherical harmonics basis. Larger l-values (e.g. l=8) allow higher levels of detail, lower levels are more stable against noise (e.g. l=4). Lambda is a regularisation parameter. Set it to 0 for no regularisation. lambda = 0.006 has proven to be a stable choice under various settings.
-
-\imageMacro{qballs2.png,"Advanced q-ball reconstruction settings",8.00}
-
-This is how a q-ball image should initially look after reconstruction. Standard q-balls feature a relatively low GFA and thus appear rather dark. Adjust the level-window to solve this.
-
-\imageMacro{qballs3.png,"q-ball image after reconstruction",16.00}
-
-\section QmitkDiffusionImagingUserManualDicomImport Dicom Import
-
-The dicom import does not cover all hardware manufacturers but only Siemens dicom images. MITK-DI is also capable of reading the nrrd format, which is documented elsewhere [1, 2]. These files can be created by combining the raw image data with a corresponding textual header file. The file extension should be changed from *.nrrd to *.dwi or from *.nhdr to *.hdwi respectively in order to let MITK-DI recognize the diffusion related header information provided in the files.
-
-In case your dicom images are readable by MITK-DI, select one or more input dicom folders and click import. Each input folder must only contain DICOM-images that can be combined into one vector-valued 3D output volume. Different patients must be loaded from different input-folders. The folders must not contain other acquisitions (e.g. T1,T2,localizer).
-
-In case many imports are performed at once, it is recommended to set the the optional output folder argument. This prevents the images from being kept in memory.
-
-\imageMacro{dicom1.png,"Dicom import",9.59}
-
-The option "Average duplicate gradients" accumulates the information that was acquired with multiple repetitions for one gradient. Vectors do not have to be precisely equal in order to be merged, if a "blur radius" > 0 is configured.
-
-\section QmitkDiffusionImagingUserManualFslImport FSL Import
-
-FSL diffusion data can be imported with MITK Diffusion. FSL diffusion datasets consist of 3 files: a nifty file (filename.nii.gz or filename.nii), a bvecs file (filename.bvecs), which is a text file containing the gradient vectors, and a bvals file (filename.bvecs), containing the b-values. Due to the system that selects suitable file readers, MITK will not recognize these files as diffusion datasets. In order to make MITK recognize it as diffusion, the extension must be changed from .nii.gz to .fslgz (so the new name is filename.fslgz) or from filename.nii to filename.fsl. The bvecs and bvals files have to be renamed as well(to filename.fsl.bvecs/filenames.fsl.bvecs or to filename.fslgz.bvecs/filename.fslgz.bvals).
-
-MITK can also save diffusion weighted images in FSL format. To do this the extension of the new file should be changed to .fsl or .fslgz upon saving the file.
-
-\imageMacro{fslsave.png,"Save a dwi dataset as fsl",16.00}
-
-\section QmitkDiffusionImagingUserManualQuantification Quantification
-
-The quantification view allows the derivation of different scalar anisotropy measures for the reconstructed tensors (Fractional Anisotropy, Relative Anisotropy, Axial Diffusivity, Radial Diffusivity) or q-balls (Generalized Fractional Anisotropy).
-
-\imageMacro{quantification.png,"Anisotropy quantification",2}
-
-\section QmitkDiffusionImagingUserManualVisualizationSettings ODF Visualization Setting
-
-In this small view, the visualization of ODFs and diffusion images can be configured. Depending on the selected image in the data storage, different options are shown here.
-
-For tensor or q-ball images, the visibility of glyphs in the different render windows (T)ransversal, (S)agittal, and (C)oronal can be configured here. The maximal number of glyphs to display can also be configured here for. This is usefull to keep the system response time during rendering feasible. The other options configure normalization and scaling of the glyphs.
-
-In diffusion images, a slider lets you choose the desired image channel from the vector of images (each gradient direction one image) for rendering. Furthermore reinit can be performed and texture interpolation toggled.
-
-This is how a visualization with activated glyphs should look like:
-
-\imageMacro{visualization3.png,"Q-ball image with ODF glyph visibility toggled ON",16.00}
-
-\section QmitkDiffusionImagingUserManualReferences References
-
-1. http://teem.sourceforge.net/nrrd/format.html
-
-2. http://www.cmake.org/Wiki/Getting_Started_with_the_NRRD_Format
-
-3. C.F.Westin, S.E.Maier, H.Mamata, A.Nabavi, F.A.Jolesz, R.Kikinis, "Processing and visualization for Diffusion tensor MRI", Medical image Analysis, 2002, pp 93-108
-
-5. Tuch, D.S., 2004. Q-ball imaging. Magn Reson Med 52, 1358-1372.
-
-6. Descoteaux, M., Angelino, E., Fitzgibbons, S., Deriche, R., 2007. Regularized, fast, and robust analytical Q-ball imaging. Magn Reson Med 58, 497-510.
-
-7. Aganj, I., Lenglet, C., Sapiro, G., 2009. ODF reconstruction in q-ball imaging with solid angle consideration. Proceedings of the Sixth IEEE International Symposium on Biomedical Imaging Boston, MA.
-
-8. Goh, A., Lenglet, C., Thompson, P.M., Vidal, R., 2009. Estimating Orientation Distribution Functions with Probability Density Constraints and Spatial Regularity. Med Image Comput Comput Assist Interv Int Conf Med Image Comput Comput Assist Interv LNCS 5761, 877 ff.
-
-9. J.-D. Tournier, S. Mori, A. Leemans., 2011. Diffusion Tensor Imaging and Beyond. Magn Reson Med 65, 1532-1556.
-
-\section QmitkDiffusionImagingUserManualTechnicalDetail Technical Information for Developers
-
-The diffusion imaging module uses additional properties beside the ones in use in other modules, for further information see \ref DiffusionImagingPropertiesPage .
-
-\section QmitkDiffusionImagingUserManualSubManuals Manuals of componentes
-
-The MITK Diffusion tools consist of further components, which have their own documentation, see:
-
- \li \subpage org_mitk_views_fiberprocessing
- \li \subpage org_mitk_views_gibbstracking
- \li \subpage org_mitk_views_odfdetails
- \li \subpage org_mitk_views_partialvolumeanalysisview
- \li \subpage org_mitk_views_screenshotmaker
- \li \subpage org_mitk_views_stochasticfibertracking
- \li \subpage org_mitk_views_ivim
- \li \subpage org_mitk_diffusionimagingapp_perspectives_connectomics
- \li \subpage org_mitk_views_tractbasedspatialstatistics
- \li \subpage org_mitk_views_fiberextraction
- \li \subpage org_mitk_views_fiberprocessing
- \li \subpage org_mitk_views_odfmaximaextraction
- \li \subpage org_mitk_views_streamlinetracking
- \li \subpage org_mitk_views_fiberfoxview
- \li \subpage org_mitk_views_fieldmapgenerator
- \li \subpage org_mitk_views_denoisingview
-*/
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/QmitkDiffusionImagingQuantificationPage.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/QmitkDiffusionImagingQuantificationPage.dox
new file mode 100644
index 0000000000..c3ca35f105
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/QmitkDiffusionImagingQuantificationPage.dox
@@ -0,0 +1,8 @@
+/**
+
+\page QmitkDiffusionImagingQuantificationPage Quantification
+
+The quantification view allows the derivation of different scalar anisotropy measures for the reconstructed tensors (Fractional Anisotropy, Relative Anisotropy, Axial Diffusivity, Radial Diffusivity) or q-balls (Generalized Fractional Anisotropy).
+
+\imageMacro{quantification.png,"Anisotropy quantification",2}
+*/
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkPartialVolumeAnalysisViewManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/QmitkPartialVolumeAnalysisViewManual.dox
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkPartialVolumeAnalysisViewManual.dox
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/QmitkPartialVolumeAnalysisViewManual.dox
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkTbssViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/QmitkTbssViewUserManual.dox
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkTbssViewUserManual.dox
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/QmitkTbssViewUserManual.dox
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkUserIVIMViewManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/QmitkUserIVIMViewManual.dox
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkUserIVIMViewManual.dox
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/QmitkUserIVIMViewManual.dox
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fslimport.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/fslimport.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fslimport.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/fslimport.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/ivimview.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/ivimview.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/ivimview.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/ivimview.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/profiles.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/profiles.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/profiles.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/profiles.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/pvanalysisview.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/pvanalysisview.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/pvanalysisview.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/pvanalysisview.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/quantification.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/quantification.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/quantification.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/quantification.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tbss.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/tbss.png
old mode 100755
new mode 100644
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tbss.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/tbss.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tbssRoi.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/tbssRoi.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tbssRoi.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/tbssRoi.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/trackingplot.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/trackingplot.png
similarity index 100%
rename from Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/trackingplot.png
rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/Quantification/trackingplot.png
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/dicom2.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/dicom2.png
deleted file mode 100644
index 03a42f1c01..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/dicom2.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/overview.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/overview.png
deleted file mode 100644
index e709cbde60..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/overview.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/segmentationview.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/segmentationview.png
deleted file mode 100644
index 7d966a20b7..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/segmentationview.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/sw_phantom_crossing_qballs.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/sw_phantom_crossing_qballs.png
deleted file mode 100644
index 84a4435bf0..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/sw_phantom_crossing_qballs.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/sw_phantom_rois.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/sw_phantom_rois.png
deleted file mode 100644
index eb445bc40e..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/sw_phantom_rois.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization1.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization1.png
deleted file mode 100644
index 646b945d9d..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization1.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization2.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization2.png
deleted file mode 100644
index 25d888a2bc..0000000000
Binary files a/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization2.png and /dev/null differ