diff --git a/BlueBerry/BlueBerryConfig.cmake.in b/BlueBerry/BlueBerryConfig.cmake.in index 122098b65d..8d97a76a25 100644 --- a/BlueBerry/BlueBerryConfig.cmake.in +++ b/BlueBerry/BlueBerryConfig.cmake.in @@ -1,90 +1,82 @@ # ------------------------------------------------------------------------- # Package requirements # ------------------------------------------------------------------------- SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "@BLUEBERRY_SOURCE_DIR@/CMake") SET(CTK_DIR "@CTK_DIR@") FIND_PACKAGE(CTK REQUIRED) SET(mbilog_DIR "@mbilog_DIR@") FIND_PACKAGE(mbilog REQUIRED) FIND_PACKAGE(Poco REQUIRED) FIND_PACKAGE(Doxygen) # ------------------------------------------------------------------------- # BlueBerry directory vars # ------------------------------------------------------------------------- SET(BLUEBERRY_PLUGINS_SOURCE_DIR "@BLUEBERRY_PLUGINS_SOURCE_DIR@") SET(BLUEBERRY_PLUGINS_BINARY_DIR "@BLUEBERRY_PLUGINS_BINARY_DIR@") SET(BLUEBERRY_PLUGIN_SOURCE_DIRS "@BLUEBERRY_PLUGINS_SOURCE_DIR@") -SET(BLUEBERRY_PLUGINS_OUTPUT_DIR "@BLUEBERRY_PLUGINS_OUTPUT_DIR@") SET(BLUEBERRY_SOURCE_DIR "@BLUEBERRY_SOURCE_DIR@") SET(BlueBerry_SOURCE_DIR "@BLUEBERRY_SOURCE_DIR@") SET(BLUEBERRY_BINARY_DIR "@BLUEBERRY_BINARY_DIR@") # ------------------------------------------------------------------------- # BlueBerry CMake file includes # ------------------------------------------------------------------------- SET(BLUEBERRY_PLUGIN_USE_FILE @BB_PLUGIN_USE_FILE@) IF(BLUEBERRY_PLUGIN_USE_FILE) IF(EXISTS ${BLUEBERRY_PLUGIN_USE_FILE}) INCLUDE(${BLUEBERRY_PLUGIN_USE_FILE}) ENDIF() ENDIF() IF(NOT BB_PLUGIN_EXPORTS_FILE_INCLUDED AND NOT CMAKE_PROJECT_NAME STREQUAL "MITK") INCLUDE("@BB_PLUGIN_EXPORTS_FILE@") SET(BB_PLUGIN_EXPORTS_FILE_INCLUDED 1) ENDIF() # ------------------------------------------------------------------------- # BlueBerry CMake variables # ------------------------------------------------------------------------- SET(BLUEBERRY_DEBUG_POSTFIX @BLUEBERRY_DEBUG_POSTFIX@) SET(BLUEBERRY_USE_QT_HELP @BLUEBERRY_USE_QT_HELP@) SET(QT_HELPGENERATOR_EXECUTABLE "@QT_HELPGENERATOR_EXECUTABLE@") SET(QT_COLLECTIONGENERATOR_EXECUTABLE "@QT_COLLECTIONGENERATOR_EXECUTABLE@") SET(QT_ASSISTANT_EXECUTABLE "@QT_ASSISTANT_EXECUTABLE@") SET(QT_XMLPATTERNS_EXECUTABLE "@QT_XMLPATTERNS_EXECUTABLE@") SET(BLUEBERRY_PLUGIN_TARGETS @my_plugin_targets@) -SET(BLUEBERRY_ENABLED_PLUGINS @my_plugin_targets@) SET(BLUEBERRY_PLUGIN_PROVISIONING_FILE "@BLUEBERRY_PROVISIONING_FILE@") SET(BLUEBERRY_DOXYGEN_TAGFILE_NAME @BLUEBERRY_DOXYGEN_TAGFILE_NAME@) # ------------------------------------------------------------------------- # BlueBerry CMake macros # ------------------------------------------------------------------------- INCLUDE(MacroParseArguments) INCLUDE(MacroConvertSchema) INCLUDE(MacroOrganizeSources) -INCLUDE(berryPluginHelpers) -INCLUDE(MacroCollectPlugins) -INCLUDE(MacroParseManifest) -INCLUDE(MacroCreatePlugin) INCLUDE(MacroCreateCTKPlugin) INCLUDE(MacroCreateQtHelp) -INCLUDE(MacroInstallPlugin) INCLUDE(MacroInstallCTKPlugin) -INCLUDE(MacroInstallThirdPartyPlugins) INCLUDE(FunctionInstallThirdPartyCTKPlugins) INCLUDE(FunctionCreateProvisioningFile) INCLUDE(FunctionCreateBlueBerryApplication) diff --git a/BlueBerry/Build/BundleGenerator/CMakeLists.txt b/BlueBerry/Build/BundleGenerator/CMakeLists.txt deleted file mode 100644 index 221ca83f1c..0000000000 --- a/BlueBerry/Build/BundleGenerator/CMakeLists.txt +++ /dev/null @@ -1,302 +0,0 @@ -PROJECT(BlueBerryPluginGenerator) - -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -MARK_AS_ADVANCED( -CMAKE_BACKWARDS_COMPATIBILITY CMAKE_INSTALL_PREFIX CMAKE_BUILD_TYPE) - -FIND_FILE(PLUGIN_TEMPLATE BundleTemplate - ${PROJECT_SOURCE_DIR}/../../CMake - DOC "Path to the plugin templates") - -IF(BUNDLE_DEFAULTS_FILE) - IF(EXISTS "${BUNDLE_DEFAULTS_FILE}") - INCLUDE(${BUNDLE_DEFAULTS_FILE}) - ELSE(EXISTS "${BUNDLE_DEFAULTS_FILE}") - MESSAGE(SEND_ERROR "cannot find supplied defaults file: ${BUNDLE_DEFAULTS_FILE}") - ENDIF(EXISTS "${BUNDLE_DEFAULTS_FILE}") -ELSE(BUNDLE_DEFAULTS_FILE) - INCLUDE(${PLUGIN_TEMPLATE}/BundleDefaults.cmake) -ENDIF(BUNDLE_DEFAULTS_FILE) - -SET(PLUGIN_ID "${DEFAULT_PLUGIN_ID}" CACHE STRING "unique plugin id (i.e. your.domain.pluginid) (required)") -SET(PLUGIN_NAME "" CACHE STRING "a human-readable description of your plugin (required)") -SET(CUSTOM_PROJECT_NAME "" CACHE STRING "Your project name (optional)") -OPTION(GUI_SUPPORT "enable this if your plugin contributes to the UI" ON) - -STRING(REPLACE " " "" CUSTOM_PROJECT_NAME_NOWS "${CUSTOM_PROJECT_NAME}") -SET(CUSTOM_PROJECT_NAME "${CUSTOM_PROJECT_NAME_NOWS}" CACHE STRING "Your project name (optional)" FORCE) - - -IF(PLUGIN_ID AND PLUGIN_NAME) - -SET(PLUGIN_VERSION "${DEFAULT_PLUGIN_VERSION}" CACHE STRING "plugin version (required)") -SET(PLUGIN_VENDOR "${DEFAULT_PLUGIN_VENDOR}" CACHE STRING "plugin vendor (optional)") - -SET(ACTIVATOR_CLASS "" CACHE STRING "class name for your plugin activator (optional)") - -IF(GUI_SUPPORT) - - STRING(REGEX REPLACE "[^a-zA-Z_]" "" _view_baseid "${PLUGIN_NAME}") - STRING(TOLOWER ${_view_baseid} _lview_baseid) - - SET(_default_view_class_name "${DEFAULT_VIEW_CLASS_BEGIN}${_view_baseid}View") - - SET(VIEW_NAME "${PLUGIN_NAME}" CACHE STRING "a human-readable name of your view (required)") - SET(VIEW_CLASS "${_default_view_class_name}" CACHE STRING "class name of the view") - IF(VIEW_CLASS) - STRING(TOUPPER ${VIEW_CLASS} UVIEW_CLASS) - ENDIF(VIEW_CLASS) - SET(VIEW_BASE_CLASS ${DEFAULT_VIEW_BASE_CLASS} CACHE STRING "base class of your new view class (required)") - SET(VIEW_BASE_CLASS_H ${DEFAULT_VIEW_BASE_CLASS_H} CACHE STRING "base class header (required)") - - SET(VIEW_ID "${DEFAULT_VIEW_BASEID}${_lview_baseid}" CACHE STRING "unique view id (i.e. your.domain.viewid) (required)") - - #SET(EDITOR_CLASS "" CACHE STRING "") - #SET(EDITOR_TYPE "" CACHE STRING "") -ENDIF(GUI_SUPPORT) - -#SET(GENERATE_SERVICE "" CACHE STRING "") -#SET(GENERATE_SERVICE_CLASS "" CACHE STRING "") - -SET(_required_bundles ${DEFAULT_REQUIRED_BUNDLES}) -IF(GUI_SUPPORT) - SET(_required_bundles ${DEFAULT_REQUIRED_BUNDLES_FOR_GUI}) -ENDIF(GUI_SUPPORT) -SET(REQUIRED_PLUGINS ${_required_bundles} CACHE STRING "a semicolon-separated list of required plugins (optional)") - -IF(ACTIVATOR_CLASS) - SET(FULLY_QUALIFIED_ACTIVATOR "${BUNDLE_NAMESPACE}::${ACTIVATOR_CLASS}") - STRING(TOUPPER ${ACTIVATOR_CLASS} UACTIVATOR_CLASS) - IF(GUI_SUPPORT) - SET(ACTIVATOR_BASE_CLASS "berry::AbstractUIPlugin") - SET(ACTIVATOR_BASE_CLASS_H "berryAbstractUIPlugin.h") - ELSE() - SET(ACTIVATOR_BASE_CLASS "berry::Plugin") - SET(ACTIVATOR_BASE_CLASS_H "berryPlugin.h") - ENDIF() -ELSE(ACTIVATOR_CLASS) - SET(FULLY_QUALIFIED_ACTIVATOR "") -ENDIF(ACTIVATOR_CLASS) - -SET(PROJECT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${CUSTOM_PROJECT_NAME}") -IF(CUSTOM_PROJECT_NAME) - SET(PLUGIN_DIR "${PROJECT_DIR}/Bundles/${PLUGIN_ID}") -ELSE(CUSTOM_PROJECT_NAME) - SET(PLUGIN_DIR "${PROJECT_DIR}/${PLUGIN_ID}") -ENDIF(CUSTOM_PROJECT_NAME) - -IF(NOT EXISTS "${PLUGIN_TEMPLATE}/META-INF/MANIFEST_TEMPLATE.MF") - MESSAGE(FATAL_ERROR "Could not find ${PLUGIN_TEMPLATE}/META-INF/MANIFEST_TEMPLATE.MF!") -ENDIF(NOT EXISTS "${PLUGIN_TEMPLATE}/META-INF/MANIFEST_TEMPLATE.MF") - -# ====================== PROJECT FILES =============================== - -IF(CUSTOM_PROJECT_NAME AND EXISTS "${PLUGIN_TEMPLATE}/project/CMakeListsTemplate.txt") - - SET(CUSTOM_PROJECT_EXECUTABLE ${CUSTOM_PROJECT_NAME} CACHE STRING "the name of your project's executable") - - IF(GUI_SUPPORT) - SET(FIND_PACKAGE_QT4 "FIND_PACKAGE(Qt4 REQUIRED)") - ENDIF(GUI_SUPPORT) - - SET(BLUEBERRY_BINARY_DIR "@BLUEBERRY_BINARY_DIR@") - SET(BLUEBERRY_PLUGINS_OUTPUT_DIR "@BLUEBERRY_PLUGINS_OUTPUT_DIR@") - SET(PLUGIN_CACHE_DIR "@PLUGIN_CACHE_DIR@") - SET(PLUGIN_BINARY_DIRS "@PLUGIN_BINARY_DIRS@") - SET(MITK_PLUGIN_BINARY_DIRS "@MITK_PLUGIN_BINARY_DIRS@") - - SET(BATCH_FILE_PATH "@MITK_RUNTIME_PATH@;@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/@VS_BUILD_TYPE@") - SET(BATCH_FILE_VS_PATH ${BATCH_FILE_PATH}) - SET(BATCH_FILE_EXEC_CMD "@APP_BUILD_TYPE@\\${CUSTOM_PROJECT_EXECUTABLE}.exe") - SET(BATCH_FILE_VS_EXEC_CMD "\@PROJECT_BINARY_DIR\@/${CUSTOM_PROJECT_NAME}.sln") - - CONFIGURE_FILE("${PLUGIN_TEMPLATE}/project/CMakeListsTemplate.txt" - "${PROJECT_DIR}/CMakeLists.txt" @ONLY) - - CONFIGURE_FILE("${PLUGIN_TEMPLATE}/project/Bundles/CMakeListsTemplate.txt" - "${PROJECT_DIR}/Bundles/CMakeLists.txt" @ONLY) - - CONFIGURE_FILE("${PLUGIN_TEMPLATE}/project/AppTemplate.cpp" - "${PROJECT_DIR}/${CUSTOM_PROJECT_EXECUTABLE}.cpp" @ONLY) - - CONFIGURE_FILE("${PLUGIN_TEMPLATE}/project/AppTemplate.ini" - "${PROJECT_DIR}/${CUSTOM_PROJECT_EXECUTABLE}.ini" COPYONLY) - - CONFIGURE_FILE("${PLUGIN_TEMPLATE}/project/startAppTemplate.bat" - "${PROJECT_DIR}/start${CUSTOM_PROJECT_EXECUTABLE}.bat.in" @ONLY) - - CONFIGURE_FILE("${PLUGIN_TEMPLATE}/project/startVS2008Template.bat" - "${PROJECT_DIR}/startVS2008.bat.in" @ONLY) - -ENDIF() - - -# ====================== END PROJECT FILES =========================== - - -STRING(REPLACE . _ NormalizedPluginID ${PLUGIN_ID}) -STRING(TOUPPER ${NormalizedPluginID} UNormalizedPluginID) - -# ----- START cut plugin_ID from last '.' till end ------------ -SET(LAST_PART_PLUGIN_ID ${PLUGIN_ID}) -STRING(REGEX MATCH "\\.[^\\.]*$" LAST_PART_PLUGIN_ID ${LAST_PART_PLUGIN_ID}) -STRING(LENGTH ${LAST_PART_PLUGIN_ID} LengthStr) -MATH(EXPR LengthStr "${LengthStr}-1") -STRING(SUBSTRING ${LAST_PART_PLUGIN_ID} 1 ${LengthStr} LAST_PART_PLUGIN_ID) -MATH(EXPR LengthStr "${LengthStr}-1") -STRING(SUBSTRING ${LAST_PART_PLUGIN_ID} 0 1 LAST_PART_PLUGIN_ID_FIRST_LETTER) -STRING(TOUPPER ${LAST_PART_PLUGIN_ID_FIRST_LETTER} LAST_PART_PLUGIN_ID_FIRST_LETTER) -STRING(SUBSTRING ${LAST_PART_PLUGIN_ID} 1 ${LengthStr} LAST_PART_PLUGIN_ID_REST) -SET(LAST_PART_PLUGIN_ID ${LAST_PART_PLUGIN_ID_FIRST_LETTER}${LAST_PART_PLUGIN_ID_REST}) -STRING(TOUPPER ${LAST_PART_PLUGIN_ID} ULAST_PART_PLUGIN_ID) -# ------ END -------------------------------------------------- - - -# --------------------- META-INF/MANIFEST_TEMPLATE.MF --------------------- -SET(REQUIRED_PLUGINS_MF "${REQUIRED_PLUGINS}") -STRING(REPLACE ";" "," REQUIRED_PLUGINS_MF "${REQUIRED_PLUGINS_MF}" ) -CONFIGURE_FILE(${PLUGIN_TEMPLATE}/META-INF/MANIFEST_TEMPLATE.MF ${PLUGIN_DIR}/META-INF/MANIFEST.MF @ONLY) - -# ----------------- documentation/doxygen/modulesTemplate.dox ------------ -IF(DOXYGEN_INGROUP) - SET(DOXYGEN_INGROUP_CMD "\\ingroup ${DOXYGEN_INGROUP}") -ENDIF(DOXYGEN_INGROUP) -CONFIGURE_FILE(${PLUGIN_TEMPLATE}/documentation/doxygen/modulesTemplate.dox - ${PLUGIN_DIR}/documentation/doxygen/modules.dox @ONLY) - -# ----------------- documentation/Manual/Manual.dox ------------ -CONFIGURE_FILE(${PLUGIN_TEMPLATE}/documentation/Manual/Manual.dox - ${PLUGIN_DIR}/documentation/Manual/Manual.dox @ONLY) -CONFIGURE_FILE(${PLUGIN_TEMPLATE}/documentation/Manual/icon.png - ${PLUGIN_DIR}/documentation/Manual/icon.png @ONLY) - -# ----------------- resources directory --------------------------------- -IF(GUI_SUPPORT) - FILE(MAKE_DIRECTORY ${PLUGIN_DIR}/resources) - IF(EXISTS ${PLUGIN_TEMPLATE}/resources/qtresources.qrc) - CONFIGURE_FILE(${PLUGIN_TEMPLATE}/resources/qtresources.qrc ${PLUGIN_DIR}/resources/${VIEW_CLASS}.qrc @ONLY) - ENDIF(EXISTS ${PLUGIN_TEMPLATE}/resources/qtresources.qrc) - - IF(EXISTS ${PLUGIN_TEMPLATE}/resources/icon.xpm) - CONFIGURE_FILE(${PLUGIN_TEMPLATE}/resources/icon.xpm ${PLUGIN_DIR}/resources/icon.xpm @ONLY) - ENDIF(EXISTS ${PLUGIN_TEMPLATE}/resources/icon.xpm) -ENDIF() - - -# -------------------- BundleDllTemplate.h ------------------------------- -IF(EXISTS ${PLUGIN_TEMPLATE}/src/BundleDllTemplate.h) - IF(BUNDLE_NAMESPACE) - STRING(TOUPPER ${BUNDLE_NAMESPACE} UBUNDLE_NAMESPACE) - ENDIF(BUNDLE_NAMESPACE) - IF(UBUNDLE_NAMESPACE) - SET(DLL_DEFINE "${UBUNDLE_NAMESPACE}_${ULAST_PART_PLUGIN_ID}_EXPORT") - ELSE(UBUNDLE_NAMESPACE) - SET(DLL_DEFINE "${ULAST_PART_PLUGIN_ID}_EXPORT") - ENDIF(UBUNDLE_NAMESPACE) - - - SET(Dll_HEADER ${BUNDLE_NAMESPACE}${LAST_PART_PLUGIN_ID}Dll.h) - CONFIGURE_FILE(${PLUGIN_TEMPLATE}/src/BundleDllTemplate.h ${PLUGIN_DIR}/src/${Dll_HEADER} @ONLY) -ENDIF(EXISTS ${PLUGIN_TEMPLATE}/src/BundleDllTemplate.h) - - -# --------------------- src/internal/ViewTemplateControls.ui ---------------------------- -IF (GUI_SUPPORT) - IF(EXISTS ${PLUGIN_TEMPLATE}/src/internal/ControlsTemplate.ui) - SET(VIEW_CONTROLS "${VIEW_CLASS}Controls") - SET(VIEW_CONTROLS_UI "${VIEW_CONTROLS}.ui") - SET(VIEW_CONTROLS_FILE "ui_${VIEW_CONTROLS}.h") - SET(VIEW_CONTROLS_CLASS "${VIEW_CONTROLS}") - - CONFIGURE_FILE(${PLUGIN_TEMPLATE}/src/internal/ControlsTemplate.ui ${PLUGIN_DIR}/src/internal/${VIEW_CONTROLS_UI} @ONLY) - ENDIF(EXISTS ${PLUGIN_TEMPLATE}/src/internal/ControlsTemplate.ui) -ENDIF() - -# --------------------- src/internal/ViewTemplate[.h,.cpp] ---------------------------- -IF(VIEW_CLASS) - SET(VIEW_CLASS_H "${BUNDLE_NAMESPACE}${VIEW_CLASS}.h") - SET(VIEW_CLASS_CPP "${BUNDLE_NAMESPACE}${VIEW_CLASS}.cpp") - - IF(BUNDLE_NAMESPACE) - SET(BEGIN_NAMESPACE "namespace ${BUNDLE_NAMESPACE} {") - SET(END_NAMESPACE "} //namespace ${BUNDLE_NAMESPACE}") - ENDIF(BUNDLE_NAMESPACE) - CONFIGURE_FILE(${PLUGIN_TEMPLATE}/src/internal/ViewTemplate.h ${PLUGIN_DIR}/src/internal/${VIEW_CLASS_H} @ONLY) - CONFIGURE_FILE(${PLUGIN_TEMPLATE}/src/internal/ViewTemplate.cpp ${PLUGIN_DIR}/src/internal/${VIEW_CLASS_CPP} @ONLY) -ENDIF(VIEW_CLASS) - -# ---------------------- pluginTemplate.xml --------------------------------- -IF(VIEW_CLASS) - SET(XP_VIEW " - - " -) -ENDIF(VIEW_CLASS) -CONFIGURE_FILE(${PLUGIN_TEMPLATE}/pluginTemplate.xml ${PLUGIN_DIR}/plugin.xml @ONLY) - -# ----------------------- ActivatorTemplate[.h,.cpp] ------------------------ -IF(ACTIVATOR_CLASS) - SET(ACTIVATOR_CLASS_H "${BUNDLE_NAMESPACE}${ACTIVATOR_CLASS}.h") - SET(ACTIVATOR_CLASS_CPP "${BUNDLE_NAMESPACE}${ACTIVATOR_CLASS}.cpp") - - IF(BUNDLE_NAMESPACE) - SET(BEGIN_NAMESPACE "namespace ${BUNDLE_NAMESPACE} {") - SET(END_NAMESPACE "} //namespace ${BUNDLE_NAMESPACE}") - ENDIF(BUNDLE_NAMESPACE) - CONFIGURE_FILE(${PLUGIN_TEMPLATE}/src/internal/ActivatorTemplate.h ${PLUGIN_DIR}/src/internal/${ACTIVATOR_CLASS_H} @ONLY) - CONFIGURE_FILE(${PLUGIN_TEMPLATE}/src/internal/ActivatorTemplate.cpp ${PLUGIN_DIR}/src/internal/${ACTIVATOR_CLASS_CPP} @ONLY) -ENDIF() - -# ----------------------- manifestTemplate.cpp ---------------------------- -IF(VIEW_CLASS) - SET(SET_MANIFEST_SRC "SET(CPP_FILES manifest.cpp)") - SET(MANIFEST_VIEW_ENTRY "#include \"src/internal/${VIEW_CLASS_H}\" - -POCO_BEGIN_NAMED_MANIFEST(berryIViewPart, berry::IViewPart) - POCO_EXPORT_CLASS(${BUNDLE_NAMESPACE}::${VIEW_CLASS}) -POCO_END_MANIFEST") -ENDIF(VIEW_CLASS) - -IF(ACTIVATOR_CLASS) - SET(SET_MANIFEST_SRC "SET(CPP_FILES manifest.cpp)") - SET(MANIFEST_ACTIVATOR_ENTRY "#include \"src/internal/${ACTIVATOR_CLASS_H}\" - -POCO_BEGIN_MANIFEST(berry::IBundleActivator) - POCO_EXPORT_CLASS(${BUNDLE_NAMESPACE}::${ACTIVATOR_CLASS}) -POCO_END_MANIFEST") -ENDIF() - -IF(VIEW_CLASS OR ACTIVATOR_CLASS) - CONFIGURE_FILE(${PLUGIN_TEMPLATE}/manifestTemplate.cpp ${PLUGIN_DIR}/manifest.cpp @ONLY) -ENDIF() - -# ---------------------- CMakeListsTemplate.txt ----------------------------- -SET(CREATE_PLUGIN_MACRO "${DEFAULT_CREATE_PLUGIN_MACRO}") -IF(GUI_SUPPORT) - SET(CREATE_PLUGIN_MACRO "${DEFAULT_CREATE_GUI_PLUGIN_MACRO}") -ENDIF(GUI_SUPPORT) - -CONFIGURE_FILE(${PLUGIN_TEMPLATE}/CMakeListsTemplate.txt ${PLUGIN_DIR}/CMakeLists.txt @ONLY) - -# ---------------------- filesTemplate.cmake ------------------------------ -SET(PLUGIN_SOURCES "") -SET(PLUGIN_INTERNAL_SOURCES "") -IF(VIEW_CLASS) - SET(PLUGIN_INTERNAL_SOURCES "${PLUGIN_INTERNAL_SOURCES}${VIEW_CLASS_CPP}\n") -ENDIF(VIEW_CLASS) -IF(ACTIVATOR_CLASS) - SET(PLUGIN_INTERNAL_SOURCES "${PLUGIN_INTERNAL_SOURCES}${ACTIVATOR_CLASS_CPP}\n") -ENDIF(ACTIVATOR_CLASS) -IF(GUI_SUPPORT AND EXISTS ${PLUGIN_TEMPLATE}/src/internal/ControlsTemplate.ui) - SET(PLUGIN_RESOURCE_FILES "resources/icon.xpm") - SET(PLUGIN_RES_FILES "resources/${VIEW_CLASS}.qrc") - SET(PLUGIN_UI_FILES "src/internal/${VIEW_CONTROLS_UI}") - SET(PLUGIN_MOC_H_FILES "src/internal/${VIEW_CLASS}.h") -ENDIF() - -CONFIGURE_FILE(${PLUGIN_TEMPLATE}/filesTemplate.cmake ${PLUGIN_DIR}/files.cmake @ONLY) - -ENDIF(PLUGIN_ID AND PLUGIN_NAME) diff --git a/BlueBerry/CMake/BundleTemplate/BundleDefaults.cmake b/BlueBerry/CMake/BundleTemplate/BundleDefaults.cmake deleted file mode 100644 index c4ad9c1df4..0000000000 --- a/BlueBerry/CMake/BundleTemplate/BundleDefaults.cmake +++ /dev/null @@ -1,27 +0,0 @@ -SET(BUNDLE_NAMESPACE "berry") -SET(DEFAULT_REQUIRED_BUNDLES "org.blueberry.osgi") -SET(DEFAULT_REQUIRED_BUNDLES_FOR_GUI "org.blueberry.ui.qt") -SET(DEFAULT_VIEW_BASE_CLASS "berry::QtViewPart")#qt -SET(DEFAULT_VIEW_BASE_CLASS_H "berryQtViewPart.h")#qt) -SET(PROJECT_STATIC_VAR "BERRY_STATIC") -SET(DOXYGEN_INGROUP "BlueBerryPlugins") - -SET(DEFAULT_CREATE_PLUGIN_MACRO "MACRO_CREATE_PLUGIN()") -SET(DEFAULT_CREATE_GUI_PLUGIN_MACRO "MACRO_CREATE_QT_PLUGIN()") - -SET(PLUGIN_COPYRIGHT "/*========================================================================= - -Program: BlueBerry Platform -Language: C++ -Date: $Date: 2008-06-13 21:02:28 +0200 (Fr, 13 Jun 2008) $ -Version: $Revision: 14620 $ - -Copyright (c) German Cancer Research Center, Division of Medical and -Biological Informatics. All rights reserved. -See MITKCopyright.txt or http://www.mitk.org/copyright.html for details. - -This software is distributed WITHOUT ANY WARRANTY; without even -the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -PURPOSE. See the above copyright notices for more information. - -=========================================================================*/") diff --git a/BlueBerry/CMake/BundleTemplate/BundleTemplate.cpp b/BlueBerry/CMake/BundleTemplate/BundleTemplate.cpp deleted file mode 100644 index f87d6887e8..0000000000 --- a/BlueBerry/CMake/BundleTemplate/BundleTemplate.cpp +++ /dev/null @@ -1,22 +0,0 @@ -@PLUGIN_COPYRIGHT@ - -#include "@GENERATE_VIEW_CLASS@.h" - -#include "berryPlatform.h" -#include "service/berryIExtensionPointService.h" -#include "event/berryPlatformEvents.h" - -#include "Poco/Delegate.h" - -#include - -namespace berry { - -const std::string RuntimePlugin::@PLUGIN_ID@ = "org.blueberry.core.runtime"; - -void -RuntimePlugin::Start(IBundleContext::Pointer /*context*/) -{ -} - -} diff --git a/BlueBerry/CMake/BundleTemplate/BundleTemplate.h b/BlueBerry/CMake/BundleTemplate/BundleTemplate.h deleted file mode 100644 index 6fb14a6b56..0000000000 --- a/BlueBerry/CMake/BundleTemplate/BundleTemplate.h +++ /dev/null @@ -1,26 +0,0 @@ -@PLUGIN_COPYRIGHT@ - -#ifndef (@GENERATE_VIEW_CLASS@_H_INCLUDED) -#define @GENERATE_VIEW_CLASS@_H_INCLUDED - -#include -#include -#include - -#include - -namespace berry { - -class BERRY_RUNTIME @GENERATE_VIEW_CLASS@ : public Plugin -{ -public: - - static const std::string @PLUGIN_ID@; - - void Start(IBundleContext::Pointer context); - -}; - -} - -#endif /*@GENERATE_VIEW_CLASS@_H_INCLUDED*/ diff --git a/BlueBerry/CMake/BundleTemplate/CMakeListsTemplate.txt b/BlueBerry/CMake/BundleTemplate/CMakeListsTemplate.txt deleted file mode 100644 index 43071944bb..0000000000 --- a/BlueBerry/CMake/BundleTemplate/CMakeListsTemplate.txt +++ /dev/null @@ -1,2 +0,0 @@ - -@CREATE_PLUGIN_MACRO@ diff --git a/BlueBerry/CMake/BundleTemplate/META-INF/MANIFEST_TEMPLATE.MF b/BlueBerry/CMake/BundleTemplate/META-INF/MANIFEST_TEMPLATE.MF deleted file mode 100644 index 0343e4c83a..0000000000 --- a/BlueBerry/CMake/BundleTemplate/META-INF/MANIFEST_TEMPLATE.MF +++ /dev/null @@ -1,7 +0,0 @@ -Manifest-Version: 1.0 -Bundle-Name: @PLUGIN_NAME@ -Bundle-SymbolicName: @PLUGIN_ID@ -Bundle-Version: @PLUGIN_VERSION@ -Bundle-Vendor: @PLUGIN_VENDOR@ -Require-Bundle: @REQUIRED_PLUGINS_MF@ -Bundle-Activator: @FQ_ACTIVATOR_CLASS@ \ No newline at end of file diff --git a/BlueBerry/CMake/BundleTemplate/documentation/doxygen/modulesTemplate.dox b/BlueBerry/CMake/BundleTemplate/documentation/doxygen/modulesTemplate.dox deleted file mode 100644 index 40ff4b9720..0000000000 --- a/BlueBerry/CMake/BundleTemplate/documentation/doxygen/modulesTemplate.dox +++ /dev/null @@ -1,16 +0,0 @@ -/** - \defgroup @NormalizedPluginID@ @PLUGIN_ID@ Plugin - @DOXYGEN_INGROUP_CMD@ - - \brief Describe your plugin here. - -*/ - -/** - \defgroup @NormalizedPluginID@_internal Internal - \ingroup @NormalizedPluginID@ - - \brief This subcategory includes the internal classes of the @PLUGIN_ID@ plugin. Other - plugins must not rely on these classes. They contain implementation details and their interface - may change at any time. We mean it. -*/ \ No newline at end of file diff --git a/BlueBerry/CMake/BundleTemplate/filesTemplate.cmake b/BlueBerry/CMake/BundleTemplate/filesTemplate.cmake deleted file mode 100644 index cd249d5cd9..0000000000 --- a/BlueBerry/CMake/BundleTemplate/filesTemplate.cmake +++ /dev/null @@ -1,18 +0,0 @@ -SET(SRC_CPP_FILES - @PLUGIN_SOURCES@ -) - -SET(INTERNAL_CPP_FILES - @PLUGIN_INTERNAL_SOURCES@ -) - -@SET_MANIFEST_SRC@ - -foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) -endforeach(file ${SRC_CPP_FILES}) - -foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) -endforeach(file ${INTERNAL_CPP_FILES}) - diff --git a/BlueBerry/CMake/BundleTemplate/manifestTemplate.cpp b/BlueBerry/CMake/BundleTemplate/manifestTemplate.cpp deleted file mode 100755 index ee2301e29d..0000000000 --- a/BlueBerry/CMake/BundleTemplate/manifestTemplate.cpp +++ /dev/null @@ -1,12 +0,0 @@ -@PLUGIN_COPYRIGHT@ - -#include "Poco/ClassLibrary.h" - -#include -#include "src/internal/@VIEW_CLASS_H@" - - -//******************** Views ********************** -POCO_BEGIN_NAMED_MANIFEST(berryIViewPart, berry::IViewPart) - POCO_EXPORT_CLASS(@BUNDLE_NAMESPACE@::@VIEW_CLASS@) -POCO_END_MANIFEST diff --git a/BlueBerry/CMake/BundleTemplate/pluginTemplate.xml b/BlueBerry/CMake/BundleTemplate/pluginTemplate.xml deleted file mode 100755 index 73704913d0..0000000000 --- a/BlueBerry/CMake/BundleTemplate/pluginTemplate.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - -@XP_VIEW@ - - diff --git a/BlueBerry/CMake/BundleTemplate/src/BundleDllTemplate.h b/BlueBerry/CMake/BundleTemplate/src/BundleDllTemplate.h deleted file mode 100644 index 10e997317f..0000000000 --- a/BlueBerry/CMake/BundleTemplate/src/BundleDllTemplate.h +++ /dev/null @@ -1,28 +0,0 @@ -@PLUGIN_COPYRIGHT@ - -#ifndef _@DLL_DEFINE@_DLL_H_ -#define _@DLL_DEFINE@_DLL_H_ - - -// -// The following block is the standard way of creating macros which make exporting -// from a DLL simpler. All files within this DLL are compiled with the @NormalizedPluginID@_EXPORTS -// symbol defined on the command line. this symbol should not be defined on any project -// that uses this DLL. This way any other project whose source files include this file see -// @NormalizedPluginID@_EXPORTS functions as being imported from a DLL, wheras this DLL sees symbols -// defined with this macro as being exported. -// -#if defined(_WIN32) && !defined(@PROJECT_STATIC_VAR@) - #if defined(@NormalizedPluginID@_EXPORTS) - #define @DLL_DEFINE@ __declspec(dllexport) - #else - #define @DLL_DEFINE@ __declspec(dllimport) - #endif -#endif - - -#if !defined(@DLL_DEFINE@) - #define @DLL_DEFINE@ -#endif - -#endif /*_@DLL_DEFINE@_DLL_H_*/ diff --git a/BlueBerry/CMake/BundleTemplate/src/internal/ViewTemplate.cpp b/BlueBerry/CMake/BundleTemplate/src/internal/ViewTemplate.cpp deleted file mode 100644 index 26d9f4cfeb..0000000000 --- a/BlueBerry/CMake/BundleTemplate/src/internal/ViewTemplate.cpp +++ /dev/null @@ -1,26 +0,0 @@ -@PLUGIN_COPYRIGHT@ - -#include -#include -#include - -#include "@VIEW_CLASS_H@" - -@BEGIN_NAMESPACE@ - -const std::string @VIEW_CLASS@::VIEW_ID = "@VIEW_ID@"; - -void @VIEW_CLASS@::CreateQtPartControl(QWidget* parent) -{ - QVBoxLayout* layout = new QVBoxLayout(parent); - layout->setContentsMargins(0,0,0,0); - m_ButtonStart = new QPushButton("start", parent); - layout->addWidget(m_ButtonStart); -} - -void @VIEW_CLASS@::SetFocus() -{ - m_ButtonStart->setFocus(); -} - -@END_NAMESPACE@ diff --git a/BlueBerry/CMake/BundleTemplate/src/internal/ViewTemplate.h b/BlueBerry/CMake/BundleTemplate/src/internal/ViewTemplate.h deleted file mode 100644 index 4d3a7664d9..0000000000 --- a/BlueBerry/CMake/BundleTemplate/src/internal/ViewTemplate.h +++ /dev/null @@ -1,50 +0,0 @@ -@PLUGIN_COPYRIGHT@ - -#ifndef @UBUNDLE_NAMESPACE@_@UVIEW_CLASS@_H_INCLUDED -#define @UBUNDLE_NAMESPACE@_@UVIEW_CLASS@_H_INCLUDED - -#include <@VIEW_BASE_CLASS_H@> -#include - -class QWidget; -class QPushButton; - -@BEGIN_NAMESPACE@ - -/*! - * \ingroup @NormalizedPluginID@_internal - * - * \brief @PLUGIN_NAME@ - * - * You need to reimplement the methods SetFocus() and CreateQtPartControl(QWidget*) - * from @VIEW_BASE_CLASS@ - * - * \sa @VIEW_BASE_CLASS@ - */ -class @VIEW_CLASS@ : public @VIEW_BASE_CLASS@ -{ -public: - - static const std::string VIEW_ID; - - /*! - * \brief Gives focus to a specific control in the view - * This method is called from the framework when the view is activated. - */ - void SetFocus(); - -protected: - - /*! - * \brief Builds the user interface of the view - * This method is called from the framework. The parent widget has no layout, so - * you should set one adapted to your needs. - */ - void CreateQtPartControl(QWidget* parent); - - QPushButton* m_ButtonStart; -}; - -@END_NAMESPACE@ - -#endif /*@UBUNDLE_NAMESPACE@_@UVIEW_CLASS@_H_INCLUDED*/ diff --git a/BlueBerry/CMake/MacroCollectPlugins.cmake b/BlueBerry/CMake/MacroCollectPlugins.cmake deleted file mode 100755 index 1396bc7bf9..0000000000 --- a/BlueBerry/CMake/MacroCollectPlugins.cmake +++ /dev/null @@ -1,197 +0,0 @@ -# Recursively searches for plugins (i.e. directories containing a -# META-INF/MANIFEST.MF file). The macro adds the found directories -# to cmake and writes information about the configured plug-ins in a file -# -# MACRO_COLLECT_PLUGINS(OUTPUT_DIR plugin_output_dir -# [CACHE_PLUGIN_SOURCE_DIRS cache_src_dirs] -# [CACHE_PLUGIN_OUTPUT_DIRS cache_out_dirs] -# [CACHE_PLUGIN_TARGETS cache_plugin_targets] -# [BUNDLE_LIST_PATH bundle_list_path] -# [CMAKE_CACHE_PREFIX cache_prefix] -# [ENABLE_PLUGIN_MACROS macro...] -# [PLUGIN_DEFAULT_ON id...] -# [PLUGIN_EXCLUDES id...] -# [DEFAULT_BUILD_ON] -# [FORCE_BUILD_ALL] -# ) -# -# plugin_output_dir is the common binary output directory for all -# plugins found. It is available as PLUGINS_OUTPUT_BASE_DIR -# and used by the MACRO_CREATE_PLUGIN macro. -# -# CACHE_PLUGIN_SOURCE_DIRS and CACHE_PLUGIN_OUTPUT_DIRS -# names of CMake cache variables where the base plugin source -# and output directories will be appended. This is useful if this -# macro is invoked multiple times in different places and you want -# to record the directories. The variables -# can than later be used to configure your applications .ini file. -# Be sure to clear the cache variables before the first invokation -# of this macro. -# -# CACHE_PLUGIN_TARGETS -# is used as the name of a cache variable which -# stores a list of enabled plug-ins (their CMake target names) -# -# BUNDLE_LIST_PATH -# The full path for the generated cmake file containing the _BUILD_ -# variables. If not set, "${PROJECT_BINARY_DIR}/${PROJECT_NAME}BundleList.cmake" -# is used. -# -# CMAKE_CACHE_PREFIX -# is prepended to the CMake cache variables -# -# ENABLE_PLUGIN_MACROS -# macro... is a list containing macro names which will be evaluated -# to determine if a specific plug-in should be build. The parameter list of -# the macro is () and the macro must set the variable -# ENABLE_PLUGIN to true or false. For Qt4, a default macro is provided. -# -# PLUGIN_DEFAULT_ON -# id... is a list of bundle symbolic names for which the -# CMake build option should default to ON -# -# PLUGIN_EXCLUDES -# id... is a list of bundle symbolic names which will be excluded from -# the build process -# -# DEFAULT_BUILD_ON if set, the generated CMake option for building plug-ins -# defaults to ON. Otherwise, it is set to OFF. -# -# FORCE_BUILD_ALL if set, the BUILD_pluginname variables are ignored and all -# plugins under this directory are build -# -# -# The following variables can be used after the macro is invoked: -# -# PLUGINS_SOURCE_BASE_DIR the directory where this macro has been invoked -# PLUGINS_OUTPUT_BASE_DIR the output directory for the bundles -# ENABLED_PLUGINS_RELATIVE_DIRS a list of bundle directories relative to -# PLUGINS_SOURCE_BASE_DIR which are build -# ENABLED_PLUGINS_ABSOLUTE_DIRS the same as ENABLED_PLUGINS_RELATIVE_DIRS -# but with absolute paths -# -MACRO(MACRO_COLLECT_PLUGINS) - -MACRO_PARSE_ARGUMENTS(_COLLECT "OUTPUT_DIR;CACHE_PLUGIN_SOURCE_DIRS;CACHE_PLUGIN_OUTPUT_DIRS;CACHE_PLUGIN_TARGETS;BUNDLE_LIST_PATH;PLUGIN_EXCLUDES;PLUGIN_DEFAULT_ON;CMAKE_CACHE_PREFIX;ENABLE_PLUGIN_MACROS" "DEFAULT_BUILD_ON;FORCE_BUILD_ALL" ${ARGN}) - -IF(NOT _COLLECT_ADD_DIR) - SET(_COLLECT_ADD_DIR 1) -ENDIF(NOT _COLLECT_ADD_DIR) - -IF(NOT _COLLECT_BUNDLE_LIST_PATH) - SET(_COLLECT_BUNDLE_LIST_PATH "${PROJECT_BINARY_DIR}/${PROJECT_NAME}BundleList.cmake") -ENDIF(NOT _COLLECT_BUNDLE_LIST_PATH) - -IF(_COLLECT_CMAKE_CACHE_PREFIX) - SET(_COLLECT_CMAKE_CACHE_PREFIX "${_COLLECT_CMAKE_CACHE_PREFIX}_") -ENDIF(_COLLECT_CMAKE_CACHE_PREFIX) - -LIST(APPEND _COLLECT_ENABLE_PLUGIN_MACROS "_MACRO_ENABLE_QT4_PLUGINS") - -SET(PLUGINS_OUTPUT_BASE_DIR ${_COLLECT_OUTPUT_DIR}) - -# writes the file ${CMAKE_CURRENT_BINARY_DIR}/berryEnablePlugin.cmake -_MACRO_CREATE_ENABLE_PLUGIN_CODE(${_COLLECT_ENABLE_PLUGIN_MACROS}) - -SET(PLUGINS_SOURCE_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - -IF(_COLLECT_CACHE_PLUGIN_SOURCE_DIRS) - SET(${_COLLECT_CACHE_PLUGIN_SOURCE_DIRS} ${${_COLLECT_CACHE_PLUGIN_SOURCE_DIRS}} "\"${PLUGINS_SOURCE_BASE_DIR}\"" - CACHE INTERNAL "List of base plugin source directories" FORCE) -ENDIF(_COLLECT_CACHE_PLUGIN_SOURCE_DIRS) - -IF(_COLLECT_CACHE_PLUGIN_OUTPUT_DIRS) - SET(${_COLLECT_CACHE_PLUGIN_OUTPUT_DIRS} ${${_COLLECT_CACHE_PLUGIN_OUTPUT_DIRS}} "${_COLLECT_OUTPUT_DIR}" - CACHE INTERNAL "List of base plugin output directories" FORCE) -ENDIF(_COLLECT_CACHE_PLUGIN_OUTPUT_DIRS) - -SET(ENABLED_PLUGINS_RELATIVE_DIRS ) -SET(ENABLED_PLUGINS_ABSOLUTE_DIRS ) -SET(_plugins_target_list ) -FILE(GLOB all_dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *) -FOREACH(dir_relative_entry ${all_dirs}) - SET(dir_entry "${CMAKE_CURRENT_SOURCE_DIR}/${dir_relative_entry}") - IF(EXISTS "${dir_entry}/META-INF/MANIFEST.MF") - MACRO_PARSE_MANIFEST("${dir_entry}/META-INF/MANIFEST.MF" OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${dir_relative_entry}") - - IF(BUNDLE-SYMBOLICNAME) - - LIST(FIND _COLLECT_PLUGIN_EXCLUDES ${BUNDLE-SYMBOLICNAME} _excluded) - IF(_excluded EQUAL -1) - - # include the generated file with the custom macro code for - # checking if a bundle should be enabled - INCLUDE("${_enable_plugins_file}") - - IF(_enable_bundle) - # The bundle is considered valid for the current configuration - # i.e. a build option will be displayed and internal variables are set - - SET(${BUNDLE-SYMBOLICNAME}_SRC_DIR "${dir_entry}") - SET(${BUNDLE-SYMBOLICNAME}_BIN_DIR "${CMAKE_CURRENT_BINARY_DIR}/${dir_relative_entry}") - SET(${BUNDLE-SYMBOLICNAME}_OUT_DIR "${_COLLECT_OUTPUT_DIR}/${BUNDLE-SYMBOLICNAME}") - # write the variable in .cmake file, so external projects have access to them - SET(BLUEBERRY_BUNDLE_VARIABLES "${BLUEBERRY_BUNDLE_VARIABLES} -SET(${BUNDLE-SYMBOLICNAME}_SRC_DIR \"${${BUNDLE-SYMBOLICNAME}_SRC_DIR}\") -SET(${BUNDLE-SYMBOLICNAME}_BIN_DIR \"${${BUNDLE-SYMBOLICNAME}_BIN_DIR}\") -SET(${BUNDLE-SYMBOLICNAME}_OUT_DIR \"${${BUNDLE-SYMBOLICNAME}_OUT_DIR}\")") - - # compute the default for the build option (ON/OFF) - SET(_default_bundle_option ${_COLLECT_DEFAULT_BUILD_ON}) - LIST(FIND _COLLECT_PLUGIN_DEFAULT_ON ${BUNDLE-SYMBOLICNAME} _PLUGIN_DEFAULT_ON_found) - IF(_PLUGIN_DEFAULT_ON_found GREATER -1) - SET(_default_bundle_option 1) - ENDIF() - - OPTION("${_COLLECT_CMAKE_CACHE_PREFIX}BUILD_${BUNDLE-SYMBOLICNAME}" "Build ${BUNDLE-SYMBOLICNAME} Plugin" ${_default_bundle_option}) - - # test if the bundle should be build - IF(${_COLLECT_CMAKE_CACHE_PREFIX}BUILD_${BUNDLE-SYMBOLICNAME} OR _COLLECT_FORCE_BUILD_ALL) - LIST(APPEND ENABLED_PLUGINS_RELATIVE_DIRS "${dir_relative_entry}") - LIST(APPEND ENABLED_PLUGINS_ABSOLUTE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/${dir_relative_entry}") - STRING(REPLACE . _ _plugin_target ${BUNDLE-SYMBOLICNAME}) - - SET(${dir_relative_entry}_forced_build ${_COLLECT_FORCE_BUILD_ALL}) - - # record that this bundle is being build. - SET(_BUILD_${BUNDLE-SYMBOLICNAME} 1) - SET(BLUEBERRY_BUNDLE_VARIABLES "${BLUEBERRY_BUNDLE_VARIABLES} -SET(_BUILD_${BUNDLE-SYMBOLICNAME} 1)") - - ELSE() - # the build option for the bundle is off, hence we delete the MANIFEST.MF - # file in the output directory to prevent the bundle loader from finding - # the disabled bundle. - FILE(REMOVE "${${BUNDLE-SYMBOLICNAME}_OUT_DIR}/META-INF/MANIFEST.MF") - ENDIF() - ENDIF() - ENDIF() - ENDIF() - ENDIF() -ENDFOREACH() - -# add Poco directories for all plugins -INCLUDE_DIRECTORIES(${Poco_INCLUDE_DIRS}) -LINK_DIRECTORIES(${Poco_LIBRARY_DIR}) - -SET(PLUGIN_TARGETS "" CACHE INTERNAL "Temporary list of plug-in targets") -FOREACH(_subdir ${ENABLED_PLUGINS_RELATIVE_DIRS}) - INCLUDE("${CMAKE_CURRENT_BINARY_DIR}/${_subdir}/Manifest.cmake") - IF(${_subdir}_forced_build) - SET(CURRENT_PLUGIN_BUILD_FORCED ON) - ELSE() - SET(CURRENT_PLUGIN_BUILD_FORCED OFF) - ENDIF() - #MACRO_PARSE_MANIFEST("${CMAKE_CURRENT_SOURCE_DIR}/${_subdir}/META-INF/MANIFEST.MF") - ADD_SUBDIRECTORY(${_subdir}) -ENDFOREACH(_subdir ${ENABLED_PLUGINS_RELATIVE_DIRS}) - -IF(_COLLECT_CACHE_PLUGIN_TARGETS) - SET(${_COLLECT_CACHE_PLUGIN_TARGETS} ${PLUGIN_TARGETS} CACHE INTERNAL "A list of enabled plug-ins") -ENDIF(_COLLECT_CACHE_PLUGIN_TARGETS) - -IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/BundleList.cmake.in) - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/BundleList.cmake.in" "${_COLLECT_BUNDLE_LIST_PATH}" @ONLY) -ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/BundleList.cmake.in) - -ENDMACRO(MACRO_COLLECT_PLUGINS) diff --git a/BlueBerry/CMake/MacroCreatePlugin.cmake b/BlueBerry/CMake/MacroCreatePlugin.cmake deleted file mode 100755 index bbeb9e50b9..0000000000 --- a/BlueBerry/CMake/MacroCreatePlugin.cmake +++ /dev/null @@ -1,218 +0,0 @@ -# MACRO_CREATE_PLUGIN() -# -# Creates the current plugin. -# This macro should be called from the plugins CMakeLists.txt file. The plugin -# library is build in a subdirectory of PLUGIN_OUTPUT_DIR, which is derived from -# the variable PLUGIN_OUTPUT_BASE_DIR coming from COLLECT_PLUGINS(). -# The target name is available as PLUGIN_TARGET -# to add additional libraries in your CMakeLists.txt. Include paths and link -# libraries are set depending on the value of the Required-Bundles header -# in your plugins MANIFEST.MF file. -# -# Available variables: -# -# - PLUGIN_OUTPUT_DIR the binary output directory of your plugin -# - PLUGIN_TARGET the target name of your plugins dll -# -# -MACRO(MACRO_CREATE_PLUGIN) - - IF(MSVC80) - ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) - ENDIF(MSVC80) - - MESSAGE(STATUS "Creating plugin ${BUNDLE-SYMBOLICNAME}") - PROJECT(${BUNDLE-SYMBOLICNAME}) - - STRING(REPLACE . _ PLUGIN_TARGET ${BUNDLE-SYMBOLICNAME}) - - SET(PLUGIN_OUTPUT_DIR ${${BUNDLE-SYMBOLICNAME}_OUT_DIR}) - FILE(MAKE_DIRECTORY ${PLUGIN_OUTPUT_DIR}) - - INCLUDE(files.cmake) - - SET(PLUGIN_CPP_FILES ${CPP_FILES}) - SET(PLUGIN_MOC_H_FILES ${MOC_H_FILES}) - SET(PLUGIN_UI_FILES ${UI_FILES}) - SET(PLUGIN_RESOURCE_FILES ${RESOURCE_FILES}) - SET(PLUGIN_RES_FILES ${RES_FILES}) - SET(PLUGIN_H_FILES ${H_FILES}) - SET(PLUGIN_TXX_FILES ${TXX_FILES}) - SET(PLUGIN_DOX_FILES ${DOX_FILES}) - SET(PLUGIN_CMAKE_FILES ${CMAKE_FILES} files.cmake) - SET(PLUGIN_FILE_DEPENDENCIES ${FILE_DEPENDENCIES}) - - - # Copy the META-INF directory into the binary output dir - - SET (PLUGIN_META_FILES ${PLUGIN_META_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/META-INF/MANIFEST.MF) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/META-INF/MANIFEST.MF ${PLUGIN_OUTPUT_DIR}/META-INF/MANIFEST.MF COPYONLY) - - # Copy the plugin.xml into the binary output dir - SET(PLUGINXML ${CMAKE_CURRENT_SOURCE_DIR}/plugin.xml) - IF(EXISTS ${PLUGINXML}) - SET (PLUGIN_META_FILES ${PLUGIN_META_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/plugin.xml) - CONFIGURE_FILE(${PLUGINXML} ${PLUGIN_OUTPUT_DIR}/plugin.xml COPYONLY) - ENDIF(EXISTS ${PLUGINXML}) - - # Copy the resource files into the binary output dir - FOREACH(_resource ${PLUGIN_RESOURCE_FILES}) - CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/${_resource}" "${PLUGIN_OUTPUT_DIR}/${_resource}" COPYONLY) - ENDFOREACH(_resource ${PLUGIN_RESOURCE_FILES}) - - SET(PLUGIN_GENERATED_UI_FILES ) - IF(PLUGIN_UI_FILES) - QT4_WRAP_UI(PLUGIN_GENERATED_UI_FILES ${PLUGIN_UI_FILES}) - ENDIF(PLUGIN_UI_FILES) - - SET(PLUGIN_GENERATED_MOC_FILES ) - IF(PLUGIN_MOC_H_FILES) - # this is a workaround for Visual Studio. The relative include paths in the generated - # moc files can get very long and can't be resolved by the MSVC compiler. See bug #1961 - # for details. - FOREACH(moc_h_file ${PLUGIN_MOC_H_FILES}) - QT4_WRAP_CPP(PLUGIN_GENERATED_MOC_FILES ${moc_h_file} OPTIONS -f${moc_h_file}) - ENDFOREACH(moc_h_file) - ENDIF(PLUGIN_MOC_H_FILES) - - SET(PLUGIN_GENERATED_QRC_FILES ) - IF(PLUGIN_RES_FILES) - QT4_ADD_RESOURCES(PLUGIN_GENERATED_QRC_FILES ${PLUGIN_RES_FILES}) - ENDIF(PLUGIN_RES_FILES) - - #------------------------------------------------------------# - #------------------ Qt Help support -------------------------# - - SET(PLUGIN_GENERATED_QCH_FILES ) - IF (BLUEBERRY_USE_QT_HELP AND - EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/documentation/UserManual") - SET(PLUGIN_DOXYGEN_INPUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/documentation/UserManual") - SET(PLUGIN_DOXYGEN_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/documentation/UserManual") - _MACRO_CREATE_QT_COMPRESSED_HELP(PLUGIN_GENERATED_QCH_FILES ) - ENDIF() - - - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}) - IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/includes.cmake") - INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/includes.cmake) - FOREACH(_added_incldir ${ADDITIONAL_INCLUDE_DIRECTORIES}) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/${_added_incldir}) - ENDFOREACH() - ENDIF() - _MACRO_SETUP_PLUGIN_DEPENDENCIES(_linklibs) - - MACRO_ORGANIZE_SOURCES(SOURCE ${PLUGIN_CPP_FILES} - HEADER ${PLUGIN_H_FILES} - TXX ${PLUGIN_TXX_FILES} - DOC ${PLUGIN_DOX_FILES} - UI ${PLUGIN_UI_FILES} - QRC ${PLUGIN_RES_FILES} - META ${PLUGIN_META_FILES} - MOC ${PLUGIN_GENERATED_MOC_FILES} - GEN_UI ${PLUGIN_GENERATED_UI_FILES} - GEN_QRC ${PLUGIN_GENERATED_QRC_FILES}) - - SET(_all_target_files - ${PLUGIN_CPP_FILES} - ${PLUGIN_H_FILES} - ${PLUGIN_TXX_FILES} - ${PLUGIN_DOX_FILES} - ${PLUGIN_UI_FILES} - ${PLUGIN_RES_FILES} - ${PLUGIN_META_FILES} - ${PLUGIN_GENERATED_MOC_FILES} - ${PLUGIN_GENERATED_UI_FILES} - ${PLUGIN_GENERATED_QRC_FILES} - ${PLUGIN_GENERATED_QCH_FILES} - ${PLUGIN_CMAKE_FILES} - ${CORRESPONDING__H_FILES} - ${GLOBBED__H_FILES} - ${PLUGIN_FILE_DEPENDENCIES} - ) - - ADD_LIBRARY(${PLUGIN_TARGET} ${_all_target_files}) - SET(PLUGIN_TARGETS ${PLUGIN_TARGETS} ${PLUGIN_TARGET} CACHE INTERNAL "Temporary list of plug-in targets") - SET_TARGET_PROPERTIES(${PLUGIN_TARGET} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${PLUGIN_OUTPUT_DIR}/bin" - LIBRARY_OUTPUT_DIRECTORY "${PLUGIN_OUTPUT_DIR}/bin" - ARCHIVE_OUTPUT_DIRECTORY "${PLUGIN_OUTPUT_DIR}/bin" - DEBUG_POSTFIX ${BLUEBERRY_DEBUG_POSTFIX}) - - IF(mbilog_FOUND) - TARGET_LINK_LIBRARIES(${PLUGIN_TARGET} mbilog) - ENDIF() - - # we need to explicitly state the debug versions of the libraries - # we are linking to in the TARGET_LINK_LIBRARIES command. - # Although we set the debug postfix to d, CMake automatically - # appends it in a TARGET_LINK_LIBRARIES(target lib1) command only - # if lib1 has been build within the same project. - # External projects using this macro would therefore always link - # to lib1, instead of lib1d in debug configurations - SET(_debug_linklibs "") - FOREACH(_linklib ${PLUGIN_LINK_LIBRARIES}) - # Use a hack to test if the dependency is a BlueBerry bundle - STRING(REPLACE . _ _symbolic_name ${_linklib}) - IF(EXISTS "${${_symbolic_name}_OUT_DIR}") - SET(_debug_linklibs ${_debug_linklibs} optimized "${_linklib}" debug "${_linklib}${BLUEBERRY_DEBUG_POSTFIX}") - ELSE() - SET(_debug_linklibs ${_debug_linklibs} ${_linklib}) - ENDIF() - ENDFOREACH(_linklib) - - TARGET_LINK_LIBRARIES(${PLUGIN_TARGET} ${_debug_linklibs}) - TARGET_LINK_LIBRARIES(${PLUGIN_TARGET} - optimized "PocoFoundation" debug "PocoFoundation${BLUEBERRY_DEBUG_POSTFIX}" - optimized "PocoUtil" debug "PocoUtil${BLUEBERRY_DEBUG_POSTFIX}" - optimized "PocoXML" debug "PocoXML${BLUEBERRY_DEBUG_POSTFIX}") - - # Fix a "bug" in CMake, which does not include all transitive link libraries for a given target - LIST(FIND PLUGIN_LINK_LIBRARIES org_blueberry_test _is_unittest_plugin) - IF(NOT _is_unittest_plugin EQUAL -1) - TARGET_LINK_LIBRARIES(${PLUGIN_TARGET} optimized CppUnit debug CppUnitd) - ENDIF() - - IF(MINGW) - TARGET_LINK_LIBRARIES(${PLUGIN_TARGET} ssp) # add stack smash protection lib - ENDIF() - - #SET_TARGET_PROPERTIES(${PLUGIN_TARGET} PROPERTIES PREFIX lib IMPORT_PREFIX lib) - SET_TARGET_PROPERTIES(${PLUGIN_TARGET} PROPERTIES PREFIX lib) - - - #------------------------------------------------------------# - #------------------ Installer support -----------------------# - SET(install_directories "") - IF(NOT MACOSX_BUNDLE_NAMES) - SET(install_directories bin) - ELSE(NOT MACOSX_BUNDLE_NAMES) - FOREACH(bundle_name ${MACOSX_BUNDLE_NAMES}) - LIST(APPEND install_directories ${bundle_name}.app/Contents/MacOS) - ENDFOREACH(bundle_name) - ENDIF(NOT MACOSX_BUNDLE_NAMES) - -FOREACH(install_subdir ${install_directories}) - - FILE(RELATIVE_PATH _toplevel_dir "${PLUGINS_SOURCE_BASE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}") - STRING(REGEX REPLACE ".*/(.+)/?$" "\\1" _toplevel_output_dir ${PLUGINS_OUTPUT_BASE_DIR}) - MACRO_INSTALL_PLUGIN("${PLUGINS_OUTPUT_BASE_DIR}/${_toplevel_dir}" - TARGETS ${PLUGIN_TARGET} - DESTINATION "${install_subdir}/${_toplevel_output_dir}") - -ENDFOREACH() - -ENDMACRO(MACRO_CREATE_PLUGIN) - - -# Macro to set specific Qt options, calls CREATE_PLUGIN at the end -MACRO(MACRO_CREATE_QT_PLUGIN) - - IF(QT4_FOUND) - INCLUDE(${QT_USE_FILE}) - - MACRO_CREATE_PLUGIN() - - TARGET_LINK_LIBRARIES(${PLUGIN_TARGET} ${QT_LIBRARIES}) - ENDIF(QT4_FOUND) - -ENDMACRO(MACRO_CREATE_QT_PLUGIN) diff --git a/BlueBerry/CMake/MacroCreateQtHelp.cmake b/BlueBerry/CMake/MacroCreateQtHelp.cmake index 28b2acbbf2..4f0d158de2 100644 --- a/BlueBerry/CMake/MacroCreateQtHelp.cmake +++ b/BlueBerry/CMake/MacroCreateQtHelp.cmake @@ -1,62 +1,42 @@ -MACRO(_MACRO_CREATE_QT_COMPRESSED_HELP qch_file) - - CONFIGURE_FILE(${BlueBerry_SOURCE_DIR}/CMake/berryQtHelpDoxygen.conf.in - ${PLUGIN_DOXYGEN_OUTPUT_DIR}/doxygen.conf - ) - - SET(_generated_qch_file "${PLUGIN_DOXYGEN_OUTPUT_DIR}/qch/${BUNDLE-NAME}.qch") - SET(${qch_file} "${PLUGIN_OUTPUT_DIR}/resources/${BUNDLE-SYMBOLICNAME}.qch") - - FILE(GLOB _file_dependencies "${PLUGIN_DOXYGEN_INPUT_DIR}/*.dox") - - ADD_CUSTOM_COMMAND(OUTPUT ${${qch_file}} - COMMAND ${DOXYGEN_EXECUTABLE} ${PLUGIN_DOXYGEN_OUTPUT_DIR}/doxygen.conf - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_generated_qch_file} ${${qch_file}} - DEPENDS ${PLUGIN_DOXYGEN_OUTPUT_DIR}/doxygen.conf ${_file_dependencies} - ) - - #SET_SOURCE_FILES_PROPERTIES(${qch_file} PROPERTIES GENERATED 1) - -ENDMACRO() FUNCTION(_FUNCTION_CREATE_CTK_QT_COMPRESSED_HELP qch_file use_xsl) SET(_manifest_path "${CMAKE_CURRENT_SOURCE_DIR}/manifest_headers.cmake") IF(NOT EXISTS ${_manifest_path}) MESSAGE(FATAL_ERROR "${_manifest_path} not found") ENDIF() INCLUDE(${_manifest_path}) STRING(REPLACE "_" "." Plugin-SymbolicName "${PLUGIN_TARGET}") CONFIGURE_FILE(${BlueBerry_SOURCE_DIR}/CMake/berryCTKQtHelpDoxygen.conf.in ${PLUGIN_DOXYGEN_OUTPUT_DIR}/doxygen.conf ) SET(_qhp_xsl_file "${BlueBerry_SOURCE_DIR}/CMake/qhp_toc.xsl") SET(_generated_qhp_file "${PLUGIN_DOXYGEN_OUTPUT_DIR}/html/index.qhp") SET(_transformed_qhp_file "${PLUGIN_DOXYGEN_OUTPUT_DIR}/html/${PLUGIN_TARGET}.qhp") SET(${qch_file} "${CMAKE_CURRENT_BINARY_DIR}/resources/${PLUGIN_TARGET}.qch") SET(_xsl_command ) IF(use_xsl) SET(_xsl_command COMMAND ${QT_XMLPATTERNS_EXECUTABLE} ${_qhp_xsl_file} ${_generated_qhp_file} -output ${_transformed_qhp_file}) ENDIF() FILE(GLOB _file_dependencies "${PLUGIN_DOXYGEN_INPUT_DIR}/*") ADD_CUSTOM_COMMAND(OUTPUT ${${qch_file}} # Generate a Qt help project (index.qhp) with doxygen COMMAND ${DOXYGEN_EXECUTABLE} ${PLUGIN_DOXYGEN_OUTPUT_DIR}/doxygen.conf # Use a XSL transformation to get rid of the top-level entry ${_xsl_command} # Generate the final Qt compressed help file (.qch) COMMAND ${QT_HELPGENERATOR_EXECUTABLE} ${_transformed_qhp_file} -o ${${qch_file}} DEPENDS ${PLUGIN_DOXYGEN_OUTPUT_DIR}/doxygen.conf ${_file_dependencies} ) #SET_SOURCE_FILES_PROPERTIES(${qch_file} PROPERTIES GENERATED 1) SET(${qch_file} ${${qch_file}} PARENT_SCOPE) ENDFUNCTION() diff --git a/BlueBerry/CMake/MacroInstallPlugin.cmake b/BlueBerry/CMake/MacroInstallPlugin.cmake deleted file mode 100644 index 43c7d4f5a8..0000000000 --- a/BlueBerry/CMake/MacroInstallPlugin.cmake +++ /dev/null @@ -1,84 +0,0 @@ -# Install the given plug-in directory to the desintation directory -# -# MACRO_INSTALL_PLUGIN(plugindir [TARGETS target...] [DESTINATION dest_dir]) -# -MACRO(MACRO_INSTALL_PLUGIN _plugin_dir) - - MACRO_PARSE_ARGUMENTS(_INSTALL "TARGETS;DESTINATION" "" ${ARGN}) - - # Convert _plugin_dir into an absolute path - IF(NOT IS_ABSOLUTE _plugin_dir) - SET(_plugin_dir "${CMAKE_CURRENT_SOURCE_DIR}/${_plugin_dir}") - ENDIF() - - # Check if target names have been specified - IF(NOT _INSTALL_TARGETS) - # no targets specified. get the main target from the plug-ins manifest if it exists - IF(EXISTS "${_plugin_dir}/META-INF/MANIFEST.MF") - MACRO_PARSE_MANIFEST("${_plugin_dir}/META-INF/MANIFEST.MF") - STRING(REPLACE "." "_" _INSTALL_TARGETS ${BUNDLE-SYMBOLICNAME}) - ENDIF() - ENDIF() - - # Only continue if _INSTALL_TARGETS is set - IF(_INSTALL_TARGETS) - - IF(NOT _INSTALL_DESTINATION) - SET(_INSTALL_DESTINATION "bin/") - ELSE() - SET(_INSTALL_DESTINATION "${_INSTALL_DESTINATION}/") - ENDIF() - - STRING(REGEX REPLACE ".*/(.+)/?$" "\\1" _toplevel_plugindir ${_plugin_dir}) - SET(_plugin_install_dir "${_INSTALL_DESTINATION}${_toplevel_plugindir}") - - # Install the directory without shared libraries - INSTALL(DIRECTORY ${_plugin_dir} DESTINATION ${_INSTALL_DESTINATION} CONFIGURATIONS Debug - PATTERN "Release/*" EXCLUDE - PATTERN "bin/*" EXCLUDE - PATTERN "lib/*" EXCLUDE) - - INSTALL(DIRECTORY ${_plugin_dir} DESTINATION ${_INSTALL_DESTINATION} CONFIGURATIONS Release - PATTERN "Debug/*" EXCLUDE - PATTERN "bin/*" EXCLUDE - PATTERN "lib/*" EXCLUDE) - - SET(_target_install_rpath ${CMAKE_INSTALL_RPATH}) - FOREACH(_dep ${_plugin_dependencies}) - SET(_linklib_path "${${_dep}_OUT_DIR}") - IF(_linklib_path) - IF(BLUEBERRY_INSTALL_RPATH_RELATIVE) - #MESSAGE("replace ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} with \".\" in ${_linklib_path} ") - STRING(REPLACE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" "." _linklib_path "${_linklib_path}") - ELSE() - STRING(REPLACE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" "${CMAKE_INSTALL_PREFIX}/bin" _linklib_path "${_linklib_path}") - ENDIF() - LIST(APPEND _target_install_rpath "${_linklib_path}/bin") - ENDIF() - ENDFOREACH() - SET_TARGET_PROPERTIES(${_INSTALL_TARGETS} - PROPERTIES INSTALL_RPATH "${_target_install_rpath}") - - FOREACH(_install_target ${_INSTALL_TARGETS}) - GET_TARGET_PROPERTY(_is_imported ${_install_target} IMPORTED) - IF(_is_imported) - GET_TARGET_PROPERTY(_import_loc_debug ${_install_target} IMPORTED_LOCATION_DEBUG) - GET_TARGET_PROPERTY(_import_loc_release ${_install_target} IMPORTED_LOCATION_RELEASE) - INSTALL(FILES ${_import_loc_debug} - DESTINATION ${_plugin_install_dir}/bin - CONFIGURATIONS Debug) - INSTALL(FILES ${_import_loc_release} - DESTINATION ${_plugin_install_dir}/bin - CONFIGURATIONS Release) - ELSE() - INSTALL(TARGETS ${_INSTALL_TARGETS} - RUNTIME DESTINATION ${_plugin_install_dir}/bin - LIBRARY DESTINATION ${_plugin_install_dir}/bin - #ARCHIVE DESTINATION ${_plugin_install_dir}/bin - ) - ENDIF() - ENDFOREACH() - - ENDIF() # _INSTALL_TARGETS - -ENDMACRO() diff --git a/BlueBerry/CMake/MacroInstallThirdPartyPlugins.cmake b/BlueBerry/CMake/MacroInstallThirdPartyPlugins.cmake deleted file mode 100644 index 1170aa1a82..0000000000 --- a/BlueBerry/CMake/MacroInstallThirdPartyPlugins.cmake +++ /dev/null @@ -1,26 +0,0 @@ -MACRO(MACRO_INSTALL_THIRDPARTY_PLUGINS plugins_dir install_dir) - - SET(install_directories "") - IF(NOT MACOSX_BUNDLE_NAMES) - SET(install_directories bin) - ELSE() - FOREACH(bundle_name ${MACOSX_BUNDLE_NAMES}) - LIST(APPEND install_directories ${bundle_name}.app/Contents/MacOS) - ENDFOREACH(bundle_name) - ENDIF(NOT MACOSX_BUNDLE_NAMES) - - FILE(GLOB_RECURSE plugins - # glob for all blueberry bundles in this directory - "${plugins_dir}/liborg*${CMAKE_SHARED_LIBRARY_SUFFIX}") - - FOREACH(plugin ${plugins}) - - FILE(RELATIVE_PATH _toplevel_dir "${plugins_dir}" "${plugin}") - STRING(REGEX REPLACE "([^/]+)/.*$" "\\1" _plugin_base_dir ${_toplevel_dir}) - - FOREACH(install_subdir ${install_directories}) - MACRO_INSTALL_PLUGIN("${plugins_dir}/${_plugin_base_dir}" - DESTINATION "${install_subdir}/${install_dir}") - ENDFOREACH() - ENDFOREACH() -ENDMACRO() \ No newline at end of file diff --git a/BlueBerry/CMake/MacroParseManifest.cmake b/BlueBerry/CMake/MacroParseManifest.cmake deleted file mode 100755 index 262c6d2291..0000000000 --- a/BlueBerry/CMake/MacroParseManifest.cmake +++ /dev/null @@ -1,81 +0,0 @@ -# -# MACRO_PARSE_MANIFEST(manifest [GENERATE_CMAKE_FILE]) -# -# parses the file given as an absolute path in and -# optionally writes the key/value pairs as CMake variables in -# the current binary directory with filename _MF.cmake. -# -# The keys in the manifest file are available as upper case CMake -# variables after this macro completes. -# -MACRO(MACRO_PARSE_MANIFEST _manifest_) - - MACRO_PARSE_ARGUMENTS(_PARSE "OUTPUT" "" ${ARGN}) - - # clear all supported manifest headers - SET(BUNDLE-ACTIVATOR "") - SET(BUNDLE-COPYRIGHT "") - SET(BUNDLE-ACTIVATIONPOLICY "") - SET(BUNDLE-NAME "") - SET(BUNDLE-SYMBOLICNAME "") - SET(BUNDLE-VENDOR "") - SET(BUNDLE-VERSION "") - SET(MANIFEST-VERSION "") - SET(BERRY-SYSTEMBUNDLE "") - SET(REQUIRE-BUNDLE "") - - SET(_file "${_manifest_}") - - FILE(STRINGS "${_file}" _mflines LENGTH_MINIMUM 1 REGEX "[^ ]+.*:[]*[^ ]+") - - SET(_mfcontent "SET(BUNDLE-ACTIVATOR ) -SET(BUNDLE-COPYRIGHT ) -SET(BUNDLE-ACTIVATIONPOLICY ) -SET(BUNDLE-NAME ) -SET(BUNDLE-SYMBOLICNAME ) -SET(BUNDLE-VENDOR ) -SET(BUNDLE-VERSION ) -SET(MANIFEST-VERSION ) -SET(BERRY-SYSTEMBUNDLE ) -SET(REQUIRE-BUNDLE )") - - SET(_rbcontent "SET(REQUIRE-BUNDLE )") - - FOREACH(_line ${_mflines}) - STRING(REGEX MATCH "[^ ^:]+" _key "${_line}") - STRING(REGEX REPLACE "^[^:]*[:](.*)" "\\1" _value "${_line}") - - STRING(STRIP "${_value}" _value) - - #MESSAGE(SEND_ERROR "(${_key}, ${_value})") - - STRING(TOUPPER "${_key}" _ukey) - - IF(${_ukey} STREQUAL "REQUIRE-BUNDLE") - # special handling for Require-Bundle - # we generate a proper CMake list out of the comma-separated bundle-ids - STRING(REPLACE "," ";" _value ${_value}) - - FOREACH(_dep ${_value}) - # remove leading and trailing whitespace - STRING(STRIP ${_dep} _trimeddep) - LIST(APPEND ${_ukey} ${_trimeddep}) - ENDFOREACH() - - SET(_rbcontent "SET(REQUIRE-BUNDLE \"${${_ukey}}\")") - ELSE() - SET(${_ukey} "${_value}") - ENDIF() - - SET(_mfcontent "${_mfcontent} - -SET(${_ukey} \"${${_ukey}}\")") - - ENDFOREACH(_line ${_mflines}) - - IF(_PARSE_OUTPUT) - CONFIGURE_FILE("${BLUEBERRY_SOURCE_DIR}/CMake/berryPluginManifest.cmake.in" "${_PARSE_OUTPUT}/Manifest.cmake" @ONLY) - CONFIGURE_FILE("${BLUEBERRY_SOURCE_DIR}/CMake/berryRequireBundle.cmake.in" "${_PARSE_OUTPUT}/RequireBundle.cmake" @ONLY) - ENDIF() - -ENDMACRO(MACRO_PARSE_MANIFEST) \ No newline at end of file diff --git a/BlueBerry/CMake/berryEnablePlugin.cmake.in b/BlueBerry/CMake/berryEnablePlugin.cmake.in deleted file mode 100644 index 8db9aeadc1..0000000000 --- a/BlueBerry/CMake/berryEnablePlugin.cmake.in +++ /dev/null @@ -1 +0,0 @@ -@_enable_plugins_filecontent@ \ No newline at end of file diff --git a/BlueBerry/CMake/berryPluginHelpers.cmake b/BlueBerry/CMake/berryPluginHelpers.cmake deleted file mode 100644 index 5e69bbaa36..0000000000 --- a/BlueBerry/CMake/berryPluginHelpers.cmake +++ /dev/null @@ -1,227 +0,0 @@ -# _MACRO_CREATE_PLUGIN_NAME(output_name -# INPUT dir -# [BASEDIR basedir] -# ) -# -# sets output_name to the plugin-name -# the plugin-name is computed by removing basedir from dir and -# replacing slashes with points -# -# Example: BASEDIR=/root -# INPUT=/root/org/blueberry/ui.qt -# output_name=org.blueberry.ui.qt -# -MACRO(_MACRO_CREATE_PLUGIN_NAME output_name) - - MACRO_PARSE_ARGUMENTS(_CREATE_NAME "INPUT;BASEDIR" "" ${ARGN}) - - STRING(REPLACE "${_CREATE_NAME_BASEDIR}/" "" _name_with_slashes ${_CREATE_NAME_INPUT}) - STRING(REPLACE "/" "." _name_with_points ${_name_with_slashes}) - - SET(${output_name} ${_name_with_points}) - -ENDMACRO() - -MACRO(_MACRO_REQUIRED_BUNDLES_LIST output_list input_file) - - SET(_file "${input_file}") - FILE(STRINGS "${_file}" _mfline LENGTH_MINIMUM 1 REGEX " *Require-Bundle *: *[^ ]+") - STRING(REGEX REPLACE "^[^:]*[:](.*)" "\\1" _reqb_input "${_mfline}") - - SET(_reqb_dependencies ) - IF(_reqb_input) - STRING(REPLACE "," ";" _reqb_dependencies ${_reqb_input}) - ENDIF(_reqb_input) - - FOREACH(_dep ${_reqb_dependencies}) - # remove leading and trailing whitespace - STRING(STRIP ${_dep} _trimeddep) - LIST(APPEND ${output_list} ${_trimeddep}) - ENDFOREACH(_dep ${_reqb_dependencies}) -ENDMACRO() - - - -# _MACRO_SETUP_PLUGIN_DEPENDENCIES( -# _explicit_libs -# PLUGIN_NAME _plugin_name -# ) -# -MACRO(_MACRO_SETUP_PLUGIN_DEPENDENCIES _explicit_libs) - - SET(_plugin_src_dir ${${BUNDLE-SYMBOLICNAME}_SRC_DIR}) - SET(_plugin_dependencies ${REQUIRE-BUNDLE}) - SET(_bundle_id ${BUNDLE-SYMBOLICNAME}) - - FOREACH(_dep ${_plugin_dependencies}) - STRING(REPLACE . _ _dep_target ${_dep}) - SET(${_explicit_libs} ${${_explicit_libs}} ${_dep_target}) - ENDFOREACH() - - SET(_plugin_old_dependencies "") - SET(_dep_error 0) - WHILE(NOT "${_plugin_dependencies}" STREQUAL "${_plugin_old_dependencies}") - SET(_plugin_old_dependencies ${_plugin_dependencies}) - - FOREACH(_dep ${_plugin_dependencies}) - - SET(_plugin_src_dir ${${_dep}_SRC_DIR}) - SET(_is_ctk_dep ) - IF(NOT _plugin_src_dir) # maybe it is a CTK plugin dependency - STRING(REPLACE . _ _dep_target ${_dep}) - #MESSAGE("check if ${_dep_target}_DEPENDENCIES is set: ${${_dep_target}_DEPENDENCIES}") - #MESSAGE("looking if ${_dep_target} is in: ${CTK_PLUGIN_LIBRARIES}") - # Check if it is an external CTK plugin dependency - ctkFunctionGetAllPluginTargets(_all_ctk_plugins) - ctkMacroGetAllNonProjectTargetLibraries("${_all_ctk_plugins}" _external_ctk_plugins) - ctkMacroGetAllProjectTargetLibraries("${_all_ctk_plugins}" _internal_ctk_plugins) - LIST(FIND _external_ctk_plugins ${_dep_target} dep_found) - IF(dep_found GREATER -1) - SET(_BUILD_${_dep} ON) # Mark it as available - SET(_is_ctk_dep 1) - ELSE() - #Check if it is an internal CTK plugin dependency - LIST(FIND _internal_ctk_plugins ${_dep_target} dep_found) - IF(dep_found GREATER -1) - SET(_BUILD_${_dep} ON) - GetMyTargetLibraries("${${_dep_target}_DEPENDENCIES}" _ctk_deps) - #MESSAGE("********** _ctk_deps: ${_ctk_deps}") - FOREACH(_ctk_dep_target ${_ctk_deps}) - STRING(REPLACE _ . _ctk_dep ${_ctk_dep_target}) - LIST(APPEND _plugin_dependencies ${_ctk_dep}) - SET(_BUILD_${_ctk_dep} ON) - ENDFOREACH() - #MESSAGE("******* new dependencies: ${_plugin_dependencies}") - SET(_is_ctk_dep 1) - #MESSAGE("new _plugin_dependencies: ${_plugin_dependencies}") - ENDIF() - ENDIF() - ENDIF() - - IF(NOT _is_ctk_dep) - IF(NOT _plugin_src_dir) - MESSAGE(SEND_ERROR "Plug-in dependency \"${_dep}\" does not seem to exist.") - SET(_dep_error 1) - BREAK() - ENDIF() - - #_MACRO_REQUIRED_BUNDLES_LIST(_plugin_dependencies "${_plugin_src_dir}/META-INF/MANIFEST.MF") - INCLUDE(${${_dep}_BIN_DIR}/RequireBundle.cmake) - LIST(APPEND _plugin_dependencies ${REQUIRE-BUNDLE}) - ENDIF() - - ENDFOREACH() - - LIST(REMOVE_DUPLICATES _plugin_dependencies) - LIST(SORT _plugin_dependencies) - - ENDWHILE() - - IF(NOT _dep_error) - # iterator over all dependencies - SET(_plugins_turned_off ) - SET(PLUGIN_LINK_LIBRARIES ) - FOREACH(_dep ${_plugin_dependencies}) - - # collect the ids of plugins we will have to build - IF(NOT _BUILD_${_dep}) - LIST(APPEND _plugins_turned_off ${_dep}) - ENDIF() - - # set include and link directories - STRING(REPLACE . _ _dep_target ${_dep}) - IF(${_dep}_SRC_DIR) - # This is an external BlueBerry Bundle dependency - #MESSAGE("${_dep} is an external BlueBerry Bundle dependency") - SET(_dep_src_dir ${${_dep}_SRC_DIR}/src) - - IF(EXISTS "${${_dep}_SRC_DIR}/includes.cmake") - INCLUDE(${${_dep}_SRC_DIR}/includes.cmake) - FOREACH(_added_incldir ${ADDITIONAL_INCLUDE_DIRECTORIES}) - LIST(APPEND _dep_src_dir ${${_dep}_SRC_DIR}/${_added_incldir}) - ENDFOREACH() - ENDIF() - ELSEIF(${_dep_target}_INCLUDE_DIRS) - # This is an external CTK Plugin dependency - #MESSAGE("${_dep} is an external CTK Plugin dependency") - SET(_dep_src_dir ${${_dep_target}_INCLUDE_DIRS}) - ELSEIF(${_dep}_SOURCE_DIR) - # This is an internal BlueBerry Bundle dependency - #MESSAGE("${_dep} is an internal BlueBerry Bundle dependency") - SET(_dep_src_dir ${${_dep}_SOURCE_DIR}/src) - - IF(EXISTS "${${_dep}_SOURCE_DIR}/includes.cmake") - INCLUDE(${${_dep}_SOURCE_DIR}/includes.cmake) - FOREACH(_added_incldir ${ADDITIONAL_INCLUDE_DIRECTORIES}) - LIST(APPEND _dep_src_dir ${${_dep}_SOURCE_DIR}/${_added_incldir}) - ENDFOREACH() - ENDIF() - ELSEIF(${_dep_target}_SOURCE_DIR) - # This is an internal CTK plugin dependency - #MESSAGE("${_dep} is an internal CTK plugin dependency") - SET(_dep_src_dir ) - ctkFunctionGetIncludeDirs(_dep_src_dir ${_dep_target}) - - IF(${_dep_target}_INCLUDE_SUFFIXES) - FOREACH(_suffix ${${_dep_target}_INCLUDE_SUFFIXES}) - LIST(APPEND _dep_src_dir ${${_dep_target}_SOURCE_DIR}/${_suffix}) - ENDFOREACH() - ELSE() - LIST(APPEND _dep_src_dir ${${_dep_target}_SOURCE_DIR}) - ENDIF() - ENDIF() - - SET(_dep_out_dir ${${_dep}_OUT_DIR}) - - IF(${_dep}_BIN_DIR) - SET(_dep_bin_dir ${${_dep}_BIN_DIR}) - ELSE() - SET(_dep_bin_dir ${${_dep_target}_BINARY_DIR}) - ENDIF() - - LINK_DIRECTORIES(${_dep_out_dir}/bin) - INCLUDE_DIRECTORIES(${_dep_src_dir}) - INCLUDE_DIRECTORIES(${_dep_bin_dir}) - - LIST(APPEND PLUGIN_LINK_LIBRARIES ${_dep_target}) - - ENDFOREACH(_dep ${_plugin_dependencies}) - - IF(_plugins_turned_off) - MESSAGE(SEND_ERROR "Unmet dependencies: The plugin ${_bundle_id} depends on the following plugins:\n${_plugins_turned_off}.\nSwitch them on in order to build ${_FIND_DEPS_PLUGIN_NAME}.") - ENDIF(_plugins_turned_off) - ENDIF() - -ENDMACRO() - -MACRO(_MACRO_ENABLE_QT4_PLUGINS) - - SET(_enable_qt_plugin ${ARGV0}) - STRING(REGEX MATCH ".*\\.qt.*" _qt_matched ${_enable_qt_plugin}) - IF(_qt_matched) - IF(QT4_FOUND) - SET(ENABLE_PLUGIN 1) - ELSE() - SET(ENABLE_PLUGIN 0) - ENDIF() - ENDIF() - -ENDMACRO() - -MACRO(_MACRO_CREATE_ENABLE_PLUGIN_CODE) - SET(_enable_plugins_file "${CMAKE_CURRENT_BINARY_DIR}/berryEnablePlugin.cmake") - SET(_enable_plugins_filecontent "SET(_enable_bundle 1)") - FOREACH(_macro_name ${ARGN}) - SET(_enable_plugins_filecontent "${_enable_plugins_filecontent} - IF(_enable_bundle) - SET(ENABLE_PLUGIN 1) - ${_macro_name}(\${BUNDLE-SYMBOLICNAME}) - IF(NOT ENABLE_PLUGIN) - SET(_enable_bundle 0) - ENDIF() - ENDIF()") - ENDFOREACH() - CONFIGURE_FILE("${BLUEBERRY_SOURCE_DIR}/CMake/berryEnablePlugin.cmake.in" "${_enable_plugins_file}" @ONLY) -ENDMACRO() - - diff --git a/BlueBerry/CMake/berryPluginManifest.cmake.in b/BlueBerry/CMake/berryPluginManifest.cmake.in deleted file mode 100644 index 33d2709228..0000000000 --- a/BlueBerry/CMake/berryPluginManifest.cmake.in +++ /dev/null @@ -1 +0,0 @@ -@_mfcontent@ \ No newline at end of file diff --git a/BlueBerry/CMake/berryQtHelpDoxygen.conf.in b/BlueBerry/CMake/berryQtHelpDoxygen.conf.in deleted file mode 100644 index 6870f61282..0000000000 --- a/BlueBerry/CMake/berryQtHelpDoxygen.conf.in +++ /dev/null @@ -1,1553 +0,0 @@ -# Doxyfile 1.6.3 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = "@BUNDLE-NAME@" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = "@PLUGIN_DOXYGEN_OUTPUT_DIR@" - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, -# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English -# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, -# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, -# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = NO - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = bundlemainpage{1}=\mainpage \ - "isHtml=\if NO_SUCH_THING" \ - "isHtmlend=\endif" - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it parses. -# With this tag you can assign which parser to use for a given extension. -# Doxygen has a built-in mapping, but you can override or extend it using this tag. -# The format is ext=language, where ext is a file extension, and language is one of -# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, -# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat -# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), -# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should -# set this tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. -# func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate getter -# and setter methods for a property. Setting this option to YES (the default) -# will make doxygen to replace the get and set methods by a property in the -# documentation. This will only work if the methods are indeed getting or -# setting a simple type. If this is not the case, or you want to show the -# methods anyway, you should set this option to NO. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - -# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to -# determine which symbols to keep in memory and which to flush to disk. -# When the cache is full, less often used symbols will be written to disk. -# For small to medium size projects (<1000 input files) the default value is -# probably good enough. For larger projects a too small cache size can cause -# doxygen to be busy swapping symbols to and from disk most of the time -# causing a significant performance penality. -# If the system has enough physical memory increasing the cache will improve the -# performance by keeping more symbols in memory. Note that the value works on -# a logarithmic scale so increasing the size by one will rougly double the -# memory usage. The cache size is given by this formula: -# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, -# corresponding to a cache size of 2^16 = 65536 symbols - -SYMBOL_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = YES - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen -# will list include files with double quotes in the documentation -# rather than with sharp brackets. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = NO - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = NO - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = NO - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= NO - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. -# This will remove the Files entry from the Quick Index and from the -# Folder Tree View (if specified). The default is YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the -# Namespaces page. -# This will remove the Namespaces entry from the Quick Index -# and from the Folder Tree View (if specified). The default is YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the program writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by -# doxygen. The layout file controls the global structure of the generated output files -# in an output format independent way. The create the layout file that represents -# doxygen's defaults, run doxygen with the -l option. You can optionally specify a -# file name after the option, if omitted DoxygenLayout.xml will be used as the name -# of the layout file. - -LAYOUT_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = YES - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = NO - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = "@PLUGIN_DOXYGEN_INPUT_DIR@" - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 - -FILE_PATTERNS = *.dox - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. Note that the wildcards are matched -# against the file with absolute path, so to exclude all test directories -# for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = "@PLUGIN_DOXYGEN_INPUT_DIR@" - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. -# If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. -# Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. -# The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = YES - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = YES - -# If the REFERENCES_RELATION tag is set to YES -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = YES - -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. -# Otherwise they will link to the documentation. - -REFERENCES_LINK_SOURCE = YES - -# If the USE_HTAGS tag is set to YES then the references to source code -# will point to the HTML generated by the htags(1) tool instead of doxygen -# built-in source browser. The htags tool is part of GNU's global source -# tagging system (see http://www.gnu.org/software/global/global.html). You -# will need version 4.8.6 or higher. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 3 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting -# this to NO can help when comparing the output of multiple runs. - -HTML_TIMESTAMP = YES - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). - -HTML_DYNAMIC_SECTIONS = NO - -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. -# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING -# is used to encode HtmlHelp index (hhk), content (hhc) and project file -# content. - -CHM_INDEX_ENCODING = - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER -# are set, an additional index file will be generated that can be used as input for -# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated -# HTML documentation. - -GENERATE_QHP = YES - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can -# be used to specify the file name of the resulting .qch file. -# The path specified is relative to the HTML output folder. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#namespace - -QHP_NAMESPACE = @BUNDLE-SYMBOLICNAME@ - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating -# Qt Help Project output. For more information please see -# http://doc.trolltech.com/qthelpproject.html#virtual-folders - -QHP_VIRTUAL_FOLDER = bundle - -# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. -# For more information please see -# http://doc.trolltech.com/qthelpproject.html#custom-filters - -QHP_CUST_FILTER_NAME = @PLUGIN_QHP_CUST_FILTER_NAME@ - -# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see -# Qt Help Project / Custom Filters. - -QHP_CUST_FILTER_ATTRS = @PLUGIN_QHP_CUST_FILTER_ATTRS@ - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's -# filter section matches. -# Qt Help Project / Filter Attributes. - -QHP_SECT_FILTER_ATTRS = @PLUGIN_QHP_SECT_FILTER_ATTRS@ - -# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can -# be used to specify the location of Qt's qhelpgenerator. -# If non-empty doxygen will try to run qhelpgenerator on the generated -# .qhp file. - -QHG_LOCATION = @QT_HELPGENERATOR_EXECUTABLE@ - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files -# will be generated, which together with the HTML files, form an Eclipse help -# plugin. To install this plugin and make it available under the help contents -# menu in Eclipse, the contents of the directory containing the HTML and XML -# files needs to be copied into the plugins directory of eclipse. The name of -# the directory within the plugins directory should be the same as -# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before the help appears. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have -# this name. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = YES - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. -# If the tag value is set to YES, a side panel will be generated -# containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). -# Windows users are probably better off using the HTML help feature. - -GENERATE_TREEVIEW = NO - -# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, -# and Class Hierarchy pages using a tree view instead of an ordered list. - -USE_INLINE_TREES = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -# Use this tag to change the font size of Latex formulas included -# as images in the HTML documentation. The default is 10. Note that -# when you change the font size after a successful doxygen run you need -# to manually remove any form_*.png images from the HTML output directory -# to force them to be regenerated. - -FORMULA_FONTSIZE = 10 - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box for the HTML output. The underlying search engine uses javascript -# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) there is already a search function so this one should -# typically be disabled. For large projects the javascript based search engine -# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. - -SEARCHENGINE = NO - -# When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index -# file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup -# and does not have live searching capabilities. - -SERVER_BASED_SEARCH = NO - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. -# Note that when enabling USE_PDFLATEX this option is only used for -# generating bitmaps for formulas in the HTML output, but not in the -# Makefile that is written to the output directory. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = NO - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = NO - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER. - -LATEX_SOURCE_CODE = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. -# This is useful -# if you want to understand what is going on. -# On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = YES - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_DEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = "@PLUGIN_DOXYGEN_OUTPUT_DIR@/@BUNDLE-SYMBOLICNAME@.tag" - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = YES - -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = NO - -# By default doxygen will write a font called FreeSans.ttf to the output -# directory and reference it in all dot files that doxygen generates. This -# font does not include all possible unicode characters however, so when you need -# these (or just want a differently looking font) you can specify the font name -# using DOT_FONTNAME. You need need to make sure dot is able to find the font, -# which can be done by putting it in a standard location or by setting the -# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory -# containing the font. - -DOT_FONTNAME = FreeSans - -# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. -# The default size is 10pt. - -DOT_FONTSIZE = 10 - -# By default doxygen will tell dot to use the output directory to look for the -# FreeSans.ttf font (which doxygen will put there itself). If you specify a -# different font using DOT_FONTNAME you can set the path where dot -# can find it using this tag. - -DOT_FONTPATH = - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. - -CALL_GRAPH = NO - -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. - -CALLER_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. - -DOT_GRAPH_MAX_NODES = 50 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. - -MAX_DOT_GRAPH_DEPTH = 0 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, because dot on Windows does not -# seem to support this out of the box. Warning: Depending on the platform used, -# enabling this option may lead to badly anti-aliased labels on the edges of -# a graph (i.e. they become hard to read). - -DOT_TRANSPARENT = NO - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = YES - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES diff --git a/BlueBerry/CMake/berryRequireBundle.cmake.in b/BlueBerry/CMake/berryRequireBundle.cmake.in deleted file mode 100644 index 197e718974..0000000000 --- a/BlueBerry/CMake/berryRequireBundle.cmake.in +++ /dev/null @@ -1 +0,0 @@ -SET(REQUIRE-BUNDLE "@REQUIRE-BUNDLE@") \ No newline at end of file diff --git a/BlueBerry/CMakeLists.txt b/BlueBerry/CMakeLists.txt index 2eed7731cd..44485faa19 100644 --- a/BlueBerry/CMakeLists.txt +++ b/BlueBerry/CMakeLists.txt @@ -1,311 +1,272 @@ PROJECT(BlueBerry) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.4) SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMake/") INCLUDE(MacroParseArguments) INCLUDE(MacroConvertSchema) INCLUDE(MacroOrganizeSources) -INCLUDE(berryPluginHelpers) -INCLUDE(MacroCollectPlugins) -INCLUDE(MacroParseManifest) -INCLUDE(MacroCreatePlugin) INCLUDE(MacroCreateCTKPlugin) INCLUDE(MacroCreateQtHelp) -INCLUDE(MacroInstallPlugin) INCLUDE(MacroInstallCTKPlugin) INCLUDE(FunctionCreateProvisioningFile) IF(MSVC) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4275 /wd4251 /wd4503") ENDIF() IF (NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) ENDIF () FIND_PACKAGE(mbilog REQUIRED) INCLUDE_DIRECTORIES(${mbilog_INCLUDE_DIRS}) -OPTION(BLUEBERRY_USE_QT "Use the Qt GUI toolkit" OFF) -IF(NOT DESIRED_QT_VERSION) - SET(DESIRED_QT_VERSION 4 CACHE STRING "Desired Qt version" FORCE) - MARK_AS_ADVANCED(DESIRED_QT_VERSION) -ENDIF() +FIND_PACKAGE(Qt4 4.6.2 REQUIRED) -IF(BLUEBERRY_USE_QT AND NOT DESIRED_QT_VERSION EQUAL 4) - MESSAGE("Attention: Qt4 GUI libraries are required to build the BlueBerry Qt plug-ins.") +IF(QT_QMAKE_CHANGED) + SET(QT_HELPGENERATOR_EXECUTABLE NOTFOUND) + SET(QT_COLLECTIONGENERATOR_EXECUTABLE NOTFOUND) + SET(QT_ASSISTANT_EXECUTABLE NOTFOUND) + SET(QT_XMLPATTERNS_EXECUTABLE NOTFOUND) ENDIF() -IF(BLUEBERRY_USE_QT AND DESIRED_QT_VERSION EQUAL 4) - SET(BUILD_QT_PLUGINS 1) - FIND_PACKAGE(Qt4 4.6.2 REQUIRED) - - IF(QT_QMAKE_CHANGED) - SET(QT_HELPGENERATOR_EXECUTABLE NOTFOUND) - SET(QT_COLLECTIONGENERATOR_EXECUTABLE NOTFOUND) - SET(QT_ASSISTANT_EXECUTABLE NOTFOUND) - SET(QT_XMLPATTERNS_EXECUTABLE NOTFOUND) - ENDIF() - - FIND_PROGRAM(QT_HELPGENERATOR_EXECUTABLE - NAMES qhelpgenerator qhelpgenerator-qt4 qhelpgenerator4 - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH - ) +FIND_PROGRAM(QT_HELPGENERATOR_EXECUTABLE + NAMES qhelpgenerator qhelpgenerator-qt4 qhelpgenerator4 + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH +) - FIND_PROGRAM(QT_COLLECTIONGENERATOR_EXECUTABLE - NAMES qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator4 - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH - ) +FIND_PROGRAM(QT_COLLECTIONGENERATOR_EXECUTABLE + NAMES qcollectiongenerator qcollectiongenerator-qt4 qcollectiongenerator4 + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH +) - FIND_PROGRAM(QT_ASSISTANT_EXECUTABLE - NAMES assistant-qt4 assistant4 assistant - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH - ) +FIND_PROGRAM(QT_ASSISTANT_EXECUTABLE + NAMES assistant-qt4 assistant4 assistant + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH +) - FIND_PROGRAM(QT_XMLPATTERNS_EXECUTABLE - NAMES xmlpatterns - PATHS ${QT_BINARY_DIR} - NO_DEFAULT_PATH - ) +FIND_PROGRAM(QT_XMLPATTERNS_EXECUTABLE + NAMES xmlpatterns + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH +) - OPTION(BLUEBERRY_USE_QT_HELP "Enable support for integrating bundle documentation into Qt Help" ON) - - MARK_AS_ADVANCED(BLUEBERRY_USE_QT_HELP - QT_HELPGENERATOR_EXECUTABLE - QT_COLLECTIONGENERATOR_EXECUTABLE - QT_ASSISTANT_EXECUTABLE - QT_XMLPATTERNS_EXECUTABLE) - - SET(_doxygen_too_old 1) - IF(BLUEBERRY_USE_QT_HELP) - FIND_PACKAGE(Doxygen) - IF(DOXYGEN_FOUND) - EXECUTE_PROCESS(COMMAND ${DOXYGEN_EXECUTABLE} --version - OUTPUT_VARIABLE _doxygen_version) - IF(${_doxygen_version} VERSION_GREATER 1.6.0 OR - ${_doxygen_version} VERSION_EQUAL 1.6.0) - SET(_doxygen_too_old 0) - ENDIF() +OPTION(BLUEBERRY_USE_QT_HELP "Enable support for integrating bundle documentation into Qt Help" ON) + +MARK_AS_ADVANCED(BLUEBERRY_USE_QT_HELP + QT_HELPGENERATOR_EXECUTABLE + QT_COLLECTIONGENERATOR_EXECUTABLE + QT_ASSISTANT_EXECUTABLE + QT_XMLPATTERNS_EXECUTABLE) + +SET(_doxygen_too_old 1) +IF(BLUEBERRY_USE_QT_HELP) + FIND_PACKAGE(Doxygen) + IF(DOXYGEN_FOUND) + EXECUTE_PROCESS(COMMAND ${DOXYGEN_EXECUTABLE} --version + OUTPUT_VARIABLE _doxygen_version) + IF(${_doxygen_version} VERSION_GREATER 1.6.0 OR + ${_doxygen_version} VERSION_EQUAL 1.6.0) + SET(_doxygen_too_old 0) ENDIF() - ELSE(BLUEBERRY_USE_QT_HELP) - - CONFIGURE_FILE(../Documentation/pregenerated/MITKBlankPage.qch - ${MITK_BINARY_DIR}/bin/ExtBundles/org.mitk.gui.qt.extapplication/resources/MITKBlankPage.qch - COPYONLY) - - CONFIGURE_FILE(../Documentation/pregenerated/MitkExtQtHelpCollection.qhc - ${MITK_BINARY_DIR}/bin/ExtBundles/org.mitk.gui.qt.extapplication/resources/MitkExtQtHelpCollection.qhc - COPYONLY) - - ENDIF(BLUEBERRY_USE_QT_HELP) + ENDIF() - IF (BLUEBERRY_USE_QT_HELP AND _doxygen_too_old) + IF(_doxygen_too_old) MESSAGE("Doxygen was not found or is too old. Version 1.6.0 or later is needed if BLUEBERRY_USE_QT_HELP is ON") SET(BLUEBERRY_USE_QT_HELP OFF CACHE BOOL "Enable support for integrating bundle documentation into Qt Help" FORCE) ENDIF() - IF(BLUEBERRY_USE_QT_HELP AND NOT QT_HELPGENERATOR_EXECUTABLE) + IF(NOT QT_HELPGENERATOR_EXECUTABLE) MESSAGE("You have enabled Qt Help support, but QT_HELPGENERATOR_EXECUTABLE is empty") SET(BLUEBERRY_USE_QT_HELP OFF CACHE BOOL "Enable support for integrating bundle documentation into Qt Help" FORCE) ENDIF() - IF(BLUEBERRY_USE_QT_HELP AND NOT QT_XMLPATTERNS_EXECUTABLE) + IF(NOT QT_XMLPATTERNS_EXECUTABLE) MESSAGE("You have enabled Qt Help support, but QT_XMLPATTERNS_EXECUTABLE is empty") SET(BLUEBERRY_USE_QT_HELP OFF CACHE BOOL "Enable support for integrating bundle documentation into Qt Help" FORCE) ENDIF() +ENDIF(BLUEBERRY_USE_QT_HELP) - INCLUDE(${QT_USE_FILE}) -ELSE() - FIND_PACKAGE(Qt4 4.6.2 COMPONENTS QtCore REQUIRED) - INCLUDE(${QT_USE_FILE}) -ENDIF() +INCLUDE(${QT_USE_FILE}) # ========= CTK specific CMake stuff ============ CMAKE_POLICY(SET CMP0012 NEW) FIND_PACKAGE(CTK REQUIRED) # Extract all library names starting with org_blueberry_ MACRO(GetMyTargetLibraries all_target_libraries varname) SET(re_ctkplugin "^org_blueberry_[a-zA-Z0-9_]+$") SET(_tmp_list) LIST(APPEND _tmp_list ${all_target_libraries}) ctkMacroListFilter(_tmp_list re_ctkplugin OUTPUT_VARIABLE ${varname}) ENDMACRO() # ================================================ OPTION(BLUEBERRY_BUILD_ALL_PLUGINS "Build all BlueBerry plugins (overriding selection)" OFF) MARK_AS_ADVANCED(BLUEBERRY_BUILD_ALL_PLUGINS) IF(BLUEBERRY_BUILD_ALL_PLUGINS) SET(BLUEBERRY_BUILD_ALL_PLUGINS_OPTION "FORCE_BUILD_ALL") ENDIF() OPTION(BLUEBERRY_STATIC "Build all plugins as static libraries" OFF) MARK_AS_ADVANCED(BLUEBERRY_STATIC) OPTION(BLUEBERRY_DEBUG_SMARTPOINTER "Enable code for debugging smart pointers" OFF) MARK_AS_ADVANCED(BLUEBERRY_DEBUG_SMARTPOINTER) FIND_PACKAGE(Poco REQUIRED) FIND_PACKAGE(Ant) FIND_PACKAGE(Eclipse) SET(BLUEBERRY_SOURCE_DIR ${BlueBerry_SOURCE_DIR}) SET(BLUEBERRY_BINARY_DIR ${BlueBerry_BINARY_DIR}) SET(BLUEBERRY_PLUGINS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Bundles) SET(BLUEBERRY_PLUGINS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Bundles) SET(OSGI_APP solstice) SET(OSGI_UI_APP solstice_ui) -# Force should be removed after everybody has configured their old binary tree -SET(BLUEBERRY_PLUGINS_OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/BlueBerry CACHE PATH "Directory where to build the BlueBerry Bundles" FORCE) -MARK_AS_ADVANCED(BLUEBERRY_PLUGINS_OUTPUT_DIR) - -# Clear the cache variables -SET(BLUEBERRY_PLUGIN_SOURCE_DIRS "" CACHE INTERNAL "List of base plugin source directories" FORCE) -SET(BLUEBERRY_PLUGIN_BINARY_DIRS "" CACHE INTERNAL "List of base plugin binary directories" FORCE) - IF (Eclipse_DIR) SET(BLUEBERRY_DOC_TOOLS_DIR "${Eclipse_DIR}" CACHE PATH "Directory containing additional tools needed for generating the documentation") ELSE () SET(BLUEBERRY_DOC_TOOLS_DIR "" CACHE PATH "Directory containing additional tools needed for generating the documentation") ENDIF () SET(BLUEBERRY_DEBUG_POSTFIX d) # Testing options OPTION(BLUEBERRY_BUILD_TESTING "Build the BlueBerry tests." ${BUILD_TESTING}) IF(WIN32) SET(_gui_testing_default "ON") ELSE() SET(_gui_testing_default "OFF") ENDIF() OPTION(BLUEBERRY_ENABLE_GUI_TESTING "Enable the BlueBerry GUI tests" ${_gui_testing_default}) MARK_AS_ADVANCED(BLUEBERRY_ENABLE_GUI_TESTING) IF(BLUEBERRY_BUILD_TESTING) ENABLE_TESTING() ENDIF() # Add CTK plugins SET(_ctk_plugins Bundles/org.blueberry.osgi:ON Bundles/org.blueberry.compat:OFF Bundles/org.blueberry.core.runtime:OFF Bundles/org.blueberry.core.expressions:OFF Bundles/org.blueberry.solstice.common:OFF Bundles/org.blueberry.core.commands:OFF Bundles/org.blueberry.core.jobs:OFF Bundles/org.blueberry.ui:OFF Bundles/org.blueberry.ui.qt:OFF Bundles/org.blueberry.ui.qt.help:OFF Bundles/org.blueberry.ui.qt.log:OFF Bundles/org.blueberry.ui.qt.objectinspector:OFF ) SET(_ctk_test_plugins ) SET(_ctk_plugins_include_dirs ${Poco_INCLUDE_DIRS} ) SET(_ctk_plugins_link_dirs ${Poco_LIBRARY_DIR} ) INCLUDE_DIRECTORIES(${_ctk_plugins_include_dirs}) LINK_DIRECTORIES(${_ctk_plugins_link_dirs}) IF(BLUEBERRY_BUILD_TESTING) INCLUDE(berryTestingHelpers) SET(BLUEBERRY_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_APP}") GET_TARGET_PROPERTY(_is_macosx_bundle ${OSGI_APP} MACOSX_BUNDLE) IF(APPLE AND _is_macosx_bundle) SET(BLUEBERRY_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_APP}.app/Contents/MacOS/${OSGI_APP}") ENDIF() SET(_ctk_testinfrastructure_plugins Bundles/org.blueberry.test:ON Bundles/org.blueberry.uitest:ON ) SET(_ctk_test_plugins # Testing/org.blueberry.core.runtime.tests:ON # Testing/org.blueberry.osgi.tests:ON ) IF(BLUEBERRY_ENABLE_GUI_TESTING) # LIST(APPEND _ctk_test_plugins Testing/org.blueberry.ui.tests:ON) SET(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_UI_APP}") GET_TARGET_PROPERTY(_is_macosx_bundle ${OSGI_UI_APP} MACOSX_BUNDLE) IF(APPLE AND _is_macosx_bundle) SET(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_UI_APP}.app/Contents/MacOS/${OSGI_UI_APP}") ENDIF() ENDIF() ENDIF() SET(BLUEBERRY_TESTING_PROVISIONING_FILE "${BlueBerry_BINARY_DIR}/BlueBerryTesting.provisioning") ADD_CUSTOM_TARGET(BlueBerry) ctkMacroSetupPlugins(${_ctk_plugins} ${_ctk_testinfrastructure_plugins} ${_ctk_test_plugins} BUILD_OPTION_PREFIX BLUEBERRY_BUILD_ BUILD_ALL ${BLUEBERRY_BUILD_ALL_PLUGINS} COMPACT_OPTIONS) SET(BLUEBERRY_PROVISIONING_FILE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/BlueBerry.provisioning") FunctionCreateProvisioningFile( FILE ${BLUEBERRY_PROVISIONING_FILE} PLUGINS ${_ctk_plugins} ) FunctionCreateProvisioningFile( FILE ${BLUEBERRY_TESTING_PROVISIONING_FILE} INCLUDE ${BLUEBERRY_PROVISIONING_FILE} PLUGINS ${_ctk_testinfrastructure_plugins} ${_ctk_test_plugins} ) if(${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES) add_dependencies(BlueBerry ${${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES}) endif() set_property(TARGET ${${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES} PROPERTY LABELS BlueBerry) SET(BB_PLUGIN_USE_FILE "${BlueBerry_BINARY_DIR}/BlueBerryPluginUseFile.cmake") IF(${PROJECT_NAME}_PLUGIN_LIBRARIES) ctkFunctionGeneratePluginUseFile(${BB_PLUGIN_USE_FILE}) ELSE() FILE(REMOVE ${BB_PLUGIN_USE_FILE}) SET(BB_PLUGIN_USE_FILE ) ENDIF() # CTK Plugin Exports SET(BB_PLUGIN_EXPORTS_FILE "${CMAKE_CURRENT_BINARY_DIR}/BlueBerryPluginExports.cmake") GetMyTargetLibraries("${${PROJECT_NAME}_PLUGIN_LIBRARIES}" my_plugin_targets) SET(additional_export_targets mbilog PocoFoundation PocoUtil PocoXML) IF(BLUEBERRY_BUILD_TESTING) LIST(APPEND additional_export_targets CppUnit) ENDIF() export(TARGETS ${my_plugin_targets} ${additional_export_targets} FILE ${BB_PLUGIN_EXPORTS_FILE}) ADD_SUBDIRECTORY(Documentation) CONFIGURE_FILE(BlueBerryConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/BlueBerryConfig.cmake @ONLY) diff --git a/CMake/mitkSetupBlueBerry.cmake b/CMake/mitkSetupBlueBerry.cmake deleted file mode 100644 index f3ecc4e5a8..0000000000 --- a/CMake/mitkSetupBlueBerry.cmake +++ /dev/null @@ -1,21 +0,0 @@ - -set(BLUEBERRY_USE_QT ${MITK_USE_QT} CACHE BOOL "Use the Qt GUI toolkit" FORCE) -mark_as_advanced(BLUEBERRY_USE_QT) - -# Clear the cache variables containing plugin base directories -set(MITK_MODULES_PLUGIN_SOURCE_DIRS "" CACHE INTERNAL "List of base plugin source directories" FORCE) -set(MITK_MODULES_PLUGIN_OUTPUT_DIRS "" CACHE INTERNAL "List of base plugin output directories" FORCE) - -set(mbilog_DIR "${mbilog_BINARY_DIR}") - -if(MITK_BUILD_ALL_PLUGINS) - set(BLUEBERRY_BUILD_ALL_PLUGINS ON) -endif() - -add_subdirectory(BlueBerry) - -set(BlueBerry_DIR ${CMAKE_CURRENT_BINARY_DIR}/BlueBerry - CACHE PATH "The directory containing a CMake configuration file for BlueBerry" FORCE) - -include(mitkMacroCreatePlugin) -include(mitkMacroCreateCTKPlugin) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb417210c0..f35573c3f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,805 +1,797 @@ cmake_minimum_required(VERSION 2.8.4) #----------------------------------------------------------------------------- # Set a default build type if none was specified #----------------------------------------------------------------------------- if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) message(STATUS "Setting build type to 'Debug' as none was specified.") set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build." FORCE) # Set the possible values of build type for cmake-gui set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") endif() #----------------------------------------------------------------------------- # Superbuild Option - Enabled by default #----------------------------------------------------------------------------- option(MITK_USE_SUPERBUILD "Build MITK and the projects it depends on via SuperBuild.cmake." ON) if(MITK_USE_SUPERBUILD) project(MITK-superbuild) set(MITK_SOURCE_DIR ${PROJECT_SOURCE_DIR}) set(MITK_BINARY_DIR ${PROJECT_BINARY_DIR}) else() project(MITK) endif() #----------------------------------------------------------------------------- # Warn if source or build path is too long #----------------------------------------------------------------------------- if(WIN32) set(_src_dir_length_max 50) set(_bin_dir_length_max 50) if(MITK_USE_SUPERBUILD) set(_src_dir_length_max 43) # _src_dir_length_max - strlen(ITK-src) set(_bin_dir_length_max 40) # _bin_dir_length_max - strlen(MITK-build) endif() string(LENGTH "${MITK_SOURCE_DIR}" _src_n) string(LENGTH "${MITK_BINARY_DIR}" _bin_n) # The warnings should be converted to errors if(_src_n GREATER _src_dir_length_max) message(WARNING "MITK source code directory path length is too long (${_src_n} > ${_src_dir_length_max})." "Please move the MITK source code directory to a directory with a shorter path." ) endif() if(_bin_n GREATER _bin_dir_length_max) message(WARNING "MITK build directory path length is too long (${_bin_n} > ${_bin_dir_length_max})." "Please move the MITK build directory to a directory with a shorter path." ) endif() endif() #----------------------------------------------------------------------------- # See http://cmake.org/cmake/help/cmake-2-8-docs.html#section_Policies for details #----------------------------------------------------------------------------- set(project_policies CMP0001 # NEW: CMAKE_BACKWARDS_COMPATIBILITY should no longer be used. CMP0002 # NEW: Logical target names must be globally unique. CMP0003 # NEW: Libraries linked via full path no longer produce linker search paths. CMP0004 # NEW: Libraries linked may NOT have leading or trailing whitespace. CMP0005 # NEW: Preprocessor definition values are now escaped automatically. CMP0006 # NEW: Installing MACOSX_BUNDLE targets requires a BUNDLE DESTINATION. CMP0007 # NEW: List command no longer ignores empty elements. CMP0008 # NEW: Libraries linked by full-path must have a valid library file name. CMP0009 # NEW: FILE GLOB_RECURSE calls should not follow symlinks by default. CMP0010 # NEW: Bad variable reference syntax is an error. CMP0011 # NEW: Included scripts do automatic cmake_policy PUSH and POP. CMP0012 # NEW: if() recognizes numbers and boolean constants. CMP0013 # NEW: Duplicate binary directories are not allowed. CMP0014 # NEW: Input directories must have CMakeLists.txt ) foreach(policy ${project_policies}) if(POLICY ${policy}) cmake_policy(SET ${policy} NEW) endif() endforeach() #----------------------------------------------------------------------------- # Update CMake module path #------------------------------------------------------------------------------ set(CMAKE_MODULE_PATH ${MITK_SOURCE_DIR}/CMake ${CMAKE_MODULE_PATH} ) #----------------------------------------------------------------------------- # CMake Function(s) and Macro(s) #----------------------------------------------------------------------------- include(mitkMacroEmptyExternalProject) include(mitkFunctionGenerateProjectXml) include(mitkFunctionSuppressWarnings) SUPPRESS_VC_DEPRECATED_WARNINGS() #----------------------------------------------------------------------------- # Output directories. #----------------------------------------------------------------------------- foreach(type LIBRARY RUNTIME ARCHIVE) # Make sure the directory exists if(DEFINED MITK_CMAKE_${type}_OUTPUT_DIRECTORY AND NOT EXISTS ${MITK_CMAKE_${type}_OUTPUT_DIRECTORY}) message("Creating directory MITK_CMAKE_${type}_OUTPUT_DIRECTORY: ${MITK_CMAKE_${type}_OUTPUT_DIRECTORY}") file(MAKE_DIRECTORY "${MITK_CMAKE_${type}_OUTPUT_DIRECTORY}") endif() if(MITK_USE_SUPERBUILD) set(output_dir ${MITK_BINARY_DIR}/bin) if(NOT DEFINED MITK_CMAKE_${type}_OUTPUT_DIRECTORY) set(MITK_CMAKE_${type}_OUTPUT_DIRECTORY ${MITK_BINARY_DIR}/MITK-build/bin) endif() else() if(NOT DEFINED MITK_CMAKE_${type}_OUTPUT_DIRECTORY) SET(output_dir ${MITK_BINARY_DIR}/bin) else() SET(output_dir ${MITK_CMAKE_${type}_OUTPUT_DIRECTORY}) endif() endif() set(CMAKE_${type}_OUTPUT_DIRECTORY ${output_dir} CACHE INTERNAL "Single output directory for building all libraries.") mark_as_advanced(CMAKE_${type}_OUTPUT_DIRECTORY) endforeach() #----------------------------------------------------------------------------- # Additional MITK Options (also shown during superbuild) #----------------------------------------------------------------------------- option(BUILD_SHARED_LIBS "Build MITK with shared libraries" ON) option(WITH_COVERAGE "Enable/Disable coverage" OFF) option(BUILD_TESTING "Test the project" ON) option(MITK_BUILD_ALL_APPS "Build all MITK applications" OFF) option(MITK_BUILD_TUTORIAL "Build the MITK tutorial" ON) option(MITK_USE_Boost "Use the Boost C++ library" OFF) option(MITK_USE_BLUEBERRY "Build the BlueBerry platform" ON) option(MITK_USE_CTK "Use CTK in MITK" ${MITK_USE_BLUEBERRY}) option(MITK_USE_QT "Use Nokia's Qt library" ${MITK_USE_CTK}) option(MITK_USE_DCMTK "EXEPERIMENTAL, superbuild only: Use DCMTK in MITK" OFF) option(MITK_USE_OpenCV "Use Intel's OpenCV library" OFF) option(MITK_USE_Python "Use Python wrapping in MITK" OFF) set(MITK_USE_CableSwig ${MITK_USE_Python}) mark_as_advanced(MITK_BUILD_ALL_APPS MITK_USE_CTK MITK_USE_DCMTK ) if(MITK_USE_Boost) option(MITK_USE_SYSTEM_Boost "Use the system Boost" OFF) set(MITK_USE_Boost_LIBRARIES "" CACHE STRING "A semi-colon separated list of required Boost libraries") endif() if(MITK_USE_BLUEBERRY) option(MITK_BUILD_ALL_PLUGINS "Build all MITK plugins" OFF) mark_as_advanced(MITK_BUILD_ALL_PLUGINS) if(NOT MITK_USE_CTK) message("Forcing MITK_USE_CTK to ON because of MITK_USE_BLUEBERRY") set(MITK_USE_CTK ON CACHE BOOL "Use CTK in MITK" FORCE) endif() endif() if(MITK_USE_CTK AND NOT MITK_USE_QT) message("Forcing MITK_USE_QT to ON because of MITK_USE_CTK") set(MITK_USE_QT ON CACHE BOOL "Use Nokia's Qt library in MITK" FORCE) endif() if(MITK_USE_QT) # find the package at the very beginning, so that QT4_FOUND is available find_package(Qt4 4.6.2 REQUIRED) endif() # Customize the default pixel types for multiplex macros set(MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES "int, unsigned int, short, unsigned short, char, unsigned char" CACHE STRING "List of integral pixel types used in AccessByItk and InstantiateAccessFunction macros") set(MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES "double, float" CACHE STRING "List of floating pixel types used in AccessByItk and InstantiateAccessFunction macros") set(MITK_ACCESSBYITK_COMPOSITE_PIXEL_TYPES "" CACHE STRING "List of composite pixel types used in AccessByItk and InstantiateAccessFunction macros") set(MITK_ACCESSBYITK_DIMENSIONS "2,3" CACHE STRING "List of dimensions used in AccessByItk and InstantiateAccessFunction macros") mark_as_advanced(MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES MITK_ACCESSBYITK_COMPOSITE_PIXEL_TYPES MITK_ACCESSBYITK_DIMENSIONS ) # consistency checks if(NOT MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES) set(MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES "int, unsigned int, short, unsigned short, char, unsigned char" CACHE STRING "List of integral pixel types used in AccessByItk and InstantiateAccessFunction macros" FORCE) endif() if(NOT MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES) set(MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES "double, float" CACHE STRING "List of floating pixel types used in AccessByItk and InstantiateAccessFunction macros" FORCE) endif() if(NOT MITK_ACCESSBYITK_DIMENSIONS) set(MITK_ACCESSBYITK_DIMENSIONS "2,3" CACHE STRING "List of dimensions used in AccessByItk and InstantiateAccessFunction macros") endif() #----------------------------------------------------------------------------- # Additional CXX/C Flags #----------------------------------------------------------------------------- set(ADDITIONAL_C_FLAGS "" CACHE STRING "Additional C Flags") mark_as_advanced(ADDITIONAL_C_FLAGS) set(ADDITIONAL_CXX_FLAGS "" CACHE STRING "Additional CXX Flags") mark_as_advanced(ADDITIONAL_CXX_FLAGS) #----------------------------------------------------------------------------- # Project.xml #----------------------------------------------------------------------------- # A list of topologically ordered targets set(CTEST_PROJECT_SUBPROJECTS) if(MITK_USE_BLUEBERRY) list(APPEND CTEST_PROJECT_SUBPROJECTS BlueBerry) endif() list(APPEND CTEST_PROJECT_SUBPROJECTS MITK-Core MITK-CoreUI MITK-IGT MITK-ToF MITK-DTI MITK-Registration MITK-Modules # all modules not contained in a specific subproject MITK-Plugins # all plugins not contained in a specific subproject Unlabeled # special "subproject" catching all unlabeled targets and tests ) # Configure CTestConfigSubProject.cmake that could be used by CTest scripts configure_file(${MITK_SOURCE_DIR}/CTestConfigSubProject.cmake.in ${MITK_BINARY_DIR}/CTestConfigSubProject.cmake) if(CTEST_PROJECT_ADDITIONAL_TARGETS) # those targets will be executed at the end of the ctest driver script # and they also get their own subproject label set(subproject_list "${CTEST_PROJECT_SUBPROJECTS};${CTEST_PROJECT_ADDITIONAL_TARGETS}") else() set(subproject_list "${CTEST_PROJECT_SUBPROJECTS}") endif() # Generate Project.xml file expected by the CTest driver script mitkFunctionGenerateProjectXml(${MITK_BINARY_DIR} MITK "${subproject_list}" ${MITK_USE_SUPERBUILD}) #----------------------------------------------------------------------------- # Superbuild script #----------------------------------------------------------------------------- if(MITK_USE_SUPERBUILD) include("${CMAKE_CURRENT_SOURCE_DIR}/SuperBuild.cmake") return() endif() #***************************************************************************** #**************************** END OF SUPERBUILD **************************** #***************************************************************************** #----------------------------------------------------------------------------- # CMake Function(s) and Macro(s) #----------------------------------------------------------------------------- include(CheckCXXSourceCompiles) include(mitkFunctionCheckCompilerFlags) include(mitkFunctionGetGccVersion) include(MacroParseArguments) include(mitkFunctionSuppressWarnings) # includes several functions include(mitkFunctionOrganizeSources) include(mitkFunctionGetVersion) include(mitkFunctionCreateWindowsBatchScript) include(mitkFunctionInstallProvisioningFiles) include(mitkFunctionCompileSnippets) include(mitkMacroCreateModuleConf) include(mitkMacroCreateModule) include(mitkMacroCheckModule) include(mitkMacroCreateModuleTests) include(mitkFunctionAddCustomModuleTest) include(mitkMacroUseModule) include(mitkMacroMultiplexPicType) include(mitkMacroInstall) include(mitkMacroInstallHelperApp) include(mitkMacroInstallTargets) include(mitkMacroGenerateToolsLibrary) include(mitkMacroGetLinuxDistribution) #----------------------------------------------------------------------------- # Prerequesites #----------------------------------------------------------------------------- find_package(ITK REQUIRED) find_package(VTK REQUIRED) if(ITK_USE_SYSTEM_GDCM) find_package(GDCM PATHS ${ITK_GDCM_DIR} REQUIRED) endif() #----------------------------------------------------------------------------- # Set MITK specific options and variables (NOT available during superbuild) #----------------------------------------------------------------------------- # ASK THE USER TO SHOW THE CONSOLE WINDOW FOR CoreApp and ExtApp option(MITK_SHOW_CONSOLE_WINDOW "Use this to enable or disable the console window when starting MITK GUI Applications" ON) mark_as_advanced(MITK_SHOW_CONSOLE_WINDOW) # TODO: check if necessary option(USE_ITKZLIB "Use the ITK zlib for pic compression." ON) mark_as_advanced(USE_ITKZLIB) if(NOT MITK_FAST_TESTING) if(DEFINED MITK_CTEST_SCRIPT_MODE AND (MITK_CTEST_SCRIPT_MODE STREQUAL "continuous" OR MITK_CTEST_SCRIPT_MODE STREQUAL "experimental") ) set(MITK_FAST_TESTING 1) endif() endif() #----------------------------------------------------------------------------- # Get MITK version info #----------------------------------------------------------------------------- mitkFunctionGetVersion(${MITK_SOURCE_DIR} MITK) #----------------------------------------------------------------------------- # Installation preparation # # These should be set before any MITK install macros are used #----------------------------------------------------------------------------- # on Mac OSX all BlueBerry plugins get copied into every # application bundle (.app directory) specified here if(APPLE) if(MITK_BUILD_org.mitk.gui.qt.extapplication) set(MACOSX_BUNDLE_NAMES ${MACOSX_BUNDLE_NAMES} ExtApp) endif() if(MITK_BUILD_org.mitk.gui.qt.application) set(MACOSX_BUNDLE_NAMES ${MACOSX_BUNDLE_NAMES} CoreApp) endif() endif(APPLE) #----------------------------------------------------------------------------- # Set symbol visibility Flags #----------------------------------------------------------------------------- # MinGW does not export all symbols automatically, so no need to set flags if(CMAKE_COMPILER_IS_GNUCXX AND NOT MINGW) set(VISIBILITY_CXX_FLAGS ) #"-fvisibility=hidden -fvisibility-inlines-hidden") endif() #----------------------------------------------------------------------------- # Set coverage Flags #----------------------------------------------------------------------------- if(WITH_COVERAGE) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") set(coverage_flags "-g -fprofile-arcs -ftest-coverage -O0 -DNDEBUG") set(COVERAGE_CXX_FLAGS ${coverage_flags}) set(COVERAGE_C_FLAGS ${coverage_flags}) endif() endif() #----------------------------------------------------------------------------- # MITK C/CXX Flags #----------------------------------------------------------------------------- set(MITK_C_FLAGS "${COVERAGE_C_FLAGS} ${ADDITIONAL_C_FLAGS}") set(MITK_CXX_FLAGS "${VISIBILITY_CXX_FLAGS} ${COVERAGE_CXX_FLAGS} ${ADDITIONAL_CXX_FLAGS}") include(mitkSetupC++0xVariables) if(CMAKE_COMPILER_IS_GNUCXX) set(cflags "-Wall -Wextra -Wpointer-arith -Winvalid-pch -Wcast-align -Wwrite-strings -D_FORTIFY_SOURCE=2") mitkFunctionCheckCompilerFlags("-fdiagnostics-show-option" cflags) mitkFunctionCheckCompilerFlags("-Wl,--no-undefined" cflags) mitkFunctionCheckCompilerFlags("-Wl,--as-needed" cflags) if(MITK_USE_C++0x) mitkFunctionCheckCompilerFlags("-std=c++0x" MITK_CXX_FLAGS) endif() mitkFunctionGetGccVersion(${CMAKE_CXX_COMPILER} GCC_VERSION) # With older version of gcc supporting the flag -fstack-protector-all, an extra dependency to libssp.so # is introduced. If gcc is smaller than 4.4.0 and the build type is Release let's not include the flag. # Doing so should allow to build package made for distribution using older linux distro. if(${GCC_VERSION} VERSION_GREATER "4.4.0" OR (CMAKE_BUILD_TYPE STREQUAL "Debug" AND ${GCC_VERSION} VERSION_LESS "4.4.0")) mitkFunctionCheckCompilerFlags("-fstack-protector-all" cflags) endif() if(MINGW) # suppress warnings about auto imported symbols set(MITK_CXX_FLAGS "-Wl,--enable-auto-import ${MITK_CXX_FLAGS}") # we need to define a Windows version set(MITK_CXX_FLAGS "-D_WIN32_WINNT=0x0500 ${MITK_CXX_FLAGS}") endif() set(MITK_C_FLAGS "${cflags} ${MITK_C_FLAGS}") #set(MITK_CXX_FLAGS "${cflags} -Woverloaded-virtual -Wold-style-cast -Wstrict-null-sentinel -Wsign-promo ${MITK_CXX_FLAGS}") set(MITK_CXX_FLAGS "${cflags} -Woverloaded-virtual -Wstrict-null-sentinel ${MITK_CXX_FLAGS}") endif() #----------------------------------------------------------------------------- # MITK Packages #----------------------------------------------------------------------------- set(MITK_MODULES_PACKAGE_DEPENDS_DIR ${MITK_SOURCE_DIR}/CMake/PackageDepends) set(MODULES_PACKAGE_DEPENDS_DIRS ${MITK_MODULES_PACKAGE_DEPENDS_DIR}) #----------------------------------------------------------------------------- # Testing #----------------------------------------------------------------------------- if(BUILD_TESTING) enable_testing() include(CTest) mark_as_advanced(TCL_TCLSH DART_ROOT) option(MITK_ENABLE_GUI_TESTING OFF "Enable the MITK GUI tests") # Setup file for setting custom ctest vars configure_file( CMake/CTestCustom.cmake.in ${MITK_BINARY_DIR}/CTestCustom.cmake @ONLY ) # Configuration for the CMake-generated test driver set(CMAKE_TESTDRIVER_EXTRA_INCLUDES "#include ") set(CMAKE_TESTDRIVER_BEFORE_TESTMAIN " try {") set(CMAKE_TESTDRIVER_AFTER_TESTMAIN " } catch( std::exception & excp ) { fprintf(stderr,\"%s\\n\",excp.what()); return EXIT_FAILURE; } catch( ... ) { printf(\"Exception caught in the test driver\\n\"); return EXIT_FAILURE; } ") set(MITK_TEST_OUTPUT_DIR "${MITK_BINARY_DIR}/test_output") if(NOT EXISTS ${MITK_TEST_OUTPUT_DIR}) file(MAKE_DIRECTORY ${MITK_TEST_OUTPUT_DIR}) endif() # Test the external project template if(MITK_USE_BLUEBERRY) include(mitkTestProjectTemplate) endif() # Test the package target include(mitkPackageTest) endif() configure_file(mitkTestingConfig.h.in ${MITK_BINARY_DIR}/mitkTestingConfig.h) #----------------------------------------------------------------------------- # MITK_SUPERBUILD_BINARY_DIR #----------------------------------------------------------------------------- # If MITK_SUPERBUILD_BINARY_DIR isn't defined, it means MITK is *NOT* build using Superbuild. # In that specific case, MITK_SUPERBUILD_BINARY_DIR should default to MITK_BINARY_DIR if(NOT DEFINED MITK_SUPERBUILD_BINARY_DIR) set(MITK_SUPERBUILD_BINARY_DIR ${MITK_BINARY_DIR}) endif() #----------------------------------------------------------------------------- # Compile Utilities and set-up MITK variables #----------------------------------------------------------------------------- include(mitkSetupVariables) #----------------------------------------------------------------------------- # Cleanup #----------------------------------------------------------------------------- file(GLOB _MODULES_CONF_FILES ${PROJECT_BINARY_DIR}/${MODULES_CONF_DIRNAME}/*.cmake) if(_MODULES_CONF_FILES) file(REMOVE ${_MODULES_CONF_FILES}) endif() add_subdirectory(Utilities) if(MITK_USE_BLUEBERRY) # We need to hack a little bit because MITK applications may need # to enable certain BlueBerry plug-ins. However, these plug-ins # are validated separately from the MITK plug-ins and know nothing # about potential MITK plug-in dependencies of the applications. Hence # we cannot pass the MITK application list to the BlueBerry # ctkMacroSetupPlugins call but need to extract the BlueBerry dependencies # from the applications and set them explicitly. include("${CMAKE_CURRENT_SOURCE_DIR}/Applications/AppList.cmake") foreach(mitk_app ${MITK_APPS}) # extract target_dir and option_name string(REPLACE "^^" "\\;" target_info ${mitk_app}) set(target_info_list ${target_info}) list(GET target_info_list 0 target_dir) list(GET target_info_list 1 option_name) # check if the application is enabled and if target_libraries.cmake exists if (${option_name} AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Applications/${target_dir}/target_libraries.cmake") include("${CMAKE_CURRENT_SOURCE_DIR}/Applications/${target_dir}/target_libraries.cmake") foreach(_target_dep ${target_libraries}) if(_target_dep MATCHES org_blueberry_) string(REPLACE _ . _app_bb_dep ${_target_dep}) # explicitly set the build option for the BlueBerry plug-in set(BLUEBERRY_BUILD_${_app_bb_dep} ON CACHE BOOL "Build the ${_app_bb_dep} plug-in") endif() endforeach() endif() endforeach() - include(mitkSetupBlueBerry) + set(mbilog_DIR "${mbilog_BINARY_DIR}") + + if(MITK_BUILD_ALL_PLUGINS) + set(BLUEBERRY_BUILD_ALL_PLUGINS ON) + endif() + + add_subdirectory(BlueBerry) + + set(BlueBerry_DIR ${CMAKE_CURRENT_BINARY_DIR}/BlueBerry + CACHE PATH "The directory containing a CMake configuration file for BlueBerry" FORCE) + + include(mitkMacroCreateCTKPlugin) + endif() #----------------------------------------------------------------------------- # Set C/CXX Flags for MITK code #----------------------------------------------------------------------------- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MITK_CXX_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MITK_C_FLAGS}") if(MITK_USE_QT) add_definitions(-DQWT_DLL) endif() #----------------------------------------------------------------------------- # Add custom targets representing CDash subprojects #----------------------------------------------------------------------------- foreach(subproject ${CTEST_PROJECT_SUBPROJECTS}) if(NOT TARGET ${subproject} AND NOT subproject MATCHES "Unlabeled") add_custom_target(${subproject}) endif() endforeach() #----------------------------------------------------------------------------- # Add subdirectories #----------------------------------------------------------------------------- link_directories(${MITK_LINK_DIRECTORIES}) add_subdirectory(Core) - -if(MITK_USE_QT AND QT4_FOUND) - add_subdirectory(CoreUI/Qmitk) -endif() - add_subdirectory(Modules) if(MITK_USE_BLUEBERRY) find_package(BlueBerry REQUIRED) set(MITK_DEFAULT_SUBPROJECTS MITK-Plugins) - include("${CMAKE_CURRENT_SOURCE_DIR}/CoreUI/Bundles/PluginList.cmake") - set(mitk_core_plugins_fullpath ) - foreach(core_plugin ${MITK_CORE_PLUGINS}) - list(APPEND mitk_core_plugins_fullpath CoreUI/Bundles/${core_plugin}) - endforeach() - + # Plug-in testing (needs some work to be enabled again) if(BUILD_TESTING) include(berryTestingHelpers) - include("${CMAKE_CURRENT_SOURCE_DIR}/CoreUI/BundleTesting/PluginList.cmake") - set(mitk_core_test_plugins_fullpath ) - foreach(core_test_plugin ${MITK_CORE_TEST_PLUGINS}) - # list(APPEND mitk_core_test_plugins_fullpath CoreUI/BundleTesting/${core_test_plugin}) - endforeach() - set(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/CoreApp") get_target_property(_is_macosx_bundle CoreApp MACOSX_BUNDLE) if(APPLE AND _is_macosx_bundle) set(BLUEBERRY_UI_TEST_APP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/CoreApp.app/Contents/MacOS/CoreApp") endif() - set(BLUEBERRY_TEST_APP_ID "org.mitk.qt.application") + set(BLUEBERRY_TEST_APP_ID "org.mitk.qt.coreapplication") endif() - include("${CMAKE_CURRENT_SOURCE_DIR}/Modules/Bundles/PluginList.cmake") - set(mitk_ext_plugins_fullpath ) - foreach(ext_plugin ${MITK_EXT_PLUGINS}) - list(APPEND mitk_ext_plugins_fullpath Modules/Bundles/${ext_plugin}) + include("${CMAKE_CURRENT_SOURCE_DIR}/Plugins/PluginList.cmake") + set(mitk_plugins_fullpath ) + foreach(mitk_plugin ${MITK_EXT_PLUGINS}) + list(APPEND mitk_plugins_fullpath Plugins/${mitk_plugin}) endforeach() if(EXISTS ${MITK_PRIVATE_MODULES}/PluginList.cmake) include(${MITK_PRIVATE_MODULES}/PluginList.cmake) - foreach(ext_plugin ${MITK_PRIVATE_PLUGINS}) - list(APPEND mitk_ext_plugins_fullpath ${MITK_PRIVATE_MODULES}/${ext_plugin}) + foreach(mitk_plugin ${MITK_PRIVATE_PLUGINS}) + list(APPEND mitk_plugins_fullpath ${MITK_PRIVATE_MODULES}/${mitk_plugin}) endforeach() endif() # Specify which plug-ins belong to this project MACRO(GetMyTargetLibraries all_target_libraries varname) SET(re_ctkplugin_mitk "^org_mitk_[a-zA-Z0-9_]+$") SET(re_ctkplugin_bb "^org_blueberry_[a-zA-Z0-9_]+$") SET(_tmp_list) LIST(APPEND _tmp_list ${all_target_libraries}) ctkMacroListFilter(_tmp_list re_ctkplugin_mitk re_ctkplugin_bb OUTPUT_VARIABLE ${varname}) ENDMACRO() - # Add the BlueBerry plugins to the set of core plugins - set(MITK_CORE_ENABLED_PLUGINS ${${CMAKE_PROJECT_NAME}_PLUGIN_LIBRARIES}) - # Get infos about application directories and build options include("${CMAKE_CURRENT_SOURCE_DIR}/Applications/AppList.cmake") set(mitk_apps_fullpath ) foreach(mitk_app ${MITK_APPS}) list(APPEND mitk_apps_fullpath "${CMAKE_CURRENT_SOURCE_DIR}/Applications/${mitk_app}") endforeach() - ctkMacroSetupPlugins(${mitk_core_plugins_fullpath} ${mitk_core_test_plugins_fullpath} ${mitk_ext_plugins_fullpath} + ctkMacroSetupPlugins(${mitk_plugins_fullpath} BUILD_OPTION_PREFIX MITK_BUILD_ APPS ${mitk_apps_fullpath} BUILD_ALL ${MITK_BUILD_ALL_PLUGINS} COMPACT_OPTIONS) - ctkFunctionExtractPluginTargets("${mitk_core_plugins_fullpath}" ON _coreui_plugins) - list(APPEND MITK_CORE_ENABLED_PLUGINS ${_coreui_plugins}) - set(MITK_PLUGIN_USE_FILE "${MITK_BINARY_DIR}/MitkPluginUseFile.cmake") if(${PROJECT_NAME}_PLUGIN_LIBRARIES) ctkFunctionGeneratePluginUseFile(${MITK_PLUGIN_USE_FILE}) else() file(REMOVE ${MITK_PLUGIN_USE_FILE}) set(MITK_PLUGIN_USE_FILE ) endif() - # add legacy BlueBerry bundles - add_subdirectory(Modules/Bundles) endif() # Construct a list of paths containing runtime directories # for MITK applications on Windows set(MITK_RUNTIME_PATH "${VTK_LIBRARY_DIRS}/%VS_BUILD_TYPE%;${ITK_LIBRARY_DIRS}/%VS_BUILD_TYPE%;${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/%VS_BUILD_TYPE%" ) + if(QT4_FOUND) set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${QT_LIBRARY_DIR}/../bin") endif() + if(MITK_USE_BLUEBERRY) set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${CTK_RUNTIME_LIBRARY_DIRS}/%VS_BUILD_TYPE%") if(DEFINED CTK_PLUGIN_RUNTIME_OUTPUT_DIRECTORY) if(IS_ABSOLUTE "${CTK_PLUGIN_RUNTIME_OUTPUT_DIRECTORY}") set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${CTK_PLUGIN_RUNTIME_OUTPUT_DIRECTORY}/%VS_BUILD_TYPE%") else() set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CTK_PLUGIN_RUNTIME_OUTPUT_DIRECTORY}/%VS_BUILD_TYPE%") endif() else() set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/plugins/%VS_BUILD_TYPE%") endif() endif() + if(GDCM_DIR) set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${GDCM_DIR}/bin/%VS_BUILD_TYPE%") endif() + if(OpenCV_DIR) set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${OpenCV_DIR}/bin/%VS_BUILD_TYPE%") endif() + # DCMTK is statically build #if(DCMTK_DIR) # set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${DCMTK_DIR}/bin/%VS_BUILD_TYPE%") #endif() + if(MITK_USE_Boost AND MITK_USE_Boost_LIBRARIES AND NOT MITK_USE_SYSTEM_Boost) set(MITK_RUNTIME_PATH "${MITK_RUNTIME_PATH};${Boost_LIBRARY_DIRS}") endif() - - #----------------------------------------------------------------------------- # Python Wrapping #----------------------------------------------------------------------------- set(MITK_WRAPPING_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Wrapping) set(MITK_WRAPPING_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Wrapping) option(MITK_USE_Python "Build cswig Python wrapper support (requires CableSwig)." OFF) if(MITK_USE_Python) add_subdirectory(Wrapping) endif() #----------------------------------------------------------------------------- # Documentation #----------------------------------------------------------------------------- add_subdirectory(Documentation) #----------------------------------------------------------------------------- # Installation #----------------------------------------------------------------------------- # set MITK cpack variables include(mitkSetupCPack) if(MITK_BUILD_org.mitk.gui.qt.application) list(APPEND CPACK_CREATE_DESKTOP_LINKS "CoreApp") endif() if(MITK_BUILD_org.mitk.gui.qt.extapplication) list(APPEND CPACK_CREATE_DESKTOP_LINKS "ExtApp") endif() configure_file(${MITK_SOURCE_DIR}/MITKCPackOptions.cmake.in ${MITK_BINARY_DIR}/MITKCPackOptions.cmake @ONLY) set(CPACK_PROJECT_CONFIG_FILE "${MITK_BINARY_DIR}/MITKCPackOptions.cmake") # include CPack model once all variables are set include(CPack) # Additional installation rules include(mitkInstallRules) #----------------------------------------------------------------------------- # Last configuration steps #----------------------------------------------------------------------------- set(MITK_EXPORTS_FILE "${MITK_BINARY_DIR}/MitkExports.cmake") file(REMOVE ${MITK_EXPORTS_FILE}) if(MITK_USE_BLUEBERRY) # This is for installation support of external projects depending on # MITK plugins. The export file should not be used for linking to MITK # libraries without using LINK_DIRECTORIES, since the exports are incomplete # yet(depending libraries are not exported). if(MITK_PLUGIN_LIBRARIES) export(TARGETS ${MITK_PLUGIN_LIBRARIES} APPEND FILE ${MITK_EXPORTS_FILE}) endif() endif() configure_file(${MITK_SOURCE_DIR}/CMake/ToolExtensionITKFactory.cpp.in ${MITK_BINARY_DIR}/ToolExtensionITKFactory.cpp.in COPYONLY) configure_file(${MITK_SOURCE_DIR}/CMake/ToolExtensionITKFactoryLoader.cpp.in ${MITK_BINARY_DIR}/ToolExtensionITKFactoryLoader.cpp.in COPYONLY) configure_file(${MITK_SOURCE_DIR}/CMake/ToolGUIExtensionITKFactory.cpp.in ${MITK_BINARY_DIR}/ToolGUIExtensionITKFactory.cpp.in COPYONLY) configure_file(mitkVersion.h.in ${MITK_BINARY_DIR}/mitkVersion.h) configure_file(mitkConfig.h.in ${MITK_BINARY_DIR}/mitkConfig.h) set(VECMATH_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utilities/vecmath) set(IPFUNC_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utilities/ipFunc) set(UTILITIES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Utilities) file(GLOB _MODULES_CONF_FILES RELATIVE ${PROJECT_BINARY_DIR}/${MODULES_CONF_DIRNAME} ${PROJECT_BINARY_DIR}/${MODULES_CONF_DIRNAME}/*.cmake) SET(MITK_MODULE_NAMES) foreach(_module ${_MODULES_CONF_FILES}) string(REPLACE Config.cmake "" _module_name ${_module}) list(APPEND MITK_MODULE_NAMES ${_module_name}) endforeach() configure_file(mitkConfig.h.in ${MITK_BINARY_DIR}/mitkConfig.h) configure_file(MITKConfig.cmake.in ${MITK_BINARY_DIR}/MITKConfig.cmake @ONLY) # If we are under Windows, create two batch files which correctly # set up the environment for the application and for Visual Studio if(WIN32) include(mitkFunctionCreateWindowsBatchScript) set(VS_SOLUTION_FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.sln") foreach(VS_BUILD_TYPE debug release) mitkFunctionCreateWindowsBatchScript("${MITK_SOURCE_DIR}/CMake/StartVS.bat.in" ${PROJECT_BINARY_DIR}/StartVS_${VS_BUILD_TYPE}.bat ${VS_BUILD_TYPE}) endforeach() endif(WIN32) #----------------------------------------------------------------------------- # MITK Applications #----------------------------------------------------------------------------- # This must come after MITKConfig.h was generated, since applications # might do a find_package(MITK REQUIRED). add_subdirectory(Applications) diff --git a/CoreUI/BundleTesting/PluginList.cmake b/CoreUI/BundleTesting/PluginList.cmake deleted file mode 100644 index cf83c4ddd7..0000000000 --- a/CoreUI/BundleTesting/PluginList.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(MITK_CORE_TEST_PLUGINS - org.mitk.gui.qt.common.tests:ON - ) diff --git a/CoreUI/Bundles/PluginList.cmake b/CoreUI/Bundles/PluginList.cmake deleted file mode 100644 index ea6b05f3c0..0000000000 --- a/CoreUI/Bundles/PluginList.cmake +++ /dev/null @@ -1,8 +0,0 @@ -set(MITK_CORE_PLUGINS - org.mitk.core.services:ON - org.mitk.gui.common:ON - org.mitk.gui.qt.coreapplication:OFF - org.mitk.gui.qt.common:ON - org.mitk.gui.qt.application:ON - org.mitk.gui.qt.stdmultiwidgeteditor:ON - ) diff --git a/CoreUI/CMakeLists.txt b/CoreUI/CMakeLists.txt deleted file mode 100644 index 14833942f4..0000000000 --- a/CoreUI/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -SET(MITK_DEFAULT_SUBPROJECTS MITK-CoreUI) - -IF(MITK_USE_QT AND QT4_FOUND) - ADD_SUBDIRECTORY(Qmitk) -ENDIF() - -IF(MITK_USE_BLUEBERRY) - # BlueBerry depends on CTK which depends on Qt, so we - # need the Qt include direcotries - INCLUDE(${QT_USE_FILE}) - - ADD_SUBDIRECTORY(Bundles) - - IF(MITK_ENABLE_GUI_TESTING AND BLUEBERRY_ENABLE_GUI_TESTING) - ADD_SUBDIRECTORY(BundleTesting) - ENDIF() -ENDIF() - diff --git a/Modules/Bundles/BundleList.cmake.in b/Modules/Bundles/BundleList.cmake.in deleted file mode 100755 index 5da4b28d4b..0000000000 --- a/Modules/Bundles/BundleList.cmake.in +++ /dev/null @@ -1 +0,0 @@ -@BLUEBERRY_BUNDLE_VARIABLES@ \ No newline at end of file diff --git a/Modules/Bundles/CMakeLists.txt b/Modules/Bundles/CMakeLists.txt deleted file mode 100644 index 99ff8278fd..0000000000 --- a/Modules/Bundles/CMakeLists.txt +++ /dev/null @@ -1,67 +0,0 @@ - -IF(MITK_USE_BLUEBERRY) - - SET(MITK_DEFAULT_SUBPROJECTS MITK-Plugins) - - SET(_mitk_bundles_default - - ) - - IF(MITK_USE_Python) - LIST(APPEND _mitk_bundles_default org.mitk.gui.qt.python.console) - ENDIF() - - IF(QT4_FOUND) - LIST(APPEND _mitk_bundles_default "org.mitk.gui.qt.imagenavigator") - - # BlueBerry depends on CTK which depends on Qt, so we - # need the Qt include direcotries - INCLUDE(${QT_USE_FILE}) - ENDIF() - - SET(PLUGIN_EXCLUDE_LIST - org.mitk.core.ext - org.mitk.core.jobs - org.mitk.diffusionimaging - org.mitk.gui.qt.common.legacy - org.mitk.gui.qt.diffusionimaging - org.mitk.gui.qt.dtiatlasapp - org.mitk.gui.qt.diffusionimagingapp - org.mitk.gui.qt.examples - org.mitk.gui.qt.examplesopencv - org.mitk.gui.qt.ext - org.mitk.gui.qt.extapplication - org.mitk.gui.qt.datamanager - org.mitk.gui.qt.segmentation - org.mitk.planarfigure - org.mitk.gui.qt.igttracking - org.mitk.gui.qt.igtnavigation - org.mitk.gui.qt.igtexamples - org.mitk.gui.qt.basicimageprocessing - org.mitk.gui.qt.navigationdataplayer - # bug-8977 Deactivating ToF for testing purposes - # org.mitk.gui.qt.tofutil - # org.mitk.gui.qt.toftutorial - org.mitk.gui.qt.imagenavigator - org.mitk.gui.qt.moviemaker - org.mitk.gui.qt.materialeditor - org.mitk.gui.qt.ugvisualization - org.mitk.gui.qt.measurementtoolbox - org.mitk.gui.qt.imagecropper - org.mitk.gui.qt.volumevisualization - org.mitk.gui.qt.pointsetinteraction - org.mitk.gui.qt.python.console - org.mitk.gui.qt.registration - ) - - MACRO_COLLECT_PLUGINS(OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ExtBundles - CACHE_PLUGIN_SOURCE_DIRS MITK_MODULES_PLUGIN_SOURCE_DIRS - CACHE_PLUGIN_OUTPUT_DIRS MITK_MODULES_PLUGIN_OUTPUT_DIRS - CACHE_PLUGIN_TARGETS MITK_MODULES_ENABLED_PLUGINS - BUNDLE_LIST_PATH "${MITK_BINARY_DIR}/Bundles/MITKModulesBundleList.cmake" - CMAKE_CACHE_PREFIX "MITK" - PLUGIN_DEFAULT_ON ${_mitk_bundles_default} - PLUGIN_EXCLUDES ${PLUGIN_EXCLUDE_LIST} - ${MITK_BUILD_ALL_PLUGINS_OPTION}) - -ENDIF(MITK_USE_BLUEBERRY) diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/Image_properties.bmp b/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/Image_properties.bmp deleted file mode 100644 index bd3aa51c22..0000000000 Binary files a/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/Image_properties.bmp and /dev/null differ diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/Parent-Child.bmp b/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/Parent-Child.bmp deleted file mode 100644 index 36c19ae569..0000000000 Binary files a/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/Parent-Child.bmp and /dev/null differ diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/Preferences.bmp b/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/Preferences.bmp deleted file mode 100644 index 1148d3abb6..0000000000 Binary files a/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/Preferences.bmp and /dev/null differ diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/Surface_Properties.bmp b/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/Surface_Properties.bmp deleted file mode 100644 index c2a6861def..0000000000 Binary files a/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/Surface_Properties.bmp and /dev/null differ diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.dox~ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.dox~ deleted file mode 100644 index 4d9808760a..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.dox~ +++ /dev/null @@ -1,104 +0,0 @@ -/** -\bundlemainpage{org_diffusion} MITK Diffusion Imaging (MITK-DI) - -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. - -Available sections: - - \ref QmitkDiffusionImagingUserManualIssues - - \ref QmitkDiffusionImagingUserManualTensorReconstruction - - \ref QmitkDiffusionImagingUserManualQBallReconstruction - - \ref QmitkDiffusionImagingUserManualDicomImport - - \ref QmitkDiffusionImagingUserManualQuantification - - \ref QmitkDiffusionImagingUserManualVisualizationSettings - - \ref QmitkDiffusionImagingUserManualReferences - - \ref QmitkDiffusionImagingUserManualTechnicalDetail - -\image html overview.png The MITK Diffusion Imaging Module - -\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 QmitkDiffusionImagingUserManualTensorReconstruction Tensor Reconstruction - -The tensor reconstruction view allows ITK based tensor reconstruction [3]. - -\image html tensor1.png ITK tensor reconstruction - -The advanced settings for ITK reconstruction let you configure the number of threads to be used and a manual threshold on the non-diffusion weighted image. All voxels below this threshold will not be reconstructed and left blank. - -\image html tensor2.png Advanced settings for ITK tensor reconstruction - -A few seconds (depending on the image size) after the reconstruction button is hit, a colored image should appear in the main window. - -\image html tensor4.png Tensor image after reconstruction - -\section QmitkDiffusionImagingUserManualQBallReconstruction Q-Ball Reconstruction - -The q-ball reonstruction bundle 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 - -\image html qballs1.png The q-ball resonstruction view - -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. - -\image html qballs2.png Advanced q-ball reconstruction settings - -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. - -\image html qballs3.png q-ball image after reconstruction - -\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. - -\image html dicom1.png Dicom import - -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 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). - -\image html quantification.png Anisotropy quantification - -\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: - -\image html visualization3.png Q-ball image with ODF glyph visibility toggled ON - -\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. - -\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 \subpage DiffusionImagingPropertiesPage . -*/ diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/files.cmake~ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/files.cmake~ deleted file mode 100644 index 0f89c67f7b..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/files.cmake~ +++ /dev/null @@ -1,115 +0,0 @@ -SET(SRC_CPP_FILES - QmitkODFDetailsWidget.cpp - QmitkODFRenderWidget.cpp - QmitkPartialVolumeAnalysisWidget.cpp - QmitkIVIMWidget.cpp - QmitkTbssRoiAnalysisWidget.cpp -) - -SET(INTERNAL_CPP_FILES - mitkPluginActivator.cpp - QmitkQBallReconstructionView.cpp - QmitkPreprocessingView.cpp - QmitkDiffusionDicomImportView.cpp - QmitkDiffusionQuantificationView.cpp - QmitkTensorReconstructionView.cpp - QmitkDiffusionImagingPublicPerspective.cpp - QmitkControlVisualizationPropertiesView.cpp - QmitkODFDetailsView.cpp - QmitkGibbsTrackingView.cpp - QmitkStochasticFiberTrackingView.cpp - QmitkFiberProcessingView.cpp - QmitkFiberBundleDeveloperView.cpp - QmitkPartialVolumeAnalysisView.cpp - QmitkIVIMView.cpp - QmitkScreenshotMaker.cpp - QmitkTractbasedSpatialStatisticsView.cpp - QmitkTbssTableModel.cpp - QmitkTbssMetaTableModel.cpp - QmitkTbssSkeletonizationView.cpp -) - -SET(UI_FILES - src/internal/QmitkQBallReconstructionViewControls.ui - src/internal/QmitkPreprocessingViewControls.ui - src/internal/QmitkDiffusionDicomImportViewControls.ui - src/internal/QmitkDiffusionQuantificationViewControls.ui - src/internal/QmitkTensorReconstructionViewControls.ui - src/internal/QmitkControlVisualizationPropertiesViewControls.ui - src/internal/QmitkODFDetailsViewControls.ui - src/internal/QmitkGibbsTrackingViewControls.ui - src/internal/QmitkStochasticFiberTrackingViewControls.ui - src/internal/QmitkFiberProcessingViewControls.ui - src/internal/QmitkFiberBundleDeveloperViewControls.ui - src/internal/QmitkPartialVolumeAnalysisViewControls.ui - src/internal/QmitkIVIMViewControls.ui - src/internal/QmitkScreenshotMakerControls.ui - src/internal/QmitkTractbasedSpatialStatisticsViewControls.ui - src/internal/QmitkTbssSkeletonizationViewControls.ui -) - -SET(MOC_H_FILES - src/internal/mitkPluginActivator.h - src/internal/QmitkQBallReconstructionView.h - src/internal/QmitkPreprocessingView.h - src/internal/QmitkDiffusionDicomImportView.h - src/internal/QmitkDiffusionImagingPublicPerspective.h - src/internal/QmitkDiffusionQuantificationView.h - src/internal/QmitkTensorReconstructionView.h - src/internal/QmitkControlVisualizationPropertiesView.h - src/internal/QmitkODFDetailsView.h - src/QmitkODFRenderWidget.h - src/QmitkODFDetailsWidget.h - src/internal/QmitkGibbsTrackingView.h - src/internal/QmitkStochasticFiberTrackingView.h - src/internal/QmitkFiberProcessingView.h - src/internal/QmitkFiberBundleDeveloperView.h - src/internal/QmitkPartialVolumeAnalysisView.h - src/QmitkPartialVolumeAnalysisWidget.h - src/internal/QmitkIVIMView.h - src/internal/QmitkScreenshotMaker.h - src/internal/QmitkTractbasedSpatialStatisticsView.h - src/internal/QmitkTbssSkeletonizationView.h - src/QmitkTbssRoiAnalysisWidget.h -) - -SET(CACHED_RESOURCE_FILES -# list of resource files which can be used by the plug-in -# system without loading the plug-ins shared library, -# for example the icon used in the menu and tabs for the -# plug-in views in the workbench - plugin.xml - - resources/preprocessing.png - resources/dwiimport.png - resources/quantification.png - resources/reconodf.png - resources/recontensor.png - resources/vizControls.png - resources/OdfDetails.png - resources/GibbsTracking.png - resources/FiberBundleOperations.png - resources/PartialVolumeAnalysis_24.png - resources/IVIM_48.png - resources/screenshot_maker.png - resources/stochFB.png - resources/tbss.png - resources/tbss2.png -) - -SET(QRC_FILES -# uncomment the following line if you want to use Qt resources - resources/QmitkDiffusionImaging.qrc - #resources/QmitkTractbasedSpatialStatisticsView.qrc -) - -SET(CPP_FILES ) - -foreach(file ${SRC_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/${file}) -endforeach(file ${SRC_CPP_FILES}) - -foreach(file ${INTERNAL_CPP_FILES}) - SET(CPP_FILES ${CPP_FILES} src/internal/${file}) -endforeach(file ${INTERNAL_CPP_FILES}) - diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/plugin.xml~ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/plugin.xml~ deleted file mode 100644 index dea3a8b59b..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/plugin.xml~ +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp~ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp~ deleted file mode 100644 index 988aa100a2..0000000000 --- a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp~ +++ /dev/null @@ -1,54 +0,0 @@ -#include "mitkPluginActivator.h" - -#include - - -#include "src/internal/QmitkDiffusionImagingPublicPerspective.h" - -#include "src/internal/QmitkQBallReconstructionView.h" -#include "src/internal/QmitkPreprocessingView.h" -#include "src/internal/QmitkDiffusionDicomImportView.h" -#include "src/internal/QmitkDiffusionQuantificationView.h" -#include "src/internal/QmitkTensorReconstructionView.h" -#include "src/internal/QmitkControlVisualizationPropertiesView.h" -#include "src/internal/QmitkODFDetailsView.h" -#include "src/internal/QmitkGibbsTrackingView.h" -#include "src/internal/QmitkStochasticFiberTrackingView.h" -#include "src/internal/QmitkFiberProcessingView.h" -#include "src/internal/QmitkFiberBundleDeveloperView.h" -#include "src/internal/QmitkPartialVolumeAnalysisView.h" -#include "src/internal/QmitkIVIMView.h" -#include "src/internal/QmitkScreenshotMaker.h" -#include "src/internal/QmitkTractbasedSpatialStatisticsView.h" - -namespace mitk { - -void PluginActivator::start(ctkPluginContext* context) -{ - BERRY_REGISTER_EXTENSION_CLASS(QmitkDiffusionImagingPublicPerspective, context) - - BERRY_REGISTER_EXTENSION_CLASS(QmitkQBallReconstructionView, context) - BERRY_REGISTER_EXTENSION_CLASS(QmitkPreprocessingView, context) - BERRY_REGISTER_EXTENSION_CLASS(QmitkDiffusionDicomImport, context) - BERRY_REGISTER_EXTENSION_CLASS(QmitkDiffusionQuantificationView, context) - BERRY_REGISTER_EXTENSION_CLASS(QmitkTensorReconstructionView, context) - BERRY_REGISTER_EXTENSION_CLASS(QmitkControlVisualizationPropertiesView, context) - BERRY_REGISTER_EXTENSION_CLASS(QmitkODFDetailsView, context) - BERRY_REGISTER_EXTENSION_CLASS(QmitkGibbsTrackingView, context) - BERRY_REGISTER_EXTENSION_CLASS(QmitkStochasticFiberTrackingView, context) - BERRY_REGISTER_EXTENSION_CLASS(QmitkFiberProcessingView, context) - BERRY_REGISTER_EXTENSION_CLASS(QmitkFiberBundleDeveloperView, context) - BERRY_REGISTER_EXTENSION_CLASS(QmitkPartialVolumeAnalysisView, context) - BERRY_REGISTER_EXTENSION_CLASS(QmitkIVIMView, context) - BERRY_REGISTER_EXTENSION_CLASS(QmitkScreenshotMaker, context) - BERRY_REGISTER_EXTENSION_CLASS(QmitkTractbasedSpatialStatisticsView, context) -} - -void PluginActivator::stop(ctkPluginContext* context) -{ - Q_UNUSED(context) -} - -} - -Q_EXPORT_PLUGIN2(org_mitk_gui_qt_diffusionimaging, mitk::PluginActivator) diff --git a/Modules/CMakeLists.txt b/Modules/CMakeLists.txt index 8d0e82236a..801a9633db 100644 --- a/Modules/CMakeLists.txt +++ b/Modules/CMakeLists.txt @@ -1,50 +1,52 @@ SET(LIBPOSTFIX "Ext") +# Modules must be listed according to their dependencies SET(module_dirs SceneSerializationBase PlanarFigure ImageExtraction ImageStatistics LegacyAdaptors IpPicSupport MitkExt SceneSerialization + Qmitk QmitkExt GraphAlgorithms DiffusionImaging GPGPU IGT CameraCalibration IGTUI RigidRegistration RigidRegistrationUI DeformableRegistration DeformableRegistrationUI OpenCVVideoSupport Overlays InputDevices ToFHardware ToFProcessing ToFUI - ClippingTools + ClippingTools ) SET(MITK_DEFAULT_SUBPROJECTS MITK-Modules) FOREACH(module_dir ${module_dirs}) ADD_SUBDIRECTORY(${module_dir}) ENDFOREACH() IF(MITK_PRIVATE_MODULES) FILE(GLOB all_subdirs RELATIVE ${MITK_PRIVATE_MODULES} ${MITK_PRIVATE_MODULES}/*) FOREACH(subdir ${all_subdirs}) STRING(FIND ${subdir} "." _result) IF(_result EQUAL -1) IF(EXISTS ${MITK_PRIVATE_MODULES}/${subdir}/CMakeLists.txt) MESSAGE(STATUS "Found private module ${subdir}") ADD_SUBDIRECTORY(${MITK_PRIVATE_MODULES}/${subdir} private_modules/${subdir}) ENDIF() ENDIF() ENDFOREACH() ENDIF(MITK_PRIVATE_MODULES) diff --git a/Modules/CMakeLists.txt~ b/Modules/CMakeLists.txt~ index b66eed50e5..8d0e82236a 100644 --- a/Modules/CMakeLists.txt~ +++ b/Modules/CMakeLists.txt~ @@ -1,47 +1,50 @@ SET(LIBPOSTFIX "Ext") SET(module_dirs SceneSerializationBase PlanarFigure ImageExtraction ImageStatistics + LegacyAdaptors + IpPicSupport MitkExt SceneSerialization QmitkExt - #GraphAlgorithms + GraphAlgorithms DiffusionImaging GPGPU IGT CameraCalibration IGTUI RigidRegistration RigidRegistrationUI DeformableRegistration DeformableRegistrationUI OpenCVVideoSupport Overlays InputDevices ToFHardware ToFProcessing - ToFUI + ToFUI + ClippingTools ) SET(MITK_DEFAULT_SUBPROJECTS MITK-Modules) FOREACH(module_dir ${module_dirs}) ADD_SUBDIRECTORY(${module_dir}) ENDFOREACH() IF(MITK_PRIVATE_MODULES) FILE(GLOB all_subdirs RELATIVE ${MITK_PRIVATE_MODULES} ${MITK_PRIVATE_MODULES}/*) FOREACH(subdir ${all_subdirs}) STRING(FIND ${subdir} "." _result) IF(_result EQUAL -1) IF(EXISTS ${MITK_PRIVATE_MODULES}/${subdir}/CMakeLists.txt) MESSAGE(STATUS "Found private module ${subdir}") ADD_SUBDIRECTORY(${MITK_PRIVATE_MODULES}/${subdir} private_modules/${subdir}) ENDIF() ENDIF() ENDFOREACH() ENDIF(MITK_PRIVATE_MODULES) diff --git a/CoreUI/Qmitk/Binaerbilder_48.png b/Modules/Qmitk/Binaerbilder_48.png similarity index 100% rename from CoreUI/Qmitk/Binaerbilder_48.png rename to Modules/Qmitk/Binaerbilder_48.png diff --git a/CoreUI/Qmitk/CMakeLists.txt b/Modules/Qmitk/CMakeLists.txt similarity index 100% rename from CoreUI/Qmitk/CMakeLists.txt rename to Modules/Qmitk/CMakeLists.txt diff --git a/CoreUI/Qmitk/DataTypeUnknown_48.png b/Modules/Qmitk/DataTypeUnknown_48.png similarity index 100% rename from CoreUI/Qmitk/DataTypeUnknown_48.png rename to Modules/Qmitk/DataTypeUnknown_48.png diff --git a/CoreUI/Qmitk/Images_48.png b/Modules/Qmitk/Images_48.png similarity index 100% rename from CoreUI/Qmitk/Images_48.png rename to Modules/Qmitk/Images_48.png diff --git a/CoreUI/Qmitk/PointSet_48.png b/Modules/Qmitk/PointSet_48.png similarity index 100% rename from CoreUI/Qmitk/PointSet_48.png rename to Modules/Qmitk/PointSet_48.png diff --git a/CoreUI/Qmitk/Qmitk.qrc b/Modules/Qmitk/Qmitk.qrc similarity index 100% rename from CoreUI/Qmitk/Qmitk.qrc rename to Modules/Qmitk/Qmitk.qrc diff --git a/CoreUI/Qmitk/QmitkApplicationCursor.cpp b/Modules/Qmitk/QmitkApplicationCursor.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkApplicationCursor.cpp rename to Modules/Qmitk/QmitkApplicationCursor.cpp diff --git a/CoreUI/Qmitk/QmitkApplicationCursor.h b/Modules/Qmitk/QmitkApplicationCursor.h similarity index 100% rename from CoreUI/Qmitk/QmitkApplicationCursor.h rename to Modules/Qmitk/QmitkApplicationCursor.h diff --git a/CoreUI/Qmitk/QmitkCustomVariants.h b/Modules/Qmitk/QmitkCustomVariants.h similarity index 100% rename from CoreUI/Qmitk/QmitkCustomVariants.h rename to Modules/Qmitk/QmitkCustomVariants.h diff --git a/CoreUI/Qmitk/QmitkDataStorageComboBox.cpp b/Modules/Qmitk/QmitkDataStorageComboBox.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkDataStorageComboBox.cpp rename to Modules/Qmitk/QmitkDataStorageComboBox.cpp diff --git a/CoreUI/Qmitk/QmitkDataStorageComboBox.h b/Modules/Qmitk/QmitkDataStorageComboBox.h similarity index 100% rename from CoreUI/Qmitk/QmitkDataStorageComboBox.h rename to Modules/Qmitk/QmitkDataStorageComboBox.h diff --git a/CoreUI/Qmitk/QmitkDataStorageListModel.cpp b/Modules/Qmitk/QmitkDataStorageListModel.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkDataStorageListModel.cpp rename to Modules/Qmitk/QmitkDataStorageListModel.cpp diff --git a/CoreUI/Qmitk/QmitkDataStorageListModel.h b/Modules/Qmitk/QmitkDataStorageListModel.h similarity index 100% rename from CoreUI/Qmitk/QmitkDataStorageListModel.h rename to Modules/Qmitk/QmitkDataStorageListModel.h diff --git a/CoreUI/Qmitk/QmitkDataStorageTableModel.cpp b/Modules/Qmitk/QmitkDataStorageTableModel.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkDataStorageTableModel.cpp rename to Modules/Qmitk/QmitkDataStorageTableModel.cpp diff --git a/CoreUI/Qmitk/QmitkDataStorageTableModel.h b/Modules/Qmitk/QmitkDataStorageTableModel.h similarity index 100% rename from CoreUI/Qmitk/QmitkDataStorageTableModel.h rename to Modules/Qmitk/QmitkDataStorageTableModel.h diff --git a/CoreUI/Qmitk/QmitkDataStorageTreeModel.cpp b/Modules/Qmitk/QmitkDataStorageTreeModel.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkDataStorageTreeModel.cpp rename to Modules/Qmitk/QmitkDataStorageTreeModel.cpp diff --git a/CoreUI/Qmitk/QmitkDataStorageTreeModel.h b/Modules/Qmitk/QmitkDataStorageTreeModel.h similarity index 100% rename from CoreUI/Qmitk/QmitkDataStorageTreeModel.h rename to Modules/Qmitk/QmitkDataStorageTreeModel.h diff --git a/CoreUI/Qmitk/QmitkEnums.h b/Modules/Qmitk/QmitkEnums.h similarity index 100% rename from CoreUI/Qmitk/QmitkEnums.h rename to Modules/Qmitk/QmitkEnums.h diff --git a/CoreUI/Qmitk/QmitkEventAdapter.cpp b/Modules/Qmitk/QmitkEventAdapter.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkEventAdapter.cpp rename to Modules/Qmitk/QmitkEventAdapter.cpp diff --git a/CoreUI/Qmitk/QmitkEventAdapter.h b/Modules/Qmitk/QmitkEventAdapter.h similarity index 100% rename from CoreUI/Qmitk/QmitkEventAdapter.h rename to Modules/Qmitk/QmitkEventAdapter.h diff --git a/CoreUI/Qmitk/QmitkLevelWindowPresetDefinition.ui b/Modules/Qmitk/QmitkLevelWindowPresetDefinition.ui similarity index 100% rename from CoreUI/Qmitk/QmitkLevelWindowPresetDefinition.ui rename to Modules/Qmitk/QmitkLevelWindowPresetDefinition.ui diff --git a/CoreUI/Qmitk/QmitkLevelWindowPresetDefinitionDialog.cpp b/Modules/Qmitk/QmitkLevelWindowPresetDefinitionDialog.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkLevelWindowPresetDefinitionDialog.cpp rename to Modules/Qmitk/QmitkLevelWindowPresetDefinitionDialog.cpp diff --git a/CoreUI/Qmitk/QmitkLevelWindowPresetDefinitionDialog.h b/Modules/Qmitk/QmitkLevelWindowPresetDefinitionDialog.h similarity index 100% rename from CoreUI/Qmitk/QmitkLevelWindowPresetDefinitionDialog.h rename to Modules/Qmitk/QmitkLevelWindowPresetDefinitionDialog.h diff --git a/CoreUI/Qmitk/QmitkLevelWindowRangeChange.ui b/Modules/Qmitk/QmitkLevelWindowRangeChange.ui similarity index 100% rename from CoreUI/Qmitk/QmitkLevelWindowRangeChange.ui rename to Modules/Qmitk/QmitkLevelWindowRangeChange.ui diff --git a/CoreUI/Qmitk/QmitkLevelWindowRangeChangeDialog.cpp b/Modules/Qmitk/QmitkLevelWindowRangeChangeDialog.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkLevelWindowRangeChangeDialog.cpp rename to Modules/Qmitk/QmitkLevelWindowRangeChangeDialog.cpp diff --git a/CoreUI/Qmitk/QmitkLevelWindowRangeChangeDialog.h b/Modules/Qmitk/QmitkLevelWindowRangeChangeDialog.h similarity index 100% rename from CoreUI/Qmitk/QmitkLevelWindowRangeChangeDialog.h rename to Modules/Qmitk/QmitkLevelWindowRangeChangeDialog.h diff --git a/CoreUI/Qmitk/QmitkLevelWindowWidget.cpp b/Modules/Qmitk/QmitkLevelWindowWidget.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkLevelWindowWidget.cpp rename to Modules/Qmitk/QmitkLevelWindowWidget.cpp diff --git a/CoreUI/Qmitk/QmitkLevelWindowWidget.h b/Modules/Qmitk/QmitkLevelWindowWidget.h similarity index 100% rename from CoreUI/Qmitk/QmitkLevelWindowWidget.h rename to Modules/Qmitk/QmitkLevelWindowWidget.h diff --git a/CoreUI/Qmitk/QmitkLevelWindowWidget.ui b/Modules/Qmitk/QmitkLevelWindowWidget.ui similarity index 100% rename from CoreUI/Qmitk/QmitkLevelWindowWidget.ui rename to Modules/Qmitk/QmitkLevelWindowWidget.ui diff --git a/CoreUI/Qmitk/QmitkLevelWindowWidgetContextMenu.cpp b/Modules/Qmitk/QmitkLevelWindowWidgetContextMenu.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkLevelWindowWidgetContextMenu.cpp rename to Modules/Qmitk/QmitkLevelWindowWidgetContextMenu.cpp diff --git a/CoreUI/Qmitk/QmitkLevelWindowWidgetContextMenu.h b/Modules/Qmitk/QmitkLevelWindowWidgetContextMenu.h similarity index 100% rename from CoreUI/Qmitk/QmitkLevelWindowWidgetContextMenu.h rename to Modules/Qmitk/QmitkLevelWindowWidgetContextMenu.h diff --git a/CoreUI/Qmitk/QmitkLineEditLevelWindowWidget.cpp b/Modules/Qmitk/QmitkLineEditLevelWindowWidget.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkLineEditLevelWindowWidget.cpp rename to Modules/Qmitk/QmitkLineEditLevelWindowWidget.cpp diff --git a/CoreUI/Qmitk/QmitkLineEditLevelWindowWidget.h b/Modules/Qmitk/QmitkLineEditLevelWindowWidget.h similarity index 100% rename from CoreUI/Qmitk/QmitkLineEditLevelWindowWidget.h rename to Modules/Qmitk/QmitkLineEditLevelWindowWidget.h diff --git a/CoreUI/Qmitk/QmitkMemoryUsageIndicator.ui b/Modules/Qmitk/QmitkMemoryUsageIndicator.ui similarity index 100% rename from CoreUI/Qmitk/QmitkMemoryUsageIndicator.ui rename to Modules/Qmitk/QmitkMemoryUsageIndicator.ui diff --git a/CoreUI/Qmitk/QmitkMemoryUsageIndicatorImagesGreen.xpm b/Modules/Qmitk/QmitkMemoryUsageIndicatorImagesGreen.xpm similarity index 100% rename from CoreUI/Qmitk/QmitkMemoryUsageIndicatorImagesGreen.xpm rename to Modules/Qmitk/QmitkMemoryUsageIndicatorImagesGreen.xpm diff --git a/CoreUI/Qmitk/QmitkMemoryUsageIndicatorImagesOrange.xpm b/Modules/Qmitk/QmitkMemoryUsageIndicatorImagesOrange.xpm similarity index 100% rename from CoreUI/Qmitk/QmitkMemoryUsageIndicatorImagesOrange.xpm rename to Modules/Qmitk/QmitkMemoryUsageIndicatorImagesOrange.xpm diff --git a/CoreUI/Qmitk/QmitkMemoryUsageIndicatorImagesRed.xpm b/Modules/Qmitk/QmitkMemoryUsageIndicatorImagesRed.xpm similarity index 100% rename from CoreUI/Qmitk/QmitkMemoryUsageIndicatorImagesRed.xpm rename to Modules/Qmitk/QmitkMemoryUsageIndicatorImagesRed.xpm diff --git a/CoreUI/Qmitk/QmitkMemoryUsageIndicatorImagesYellow.xpm b/Modules/Qmitk/QmitkMemoryUsageIndicatorImagesYellow.xpm similarity index 100% rename from CoreUI/Qmitk/QmitkMemoryUsageIndicatorImagesYellow.xpm rename to Modules/Qmitk/QmitkMemoryUsageIndicatorImagesYellow.xpm diff --git a/CoreUI/Qmitk/QmitkMemoryUsageIndicatorView.cpp b/Modules/Qmitk/QmitkMemoryUsageIndicatorView.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkMemoryUsageIndicatorView.cpp rename to Modules/Qmitk/QmitkMemoryUsageIndicatorView.cpp diff --git a/CoreUI/Qmitk/QmitkMemoryUsageIndicatorView.h b/Modules/Qmitk/QmitkMemoryUsageIndicatorView.h similarity index 100% rename from CoreUI/Qmitk/QmitkMemoryUsageIndicatorView.h rename to Modules/Qmitk/QmitkMemoryUsageIndicatorView.h diff --git a/CoreUI/Qmitk/QmitkMouseModeSwitcher.cpp b/Modules/Qmitk/QmitkMouseModeSwitcher.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkMouseModeSwitcher.cpp rename to Modules/Qmitk/QmitkMouseModeSwitcher.cpp diff --git a/CoreUI/Qmitk/QmitkMouseModeSwitcher.h b/Modules/Qmitk/QmitkMouseModeSwitcher.h similarity index 100% rename from CoreUI/Qmitk/QmitkMouseModeSwitcher.h rename to Modules/Qmitk/QmitkMouseModeSwitcher.h diff --git a/CoreUI/Qmitk/QmitkNodeDescriptor.cpp b/Modules/Qmitk/QmitkNodeDescriptor.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkNodeDescriptor.cpp rename to Modules/Qmitk/QmitkNodeDescriptor.cpp diff --git a/CoreUI/Qmitk/QmitkNodeDescriptor.h b/Modules/Qmitk/QmitkNodeDescriptor.h similarity index 100% rename from CoreUI/Qmitk/QmitkNodeDescriptor.h rename to Modules/Qmitk/QmitkNodeDescriptor.h diff --git a/CoreUI/Qmitk/QmitkNodeDescriptorManager.cpp b/Modules/Qmitk/QmitkNodeDescriptorManager.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkNodeDescriptorManager.cpp rename to Modules/Qmitk/QmitkNodeDescriptorManager.cpp diff --git a/CoreUI/Qmitk/QmitkNodeDescriptorManager.h b/Modules/Qmitk/QmitkNodeDescriptorManager.h similarity index 100% rename from CoreUI/Qmitk/QmitkNodeDescriptorManager.h rename to Modules/Qmitk/QmitkNodeDescriptorManager.h diff --git a/CoreUI/Qmitk/QmitkProgressBar.cpp b/Modules/Qmitk/QmitkProgressBar.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkProgressBar.cpp rename to Modules/Qmitk/QmitkProgressBar.cpp diff --git a/CoreUI/Qmitk/QmitkProgressBar.h b/Modules/Qmitk/QmitkProgressBar.h similarity index 100% rename from CoreUI/Qmitk/QmitkProgressBar.h rename to Modules/Qmitk/QmitkProgressBar.h diff --git a/CoreUI/Qmitk/QmitkPropertiesTableEditor.cpp b/Modules/Qmitk/QmitkPropertiesTableEditor.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkPropertiesTableEditor.cpp rename to Modules/Qmitk/QmitkPropertiesTableEditor.cpp diff --git a/CoreUI/Qmitk/QmitkPropertiesTableEditor.h b/Modules/Qmitk/QmitkPropertiesTableEditor.h similarity index 100% rename from CoreUI/Qmitk/QmitkPropertiesTableEditor.h rename to Modules/Qmitk/QmitkPropertiesTableEditor.h diff --git a/CoreUI/Qmitk/QmitkPropertiesTableModel.cpp b/Modules/Qmitk/QmitkPropertiesTableModel.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkPropertiesTableModel.cpp rename to Modules/Qmitk/QmitkPropertiesTableModel.cpp diff --git a/CoreUI/Qmitk/QmitkPropertiesTableModel.h b/Modules/Qmitk/QmitkPropertiesTableModel.h similarity index 100% rename from CoreUI/Qmitk/QmitkPropertiesTableModel.h rename to Modules/Qmitk/QmitkPropertiesTableModel.h diff --git a/CoreUI/Qmitk/QmitkPropertyDelegate.cpp b/Modules/Qmitk/QmitkPropertyDelegate.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkPropertyDelegate.cpp rename to Modules/Qmitk/QmitkPropertyDelegate.cpp diff --git a/CoreUI/Qmitk/QmitkPropertyDelegate.h b/Modules/Qmitk/QmitkPropertyDelegate.h similarity index 100% rename from CoreUI/Qmitk/QmitkPropertyDelegate.h rename to Modules/Qmitk/QmitkPropertyDelegate.h diff --git a/CoreUI/Qmitk/QmitkRegisterClasses.cpp b/Modules/Qmitk/QmitkRegisterClasses.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkRegisterClasses.cpp rename to Modules/Qmitk/QmitkRegisterClasses.cpp diff --git a/CoreUI/Qmitk/QmitkRegisterClasses.h b/Modules/Qmitk/QmitkRegisterClasses.h similarity index 100% rename from CoreUI/Qmitk/QmitkRegisterClasses.h rename to Modules/Qmitk/QmitkRegisterClasses.h diff --git a/CoreUI/Qmitk/QmitkRenderWindow.cpp b/Modules/Qmitk/QmitkRenderWindow.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkRenderWindow.cpp rename to Modules/Qmitk/QmitkRenderWindow.cpp diff --git a/CoreUI/Qmitk/QmitkRenderWindow.h b/Modules/Qmitk/QmitkRenderWindow.h similarity index 100% rename from CoreUI/Qmitk/QmitkRenderWindow.h rename to Modules/Qmitk/QmitkRenderWindow.h diff --git a/CoreUI/Qmitk/QmitkRenderWindowMenu.cpp b/Modules/Qmitk/QmitkRenderWindowMenu.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkRenderWindowMenu.cpp rename to Modules/Qmitk/QmitkRenderWindowMenu.cpp diff --git a/CoreUI/Qmitk/QmitkRenderWindowMenu.h b/Modules/Qmitk/QmitkRenderWindowMenu.h similarity index 100% rename from CoreUI/Qmitk/QmitkRenderWindowMenu.h rename to Modules/Qmitk/QmitkRenderWindowMenu.h diff --git a/CoreUI/Qmitk/QmitkRenderingManager.cpp b/Modules/Qmitk/QmitkRenderingManager.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkRenderingManager.cpp rename to Modules/Qmitk/QmitkRenderingManager.cpp diff --git a/CoreUI/Qmitk/QmitkRenderingManager.h b/Modules/Qmitk/QmitkRenderingManager.h similarity index 100% rename from CoreUI/Qmitk/QmitkRenderingManager.h rename to Modules/Qmitk/QmitkRenderingManager.h diff --git a/CoreUI/Qmitk/QmitkRenderingManagerFactory.cpp b/Modules/Qmitk/QmitkRenderingManagerFactory.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkRenderingManagerFactory.cpp rename to Modules/Qmitk/QmitkRenderingManagerFactory.cpp diff --git a/CoreUI/Qmitk/QmitkRenderingManagerFactory.h b/Modules/Qmitk/QmitkRenderingManagerFactory.h similarity index 100% rename from CoreUI/Qmitk/QmitkRenderingManagerFactory.h rename to Modules/Qmitk/QmitkRenderingManagerFactory.h diff --git a/CoreUI/Qmitk/QmitkSliderLevelWindowWidget.cpp b/Modules/Qmitk/QmitkSliderLevelWindowWidget.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkSliderLevelWindowWidget.cpp rename to Modules/Qmitk/QmitkSliderLevelWindowWidget.cpp diff --git a/CoreUI/Qmitk/QmitkSliderLevelWindowWidget.h b/Modules/Qmitk/QmitkSliderLevelWindowWidget.h similarity index 100% rename from CoreUI/Qmitk/QmitkSliderLevelWindowWidget.h rename to Modules/Qmitk/QmitkSliderLevelWindowWidget.h diff --git a/CoreUI/Qmitk/QmitkStdMultiWidget.cpp b/Modules/Qmitk/QmitkStdMultiWidget.cpp similarity index 100% rename from CoreUI/Qmitk/QmitkStdMultiWidget.cpp rename to Modules/Qmitk/QmitkStdMultiWidget.cpp diff --git a/CoreUI/Qmitk/QmitkStdMultiWidget.h b/Modules/Qmitk/QmitkStdMultiWidget.h similarity index 100% rename from CoreUI/Qmitk/QmitkStdMultiWidget.h rename to Modules/Qmitk/QmitkStdMultiWidget.h diff --git a/CoreUI/Qmitk/Segmentation_48.png b/Modules/Qmitk/Segmentation_48.png similarity index 100% rename from CoreUI/Qmitk/Segmentation_48.png rename to Modules/Qmitk/Segmentation_48.png diff --git a/CoreUI/Qmitk/Surface_48.png b/Modules/Qmitk/Surface_48.png similarity index 100% rename from CoreUI/Qmitk/Surface_48.png rename to Modules/Qmitk/Surface_48.png diff --git a/CoreUI/Qmitk/files.cmake b/Modules/Qmitk/files.cmake similarity index 100% rename from CoreUI/Qmitk/files.cmake rename to Modules/Qmitk/files.cmake diff --git a/CoreUI/Qmitk/iconClose.xpm b/Modules/Qmitk/iconClose.xpm similarity index 100% rename from CoreUI/Qmitk/iconClose.xpm rename to Modules/Qmitk/iconClose.xpm diff --git a/CoreUI/Qmitk/iconCrosshairMode.xpm b/Modules/Qmitk/iconCrosshairMode.xpm similarity index 100% rename from CoreUI/Qmitk/iconCrosshairMode.xpm rename to Modules/Qmitk/iconCrosshairMode.xpm diff --git a/CoreUI/Qmitk/iconFullScreen.xpm b/Modules/Qmitk/iconFullScreen.xpm similarity index 100% rename from CoreUI/Qmitk/iconFullScreen.xpm rename to Modules/Qmitk/iconFullScreen.xpm diff --git a/CoreUI/Qmitk/iconHoriSplit.xpm b/Modules/Qmitk/iconHoriSplit.xpm similarity index 100% rename from CoreUI/Qmitk/iconHoriSplit.xpm rename to Modules/Qmitk/iconHoriSplit.xpm diff --git a/CoreUI/Qmitk/iconLeaveFullScreen.xpm b/Modules/Qmitk/iconLeaveFullScreen.xpm similarity index 100% rename from CoreUI/Qmitk/iconLeaveFullScreen.xpm rename to Modules/Qmitk/iconLeaveFullScreen.xpm diff --git a/CoreUI/Qmitk/iconSettings.xpm b/Modules/Qmitk/iconSettings.xpm similarity index 100% rename from CoreUI/Qmitk/iconSettings.xpm rename to Modules/Qmitk/iconSettings.xpm diff --git a/CoreUI/Qmitk/iconVertiSplit.xpm b/Modules/Qmitk/iconVertiSplit.xpm similarity index 100% rename from CoreUI/Qmitk/iconVertiSplit.xpm rename to Modules/Qmitk/iconVertiSplit.xpm diff --git a/CoreUI/Qmitk/mm_contrast.png b/Modules/Qmitk/mm_contrast.png similarity index 100% rename from CoreUI/Qmitk/mm_contrast.png rename to Modules/Qmitk/mm_contrast.png diff --git a/CoreUI/Qmitk/mm_pan.png b/Modules/Qmitk/mm_pan.png similarity index 100% rename from CoreUI/Qmitk/mm_pan.png rename to Modules/Qmitk/mm_pan.png diff --git a/CoreUI/Qmitk/mm_pointer.png b/Modules/Qmitk/mm_pointer.png similarity index 100% rename from CoreUI/Qmitk/mm_pointer.png rename to Modules/Qmitk/mm_pointer.png diff --git a/CoreUI/Qmitk/mm_scroll.png b/Modules/Qmitk/mm_scroll.png similarity index 100% rename from CoreUI/Qmitk/mm_scroll.png rename to Modules/Qmitk/mm_scroll.png diff --git a/CoreUI/Qmitk/mm_zoom.png b/Modules/Qmitk/mm_zoom.png similarity index 100% rename from CoreUI/Qmitk/mm_zoom.png rename to Modules/Qmitk/mm_zoom.png diff --git a/CoreUI/Qmitk/mousemodes.xcf b/Modules/Qmitk/mousemodes.xcf similarity index 100% rename from CoreUI/Qmitk/mousemodes.xcf rename to Modules/Qmitk/mousemodes.xcf diff --git a/Modules/Bundles/PluginList.cmake b/Plugins/PluginList.cmake similarity index 82% rename from Modules/Bundles/PluginList.cmake rename to Plugins/PluginList.cmake index 6cc5e324eb..919b717503 100644 --- a/Modules/Bundles/PluginList.cmake +++ b/Plugins/PluginList.cmake @@ -1,32 +1,42 @@ SET(MITK_EXT_PLUGINS + + # default ON + org.mitk.core.services:ON + org.mitk.gui.common:ON + org.mitk.gui.qt.application:ON + org.mitk.gui.qt.common:ON + org.mitk.gui.qt.datamanager:ON + org.mitk.gui.qt.stdmultiwidgeteditor:ON + org.mitk.planarfigure:ON + + # default OFF org.mitk.core.ext:OFF org.mitk.core.jobs:OFF - org.mitk.planarfigure:ON org.mitk.diffusionimaging:OFF + org.mitk.gui.qt.basicimageprocessing:OFF org.mitk.gui.qt.common.legacy:OFF + org.mitk.gui.qt.coreapplication:OFF + org.mitk.gui.qt.diffusionimagingapp:OFF + org.mitk.gui.qt.diffusionimaging:OFF + org.mitk.gui.qt.dtiatlasapp:OFF org.mitk.gui.qt.examples:OFF org.mitk.gui.qt.examplesopencv:OFF - org.mitk.gui.qt.ext:OFF org.mitk.gui.qt.extapplication:OFF - org.mitk.gui.qt.datamanager:ON - org.mitk.gui.qt.segmentation:OFF - org.mitk.gui.qt.diffusionimaging:OFF - org.mitk.gui.qt.dtiatlasapp:OFF - org.mitk.gui.qt.diffusionimagingapp:OFF + org.mitk.gui.qt.ext:OFF + org.mitk.gui.qt.igtexamples:OFF org.mitk.gui.qt.igtnavigation:OFF org.mitk.gui.qt.igttracking:OFF - org.mitk.gui.qt.igtexamples:OFF - org.mitk.gui.qt.basicimageprocessing:OFF - org.mitk.gui.qt.tofutil:OFF - org.mitk.gui.qt.toftutorial:OFF + org.mitk.gui.qt.imagecropper:OFF org.mitk.gui.qt.imagenavigator:ON - org.mitk.gui.qt.moviemaker:OFF org.mitk.gui.qt.materialeditor:OFF - org.mitk.gui.qt.ugvisualization:OFF org.mitk.gui.qt.measurementtoolbox:OFF - org.mitk.gui.qt.imagecropper:OFF - org.mitk.gui.qt.volumevisualization:OFF + org.mitk.gui.qt.moviemaker:OFF org.mitk.gui.qt.pointsetinteraction:OFF org.mitk.gui.qt.python.console:OFF org.mitk.gui.qt.registration:OFF - ) + org.mitk.gui.qt.segmentation:OFF + org.mitk.gui.qt.toftutorial:OFF + org.mitk.gui.qt.tofutil:OFF + org.mitk.gui.qt.ugvisualization:OFF + org.mitk.gui.qt.volumevisualization:OFF +) diff --git a/Modules/Bundles/org.mitk.core.ext/CMakeLists.txt b/Plugins/org.mitk.core.ext/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/CMakeLists.txt rename to Plugins/org.mitk.core.ext/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.core.ext/documentation/doxygen/modules.dox b/Plugins/org.mitk.core.ext/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/documentation/doxygen/modules.dox rename to Plugins/org.mitk.core.ext/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.core.ext/files.cmake b/Plugins/org.mitk.core.ext/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/files.cmake rename to Plugins/org.mitk.core.ext/files.cmake diff --git a/Modules/Bundles/org.mitk.core.ext/manifest_headers.cmake b/Plugins/org.mitk.core.ext/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/manifest_headers.cmake rename to Plugins/org.mitk.core.ext/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.core.ext/plugin.xml b/Plugins/org.mitk.core.ext/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/plugin.xml rename to Plugins/org.mitk.core.ext/plugin.xml diff --git a/Modules/Bundles/org.mitk.core.ext/schema/inputdevice.exsd b/Plugins/org.mitk.core.ext/schema/inputdevice.exsd similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/schema/inputdevice.exsd rename to Plugins/org.mitk.core.ext/schema/inputdevice.exsd diff --git a/Modules/Bundles/org.mitk.core.ext/src/internal/mitkCoreExtActivator.cpp b/Plugins/org.mitk.core.ext/src/internal/mitkCoreExtActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/src/internal/mitkCoreExtActivator.cpp rename to Plugins/org.mitk.core.ext/src/internal/mitkCoreExtActivator.cpp diff --git a/Modules/Bundles/org.mitk.core.ext/src/internal/mitkCoreExtActivator.h b/Plugins/org.mitk.core.ext/src/internal/mitkCoreExtActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/src/internal/mitkCoreExtActivator.h rename to Plugins/org.mitk.core.ext/src/internal/mitkCoreExtActivator.h diff --git a/Modules/Bundles/org.mitk.core.ext/src/mitkCoreExtConstants.cpp b/Plugins/org.mitk.core.ext/src/mitkCoreExtConstants.cpp similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/src/mitkCoreExtConstants.cpp rename to Plugins/org.mitk.core.ext/src/mitkCoreExtConstants.cpp diff --git a/Modules/Bundles/org.mitk.core.ext/src/mitkCoreExtConstants.h b/Plugins/org.mitk.core.ext/src/mitkCoreExtConstants.h similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/src/mitkCoreExtConstants.h rename to Plugins/org.mitk.core.ext/src/mitkCoreExtConstants.h diff --git a/Modules/Bundles/org.mitk.core.ext/src/mitkIInputDevice.h b/Plugins/org.mitk.core.ext/src/mitkIInputDevice.h similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/src/mitkIInputDevice.h rename to Plugins/org.mitk.core.ext/src/mitkIInputDevice.h diff --git a/Modules/Bundles/org.mitk.core.ext/src/mitkIInputDeviceDescriptor.h b/Plugins/org.mitk.core.ext/src/mitkIInputDeviceDescriptor.h similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/src/mitkIInputDeviceDescriptor.h rename to Plugins/org.mitk.core.ext/src/mitkIInputDeviceDescriptor.h diff --git a/Modules/Bundles/org.mitk.core.ext/src/mitkIInputDeviceRegistry.h b/Plugins/org.mitk.core.ext/src/mitkIInputDeviceRegistry.h similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/src/mitkIInputDeviceRegistry.h rename to Plugins/org.mitk.core.ext/src/mitkIInputDeviceRegistry.h diff --git a/Modules/Bundles/org.mitk.core.ext/src/mitkInputDeviceDescriptor.cpp b/Plugins/org.mitk.core.ext/src/mitkInputDeviceDescriptor.cpp similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/src/mitkInputDeviceDescriptor.cpp rename to Plugins/org.mitk.core.ext/src/mitkInputDeviceDescriptor.cpp diff --git a/Modules/Bundles/org.mitk.core.ext/src/mitkInputDeviceDescriptor.h b/Plugins/org.mitk.core.ext/src/mitkInputDeviceDescriptor.h similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/src/mitkInputDeviceDescriptor.h rename to Plugins/org.mitk.core.ext/src/mitkInputDeviceDescriptor.h diff --git a/Modules/Bundles/org.mitk.core.ext/src/mitkInputDeviceRegistry.cpp b/Plugins/org.mitk.core.ext/src/mitkInputDeviceRegistry.cpp similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/src/mitkInputDeviceRegistry.cpp rename to Plugins/org.mitk.core.ext/src/mitkInputDeviceRegistry.cpp diff --git a/Modules/Bundles/org.mitk.core.ext/src/mitkInputDeviceRegistry.h b/Plugins/org.mitk.core.ext/src/mitkInputDeviceRegistry.h similarity index 100% rename from Modules/Bundles/org.mitk.core.ext/src/mitkInputDeviceRegistry.h rename to Plugins/org.mitk.core.ext/src/mitkInputDeviceRegistry.h diff --git a/Modules/Bundles/org.mitk.core.jobs/CMakeLists.txt b/Plugins/org.mitk.core.jobs/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.core.jobs/CMakeLists.txt rename to Plugins/org.mitk.core.jobs/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.core.jobs/documentation/doxygen/modules.dox b/Plugins/org.mitk.core.jobs/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.core.jobs/documentation/doxygen/modules.dox rename to Plugins/org.mitk.core.jobs/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.core.jobs/documentation/doxygen/pics/AddandRemoveRule.png b/Plugins/org.mitk.core.jobs/documentation/doxygen/pics/AddandRemoveRule.png similarity index 100% rename from Modules/Bundles/org.mitk.core.jobs/documentation/doxygen/pics/AddandRemoveRule.png rename to Plugins/org.mitk.core.jobs/documentation/doxygen/pics/AddandRemoveRule.png diff --git a/Modules/Bundles/org.mitk.core.jobs/documentation/doxygen/pics/TwoAddRules.png b/Plugins/org.mitk.core.jobs/documentation/doxygen/pics/TwoAddRules.png similarity index 100% rename from Modules/Bundles/org.mitk.core.jobs/documentation/doxygen/pics/TwoAddRules.png rename to Plugins/org.mitk.core.jobs/documentation/doxygen/pics/TwoAddRules.png diff --git a/Modules/Bundles/org.mitk.core.jobs/documentation/doxygen/pics/TwoRemoveRules.png b/Plugins/org.mitk.core.jobs/documentation/doxygen/pics/TwoRemoveRules.png similarity index 100% rename from Modules/Bundles/org.mitk.core.jobs/documentation/doxygen/pics/TwoRemoveRules.png rename to Plugins/org.mitk.core.jobs/documentation/doxygen/pics/TwoRemoveRules.png diff --git a/Modules/Bundles/org.mitk.core.jobs/files.cmake b/Plugins/org.mitk.core.jobs/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.core.jobs/files.cmake rename to Plugins/org.mitk.core.jobs/files.cmake diff --git a/Modules/Bundles/org.mitk.core.jobs/manifest_headers.cmake b/Plugins/org.mitk.core.jobs/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.core.jobs/manifest_headers.cmake rename to Plugins/org.mitk.core.jobs/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.core.jobs/resources/.qrc b/Plugins/org.mitk.core.jobs/resources/.qrc similarity index 100% rename from Modules/Bundles/org.mitk.core.jobs/resources/.qrc rename to Plugins/org.mitk.core.jobs/resources/.qrc diff --git a/Modules/Bundles/org.mitk.core.jobs/src/internal/mitkDataStorageAccessRule.cpp b/Plugins/org.mitk.core.jobs/src/internal/mitkDataStorageAccessRule.cpp similarity index 100% rename from Modules/Bundles/org.mitk.core.jobs/src/internal/mitkDataStorageAccessRule.cpp rename to Plugins/org.mitk.core.jobs/src/internal/mitkDataStorageAccessRule.cpp diff --git a/Modules/Bundles/org.mitk.core.jobs/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.core.jobs/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.core.jobs/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.core.jobs/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.core.jobs/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.core.jobs/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.core.jobs/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.core.jobs/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.core.jobs/src/mitkDataStorageAccessRule.h b/Plugins/org.mitk.core.jobs/src/mitkDataStorageAccessRule.h similarity index 100% rename from Modules/Bundles/org.mitk.core.jobs/src/mitkDataStorageAccessRule.h rename to Plugins/org.mitk.core.jobs/src/mitkDataStorageAccessRule.h diff --git a/CoreUI/Bundles/org.mitk.core.services/CMakeLists.txt b/Plugins/org.mitk.core.services/CMakeLists.txt similarity index 100% rename from CoreUI/Bundles/org.mitk.core.services/CMakeLists.txt rename to Plugins/org.mitk.core.services/CMakeLists.txt diff --git a/CoreUI/Bundles/org.mitk.core.services/documentation/doxygen/modules.dox b/Plugins/org.mitk.core.services/documentation/doxygen/modules.dox similarity index 100% rename from CoreUI/Bundles/org.mitk.core.services/documentation/doxygen/modules.dox rename to Plugins/org.mitk.core.services/documentation/doxygen/modules.dox diff --git a/CoreUI/Bundles/org.mitk.core.services/files.cmake b/Plugins/org.mitk.core.services/files.cmake similarity index 100% rename from CoreUI/Bundles/org.mitk.core.services/files.cmake rename to Plugins/org.mitk.core.services/files.cmake diff --git a/CoreUI/Bundles/org.mitk.core.services/manifest_headers.cmake b/Plugins/org.mitk.core.services/manifest_headers.cmake similarity index 100% rename from CoreUI/Bundles/org.mitk.core.services/manifest_headers.cmake rename to Plugins/org.mitk.core.services/manifest_headers.cmake diff --git a/CoreUI/Bundles/org.mitk.core.services/src/internal/mitkDataStorageReference.cpp b/Plugins/org.mitk.core.services/src/internal/mitkDataStorageReference.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.core.services/src/internal/mitkDataStorageReference.cpp rename to Plugins/org.mitk.core.services/src/internal/mitkDataStorageReference.cpp diff --git a/CoreUI/Bundles/org.mitk.core.services/src/internal/mitkDataStorageReference.h b/Plugins/org.mitk.core.services/src/internal/mitkDataStorageReference.h similarity index 100% rename from CoreUI/Bundles/org.mitk.core.services/src/internal/mitkDataStorageReference.h rename to Plugins/org.mitk.core.services/src/internal/mitkDataStorageReference.h diff --git a/CoreUI/Bundles/org.mitk.core.services/src/internal/mitkDataStorageService.cpp b/Plugins/org.mitk.core.services/src/internal/mitkDataStorageService.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.core.services/src/internal/mitkDataStorageService.cpp rename to Plugins/org.mitk.core.services/src/internal/mitkDataStorageService.cpp diff --git a/CoreUI/Bundles/org.mitk.core.services/src/internal/mitkDataStorageService.h b/Plugins/org.mitk.core.services/src/internal/mitkDataStorageService.h similarity index 100% rename from CoreUI/Bundles/org.mitk.core.services/src/internal/mitkDataStorageService.h rename to Plugins/org.mitk.core.services/src/internal/mitkDataStorageService.h diff --git a/CoreUI/Bundles/org.mitk.core.services/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.core.services/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.cpp diff --git a/CoreUI/Bundles/org.mitk.core.services/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.h similarity index 100% rename from CoreUI/Bundles/org.mitk.core.services/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.core.services/src/internal/mitkPluginActivator.h diff --git a/CoreUI/Bundles/org.mitk.core.services/src/mitkIDataStorageReference.h b/Plugins/org.mitk.core.services/src/mitkIDataStorageReference.h similarity index 100% rename from CoreUI/Bundles/org.mitk.core.services/src/mitkIDataStorageReference.h rename to Plugins/org.mitk.core.services/src/mitkIDataStorageReference.h diff --git a/CoreUI/Bundles/org.mitk.core.services/src/mitkIDataStorageService.cpp b/Plugins/org.mitk.core.services/src/mitkIDataStorageService.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.core.services/src/mitkIDataStorageService.cpp rename to Plugins/org.mitk.core.services/src/mitkIDataStorageService.cpp diff --git a/CoreUI/Bundles/org.mitk.core.services/src/mitkIDataStorageService.h b/Plugins/org.mitk.core.services/src/mitkIDataStorageService.h similarity index 100% rename from CoreUI/Bundles/org.mitk.core.services/src/mitkIDataStorageService.h rename to Plugins/org.mitk.core.services/src/mitkIDataStorageService.h diff --git a/Modules/Bundles/org.mitk.diffusionimaging/CMakeLists.txt b/Plugins/org.mitk.diffusionimaging/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.diffusionimaging/CMakeLists.txt rename to Plugins/org.mitk.diffusionimaging/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.diffusionimaging/documentation/doxygen/modules.dox b/Plugins/org.mitk.diffusionimaging/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.diffusionimaging/documentation/doxygen/modules.dox rename to Plugins/org.mitk.diffusionimaging/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.diffusionimaging/files.cmake b/Plugins/org.mitk.diffusionimaging/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.diffusionimaging/files.cmake rename to Plugins/org.mitk.diffusionimaging/files.cmake diff --git a/Modules/Bundles/org.mitk.diffusionimaging/manifest_headers.cmake b/Plugins/org.mitk.diffusionimaging/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.diffusionimaging/manifest_headers.cmake rename to Plugins/org.mitk.diffusionimaging/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.diffusionimaging/src/internal/mitkDiffusionImagingActivator.cpp b/Plugins/org.mitk.diffusionimaging/src/internal/mitkDiffusionImagingActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.diffusionimaging/src/internal/mitkDiffusionImagingActivator.cpp rename to Plugins/org.mitk.diffusionimaging/src/internal/mitkDiffusionImagingActivator.cpp diff --git a/Modules/Bundles/org.mitk.diffusionimaging/src/internal/mitkDiffusionImagingActivator.h b/Plugins/org.mitk.diffusionimaging/src/internal/mitkDiffusionImagingActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.diffusionimaging/src/internal/mitkDiffusionImagingActivator.h rename to Plugins/org.mitk.diffusionimaging/src/internal/mitkDiffusionImagingActivator.h diff --git a/CoreUI/Bundles/org.mitk.gui.common/CMakeLists.txt b/Plugins/org.mitk.gui.common/CMakeLists.txt similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/CMakeLists.txt rename to Plugins/org.mitk.gui.common/CMakeLists.txt diff --git a/CoreUI/Bundles/org.mitk.gui.common/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.common/documentation/doxygen/modules.dox similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.common/documentation/doxygen/modules.dox diff --git a/CoreUI/Bundles/org.mitk.gui.common/files.cmake b/Plugins/org.mitk.gui.common/files.cmake similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/files.cmake rename to Plugins/org.mitk.gui.common/files.cmake diff --git a/CoreUI/Bundles/org.mitk.gui.common/manifest_headers.cmake b/Plugins/org.mitk.gui.common/manifest_headers.cmake similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/manifest_headers.cmake rename to Plugins/org.mitk.gui.common/manifest_headers.cmake diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/internal/org_mitk_gui_common_Activator.cpp b/Plugins/org.mitk.gui.common/src/internal/org_mitk_gui_common_Activator.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/internal/org_mitk_gui_common_Activator.cpp rename to Plugins/org.mitk.gui.common/src/internal/org_mitk_gui_common_Activator.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/internal/org_mitk_gui_common_Activator.h b/Plugins/org.mitk.gui.common/src/internal/org_mitk_gui_common_Activator.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/internal/org_mitk_gui_common_Activator.h rename to Plugins/org.mitk.gui.common/src/internal/org_mitk_gui_common_Activator.h diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkDataNodeObject.cpp b/Plugins/org.mitk.gui.common/src/mitkDataNodeObject.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkDataNodeObject.cpp rename to Plugins/org.mitk.gui.common/src/mitkDataNodeObject.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkDataNodeObject.h b/Plugins/org.mitk.gui.common/src/mitkDataNodeObject.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkDataNodeObject.h rename to Plugins/org.mitk.gui.common/src/mitkDataNodeObject.h diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkDataNodeSelection.cpp b/Plugins/org.mitk.gui.common/src/mitkDataNodeSelection.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkDataNodeSelection.cpp rename to Plugins/org.mitk.gui.common/src/mitkDataNodeSelection.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkDataNodeSelection.h b/Plugins/org.mitk.gui.common/src/mitkDataNodeSelection.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkDataNodeSelection.h rename to Plugins/org.mitk.gui.common/src/mitkDataNodeSelection.h diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkDataStorageEditorInput.cpp b/Plugins/org.mitk.gui.common/src/mitkDataStorageEditorInput.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkDataStorageEditorInput.cpp rename to Plugins/org.mitk.gui.common/src/mitkDataStorageEditorInput.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkDataStorageEditorInput.h b/Plugins/org.mitk.gui.common/src/mitkDataStorageEditorInput.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkDataStorageEditorInput.h rename to Plugins/org.mitk.gui.common/src/mitkDataStorageEditorInput.h diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkILifecycleAwarePart.h b/Plugins/org.mitk.gui.common/src/mitkILifecycleAwarePart.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkILifecycleAwarePart.h rename to Plugins/org.mitk.gui.common/src/mitkILifecycleAwarePart.h diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkILinkedRenderWindowPart.h b/Plugins/org.mitk.gui.common/src/mitkILinkedRenderWindowPart.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkILinkedRenderWindowPart.h rename to Plugins/org.mitk.gui.common/src/mitkILinkedRenderWindowPart.h diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkIRenderWindowPart.cpp b/Plugins/org.mitk.gui.common/src/mitkIRenderWindowPart.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkIRenderWindowPart.cpp rename to Plugins/org.mitk.gui.common/src/mitkIRenderWindowPart.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkIRenderWindowPart.h b/Plugins/org.mitk.gui.common/src/mitkIRenderWindowPart.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkIRenderWindowPart.h rename to Plugins/org.mitk.gui.common/src/mitkIRenderWindowPart.h diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkIRenderWindowPartListener.h b/Plugins/org.mitk.gui.common/src/mitkIRenderWindowPartListener.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkIRenderWindowPartListener.h rename to Plugins/org.mitk.gui.common/src/mitkIRenderWindowPartListener.h diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkIRenderingManager.cpp b/Plugins/org.mitk.gui.common/src/mitkIRenderingManager.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkIRenderingManager.cpp rename to Plugins/org.mitk.gui.common/src/mitkIRenderingManager.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkIRenderingManager.h b/Plugins/org.mitk.gui.common/src/mitkIRenderingManager.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkIRenderingManager.h rename to Plugins/org.mitk.gui.common/src/mitkIRenderingManager.h diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkIZombieViewPart.h b/Plugins/org.mitk.gui.common/src/mitkIZombieViewPart.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkIZombieViewPart.h rename to Plugins/org.mitk.gui.common/src/mitkIZombieViewPart.h diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkWorkbenchUtil.cpp b/Plugins/org.mitk.gui.common/src/mitkWorkbenchUtil.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkWorkbenchUtil.cpp rename to Plugins/org.mitk.gui.common/src/mitkWorkbenchUtil.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.common/src/mitkWorkbenchUtil.h b/Plugins/org.mitk.gui.common/src/mitkWorkbenchUtil.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.common/src/mitkWorkbenchUtil.h rename to Plugins/org.mitk.gui.common/src/mitkWorkbenchUtil.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/CMakeLists.txt b/Plugins/org.mitk.gui.qt.application/CMakeLists.txt similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.application/CMakeLists.txt diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.application/documentation/doxygen/modules.dox similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.application/documentation/doxygen/modules.dox diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/files.cmake b/Plugins/org.mitk.gui.qt.application/files.cmake similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/files.cmake rename to Plugins/org.mitk.gui.qt.application/files.cmake diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.application/manifest_headers.cmake similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.application/manifest_headers.cmake diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/plugin.xml b/Plugins/org.mitk.gui.qt.application/plugin.xml similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/plugin.xml rename to Plugins/org.mitk.gui.qt.application/plugin.xml diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/resources/StateMachine.xml b/Plugins/org.mitk.gui.qt.application/resources/StateMachine.xml similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/resources/StateMachine.xml rename to Plugins/org.mitk.gui.qt.application/resources/StateMachine.xml diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/resources/document-save.png b/Plugins/org.mitk.gui.qt.application/resources/document-save.png similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/resources/document-save.png rename to Plugins/org.mitk.gui.qt.application/resources/document-save.png diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/resources/edit-redo.png b/Plugins/org.mitk.gui.qt.application/resources/edit-redo.png similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/resources/edit-redo.png rename to Plugins/org.mitk.gui.qt.application/resources/edit-redo.png diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/resources/edit-undo.png b/Plugins/org.mitk.gui.qt.application/resources/edit-undo.png similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/resources/edit-undo.png rename to Plugins/org.mitk.gui.qt.application/resources/edit-undo.png diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/resources/mitkEventAndActionConstants.xml b/Plugins/org.mitk.gui.qt.application/resources/mitkEventAndActionConstants.xml similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/resources/mitkEventAndActionConstants.xml rename to Plugins/org.mitk.gui.qt.application/resources/mitkEventAndActionConstants.xml diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/resources/preferences-system.png b/Plugins/org.mitk.gui.qt.application/resources/preferences-system.png similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/resources/preferences-system.png rename to Plugins/org.mitk.gui.qt.application/resources/preferences-system.png diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/resources/resources.qrc b/Plugins/org.mitk.gui.qt.application/resources/resources.qrc similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/resources/resources.qrc rename to Plugins/org.mitk.gui.qt.application/resources/resources.qrc diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/resources/system-log-out.png b/Plugins/org.mitk.gui.qt.application/resources/system-log-out.png similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/resources/system-log-out.png rename to Plugins/org.mitk.gui.qt.application/resources/system-log-out.png diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkCloseProjectAction.cpp b/Plugins/org.mitk.gui.qt.application/src/QmitkCloseProjectAction.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkCloseProjectAction.cpp rename to Plugins/org.mitk.gui.qt.application/src/QmitkCloseProjectAction.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkCloseProjectAction.h b/Plugins/org.mitk.gui.qt.application/src/QmitkCloseProjectAction.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkCloseProjectAction.h rename to Plugins/org.mitk.gui.qt.application/src/QmitkCloseProjectAction.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkDefaultDropTargetListener.cpp b/Plugins/org.mitk.gui.qt.application/src/QmitkDefaultDropTargetListener.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkDefaultDropTargetListener.cpp rename to Plugins/org.mitk.gui.qt.application/src/QmitkDefaultDropTargetListener.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkDefaultDropTargetListener.h b/Plugins/org.mitk.gui.qt.application/src/QmitkDefaultDropTargetListener.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkDefaultDropTargetListener.h rename to Plugins/org.mitk.gui.qt.application/src/QmitkDefaultDropTargetListener.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkFileExitAction.cpp b/Plugins/org.mitk.gui.qt.application/src/QmitkFileExitAction.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkFileExitAction.cpp rename to Plugins/org.mitk.gui.qt.application/src/QmitkFileExitAction.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkFileExitAction.h b/Plugins/org.mitk.gui.qt.application/src/QmitkFileExitAction.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkFileExitAction.h rename to Plugins/org.mitk.gui.qt.application/src/QmitkFileExitAction.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkFileOpenAction.cpp b/Plugins/org.mitk.gui.qt.application/src/QmitkFileOpenAction.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkFileOpenAction.cpp rename to Plugins/org.mitk.gui.qt.application/src/QmitkFileOpenAction.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkFileOpenAction.h b/Plugins/org.mitk.gui.qt.application/src/QmitkFileOpenAction.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkFileOpenAction.h rename to Plugins/org.mitk.gui.qt.application/src/QmitkFileOpenAction.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkPreferencesDialog.cpp b/Plugins/org.mitk.gui.qt.application/src/QmitkPreferencesDialog.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkPreferencesDialog.cpp rename to Plugins/org.mitk.gui.qt.application/src/QmitkPreferencesDialog.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkPreferencesDialog.h b/Plugins/org.mitk.gui.qt.application/src/QmitkPreferencesDialog.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkPreferencesDialog.h rename to Plugins/org.mitk.gui.qt.application/src/QmitkPreferencesDialog.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkPreferencesDialog.ui b/Plugins/org.mitk.gui.qt.application/src/QmitkPreferencesDialog.ui similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkPreferencesDialog.ui rename to Plugins/org.mitk.gui.qt.application/src/QmitkPreferencesDialog.ui diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkStatusBar.cpp b/Plugins/org.mitk.gui.qt.application/src/QmitkStatusBar.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkStatusBar.cpp rename to Plugins/org.mitk.gui.qt.application/src/QmitkStatusBar.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkStatusBar.h b/Plugins/org.mitk.gui.qt.application/src/QmitkStatusBar.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/QmitkStatusBar.h rename to Plugins/org.mitk.gui.qt.application/src/QmitkStatusBar.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/internal/QmitkEditorsPreferencePage.cpp b/Plugins/org.mitk.gui.qt.application/src/internal/QmitkEditorsPreferencePage.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/internal/QmitkEditorsPreferencePage.cpp rename to Plugins/org.mitk.gui.qt.application/src/internal/QmitkEditorsPreferencePage.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/internal/QmitkEditorsPreferencePage.h b/Plugins/org.mitk.gui.qt.application/src/internal/QmitkEditorsPreferencePage.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/internal/QmitkEditorsPreferencePage.h rename to Plugins/org.mitk.gui.qt.application/src/internal/QmitkEditorsPreferencePage.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/internal/QmitkGeneralPreferencePage.cpp b/Plugins/org.mitk.gui.qt.application/src/internal/QmitkGeneralPreferencePage.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/internal/QmitkGeneralPreferencePage.cpp rename to Plugins/org.mitk.gui.qt.application/src/internal/QmitkGeneralPreferencePage.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/internal/QmitkGeneralPreferencePage.h b/Plugins/org.mitk.gui.qt.application/src/internal/QmitkGeneralPreferencePage.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/internal/QmitkGeneralPreferencePage.h rename to Plugins/org.mitk.gui.qt.application/src/internal/QmitkGeneralPreferencePage.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/internal/org_mitk_gui_qt_application_Activator.cpp b/Plugins/org.mitk.gui.qt.application/src/internal/org_mitk_gui_qt_application_Activator.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/internal/org_mitk_gui_qt_application_Activator.cpp rename to Plugins/org.mitk.gui.qt.application/src/internal/org_mitk_gui_qt_application_Activator.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/src/internal/org_mitk_gui_qt_application_Activator.h b/Plugins/org.mitk.gui.qt.application/src/internal/org_mitk_gui_qt_application_Activator.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/src/internal/org_mitk_gui_qt_application_Activator.h rename to Plugins/org.mitk.gui.qt.application/src/internal/org_mitk_gui_qt_application_Activator.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.application/target_libraries.cmake b/Plugins/org.mitk.gui.qt.application/target_libraries.cmake similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.application/target_libraries.cmake rename to Plugins/org.mitk.gui.qt.application/target_libraries.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/CMakeLists.txt b/Plugins/org.mitk.gui.qt.basicimageprocessing/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.basicimageprocessing/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/documentation/UserManual/BIP_Overview.png b/Plugins/org.mitk.gui.qt.basicimageprocessing/documentation/UserManual/BIP_Overview.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/documentation/UserManual/BIP_Overview.png rename to Plugins/org.mitk.gui.qt.basicimageprocessing/documentation/UserManual/BIP_Overview.png diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/documentation/UserManual/ImageProcessing_48.png b/Plugins/org.mitk.gui.qt.basicimageprocessing/documentation/UserManual/ImageProcessing_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/documentation/UserManual/ImageProcessing_48.png rename to Plugins/org.mitk.gui.qt.basicimageprocessing/documentation/UserManual/ImageProcessing_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/documentation/UserManual/QmitkBasicImageProcessing.dox b/Plugins/org.mitk.gui.qt.basicimageprocessing/documentation/UserManual/QmitkBasicImageProcessing.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/documentation/UserManual/QmitkBasicImageProcessing.dox rename to Plugins/org.mitk.gui.qt.basicimageprocessing/documentation/UserManual/QmitkBasicImageProcessing.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.basicimageprocessing/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.basicimageprocessing/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/files.cmake b/Plugins/org.mitk.gui.qt.basicimageprocessing/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/files.cmake rename to Plugins/org.mitk.gui.qt.basicimageprocessing/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.basicimageprocessing/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.basicimageprocessing/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/plugin.xml b/Plugins/org.mitk.gui.qt.basicimageprocessing/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/plugin.xml rename to Plugins/org.mitk.gui.qt.basicimageprocessing/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/resources/ImageProcessing_64.xpm b/Plugins/org.mitk.gui.qt.basicimageprocessing/resources/ImageProcessing_64.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/resources/ImageProcessing_64.xpm rename to Plugins/org.mitk.gui.qt.basicimageprocessing/resources/ImageProcessing_64.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/resources/QmitkBasicImageProcessingView.qrc b/Plugins/org.mitk.gui.qt.basicimageprocessing/resources/QmitkBasicImageProcessingView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/resources/QmitkBasicImageProcessingView.qrc rename to Plugins/org.mitk.gui.qt.basicimageprocessing/resources/QmitkBasicImageProcessingView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/resources/lena.xpm b/Plugins/org.mitk.gui.qt.basicimageprocessing/resources/lena.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/resources/lena.xpm rename to Plugins/org.mitk.gui.qt.basicimageprocessing/resources/lena.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.cpp b/Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.cpp rename to Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.h b/Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.h rename to Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingViewControls.ui b/Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingViewControls.ui rename to Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/QmitkBasicImageProcessingViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/mitkBasicImageProcessingActivator.cpp b/Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/mitkBasicImageProcessingActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/mitkBasicImageProcessingActivator.cpp rename to Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/mitkBasicImageProcessingActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/mitkBasicImageProcessingActivator.h b/Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/mitkBasicImageProcessingActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.basicimageprocessing/src/internal/mitkBasicImageProcessingActivator.h rename to Plugins/org.mitk.gui.qt.basicimageprocessing/src/internal/mitkBasicImageProcessingActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.common.legacy/CMakeLists.txt b/Plugins/org.mitk.gui.qt.common.legacy/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.common.legacy/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.common.legacy/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.common.legacy/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.common.legacy/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.common.legacy/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.common.legacy/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.common.legacy/files.cmake b/Plugins/org.mitk.gui.qt.common.legacy/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.common.legacy/files.cmake rename to Plugins/org.mitk.gui.qt.common.legacy/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.common.legacy/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.common.legacy/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.common.legacy/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.common.legacy/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.common.legacy/src/QmitkFunctionality.cpp b/Plugins/org.mitk.gui.qt.common.legacy/src/QmitkFunctionality.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.common.legacy/src/QmitkFunctionality.cpp rename to Plugins/org.mitk.gui.qt.common.legacy/src/QmitkFunctionality.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.common.legacy/src/QmitkFunctionality.h b/Plugins/org.mitk.gui.qt.common.legacy/src/QmitkFunctionality.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.common.legacy/src/QmitkFunctionality.h rename to Plugins/org.mitk.gui.qt.common.legacy/src/QmitkFunctionality.h diff --git a/Modules/Bundles/org.mitk.gui.qt.common.legacy/src/QmitkFunctionality2.cpp b/Plugins/org.mitk.gui.qt.common.legacy/src/QmitkFunctionality2.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.common.legacy/src/QmitkFunctionality2.cpp rename to Plugins/org.mitk.gui.qt.common.legacy/src/QmitkFunctionality2.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.common.legacy/src/QmitkFunctionalityCoordinator.cpp b/Plugins/org.mitk.gui.qt.common.legacy/src/QmitkFunctionalityCoordinator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.common.legacy/src/QmitkFunctionalityCoordinator.cpp rename to Plugins/org.mitk.gui.qt.common.legacy/src/QmitkFunctionalityCoordinator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.common.legacy/src/QmitkFunctionalityCoordinator.h b/Plugins/org.mitk.gui.qt.common.legacy/src/QmitkFunctionalityCoordinator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.common.legacy/src/QmitkFunctionalityCoordinator.h rename to Plugins/org.mitk.gui.qt.common.legacy/src/QmitkFunctionalityCoordinator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.common.legacy/src/internal/QmitkCommonLegacyActivator.cpp b/Plugins/org.mitk.gui.qt.common.legacy/src/internal/QmitkCommonLegacyActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.common.legacy/src/internal/QmitkCommonLegacyActivator.cpp rename to Plugins/org.mitk.gui.qt.common.legacy/src/internal/QmitkCommonLegacyActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.common.legacy/src/internal/QmitkCommonLegacyActivator.h b/Plugins/org.mitk.gui.qt.common.legacy/src/internal/QmitkCommonLegacyActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.common.legacy/src/internal/QmitkCommonLegacyActivator.h rename to Plugins/org.mitk.gui.qt.common.legacy/src/internal/QmitkCommonLegacyActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.common.legacy/src/internal/QmitkFunctionalityUtil.cpp b/Plugins/org.mitk.gui.qt.common.legacy/src/internal/QmitkFunctionalityUtil.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.common.legacy/src/internal/QmitkFunctionalityUtil.cpp rename to Plugins/org.mitk.gui.qt.common.legacy/src/internal/QmitkFunctionalityUtil.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.common.legacy/src/internal/QmitkFunctionalityUtil.h b/Plugins/org.mitk.gui.qt.common.legacy/src/internal/QmitkFunctionalityUtil.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.common.legacy/src/internal/QmitkFunctionalityUtil.h rename to Plugins/org.mitk.gui.qt.common.legacy/src/internal/QmitkFunctionalityUtil.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/CMakeLists.txt b/Plugins/org.mitk.gui.qt.common/CMakeLists.txt similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.common/CMakeLists.txt diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.common/documentation/doxygen/modules.dox similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.common/documentation/doxygen/modules.dox diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/files.cmake b/Plugins/org.mitk.gui.qt.common/files.cmake similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/files.cmake rename to Plugins/org.mitk.gui.qt.common/files.cmake diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.common/manifest_headers.cmake similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.common/manifest_headers.cmake diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkAbstractRenderEditor.cpp b/Plugins/org.mitk.gui.qt.common/src/QmitkAbstractRenderEditor.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkAbstractRenderEditor.cpp rename to Plugins/org.mitk.gui.qt.common/src/QmitkAbstractRenderEditor.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkAbstractRenderEditor.h b/Plugins/org.mitk.gui.qt.common/src/QmitkAbstractRenderEditor.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkAbstractRenderEditor.h rename to Plugins/org.mitk.gui.qt.common/src/QmitkAbstractRenderEditor.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkAbstractView.cpp b/Plugins/org.mitk.gui.qt.common/src/QmitkAbstractView.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkAbstractView.cpp rename to Plugins/org.mitk.gui.qt.common/src/QmitkAbstractView.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkAbstractView.h b/Plugins/org.mitk.gui.qt.common/src/QmitkAbstractView.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkAbstractView.h rename to Plugins/org.mitk.gui.qt.common/src/QmitkAbstractView.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkDataNodeSelectionProvider.cpp b/Plugins/org.mitk.gui.qt.common/src/QmitkDataNodeSelectionProvider.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkDataNodeSelectionProvider.cpp rename to Plugins/org.mitk.gui.qt.common/src/QmitkDataNodeSelectionProvider.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkDataNodeSelectionProvider.h b/Plugins/org.mitk.gui.qt.common/src/QmitkDataNodeSelectionProvider.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkDataNodeSelectionProvider.h rename to Plugins/org.mitk.gui.qt.common/src/QmitkDataNodeSelectionProvider.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkDnDFrameWidget.cpp b/Plugins/org.mitk.gui.qt.common/src/QmitkDnDFrameWidget.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkDnDFrameWidget.cpp rename to Plugins/org.mitk.gui.qt.common/src/QmitkDnDFrameWidget.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkDnDFrameWidget.h b/Plugins/org.mitk.gui.qt.common/src/QmitkDnDFrameWidget.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/QmitkDnDFrameWidget.h rename to Plugins/org.mitk.gui.qt.common/src/QmitkDnDFrameWidget.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.cpp b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.cpp rename to Plugins/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.h b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.h rename to Plugins/org.mitk.gui.qt.common/src/internal/QmitkCommonActivator.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkDataNodeItemModel.cpp b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkDataNodeItemModel.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkDataNodeItemModel.cpp rename to Plugins/org.mitk.gui.qt.common/src/internal/QmitkDataNodeItemModel.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkDataNodeItemModel.h b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkDataNodeItemModel.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkDataNodeItemModel.h rename to Plugins/org.mitk.gui.qt.common/src/internal/QmitkDataNodeItemModel.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkDataNodeSelection.cpp b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkDataNodeSelection.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkDataNodeSelection.cpp rename to Plugins/org.mitk.gui.qt.common/src/internal/QmitkDataNodeSelection.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkDataNodeSelection.h b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkDataNodeSelection.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkDataNodeSelection.h rename to Plugins/org.mitk.gui.qt.common/src/internal/QmitkDataNodeSelection.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.cpp b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.cpp rename to Plugins/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.h b/Plugins/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.h rename to Plugins/org.mitk.gui.qt.common/src/internal/QmitkViewCoordinator.h diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/CMakeLists.txt b/Plugins/org.mitk.gui.qt.common/testing/CMakeLists.txt similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.common/testing/CMakeLists.txt diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/files.cmake b/Plugins/org.mitk.gui.qt.common/testing/files.cmake similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/files.cmake rename to Plugins/org.mitk.gui.qt.common/testing/files.cmake diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/manifest.cpp b/Plugins/org.mitk.gui.qt.common/testing/manifest.cpp similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/manifest.cpp rename to Plugins/org.mitk.gui.qt.common/testing/manifest.cpp diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.common/testing/manifest_headers.cmake similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.common/testing/manifest_headers.cmake diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/plugin.xml b/Plugins/org.mitk.gui.qt.common/testing/plugin.xml similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/plugin.xml rename to Plugins/org.mitk.gui.qt.common/testing/plugin.xml diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/QmitkQtCommonTestSuite.cpp b/Plugins/org.mitk.gui.qt.common/testing/src/QmitkQtCommonTestSuite.cpp similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/QmitkQtCommonTestSuite.cpp rename to Plugins/org.mitk.gui.qt.common/testing/src/QmitkQtCommonTestSuite.cpp diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/QmitkQtCommonTestSuite.h b/Plugins/org.mitk.gui.qt.common/testing/src/QmitkQtCommonTestSuite.h similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/QmitkQtCommonTestSuite.h rename to Plugins/org.mitk.gui.qt.common/testing/src/QmitkQtCommonTestSuite.h diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkFunctionalityTest.cpp b/Plugins/org.mitk.gui.qt.common/testing/src/api/QmitkFunctionalityTest.cpp similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkFunctionalityTest.cpp rename to Plugins/org.mitk.gui.qt.common/testing/src/api/QmitkFunctionalityTest.cpp diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkFunctionalityTest.h b/Plugins/org.mitk.gui.qt.common/testing/src/api/QmitkFunctionalityTest.h similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkFunctionalityTest.h rename to Plugins/org.mitk.gui.qt.common/testing/src/api/QmitkFunctionalityTest.h diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkMockFunctionality.cpp b/Plugins/org.mitk.gui.qt.common/testing/src/api/QmitkMockFunctionality.cpp similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkMockFunctionality.cpp rename to Plugins/org.mitk.gui.qt.common/testing/src/api/QmitkMockFunctionality.cpp diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkMockFunctionality.h b/Plugins/org.mitk.gui.qt.common/testing/src/api/QmitkMockFunctionality.h similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkMockFunctionality.h rename to Plugins/org.mitk.gui.qt.common/testing/src/api/QmitkMockFunctionality.h diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkUiApiTestSuite.cpp b/Plugins/org.mitk.gui.qt.common/testing/src/api/QmitkUiApiTestSuite.cpp similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkUiApiTestSuite.cpp rename to Plugins/org.mitk.gui.qt.common/testing/src/api/QmitkUiApiTestSuite.cpp diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkUiApiTestSuite.h b/Plugins/org.mitk.gui.qt.common/testing/src/api/QmitkUiApiTestSuite.h similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/api/QmitkUiApiTestSuite.h rename to Plugins/org.mitk.gui.qt.common/testing/src/api/QmitkUiApiTestSuite.h diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.common/testing/src/internal/mitkPluginActivator.cpp similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.common/testing/src/internal/mitkPluginActivator.cpp diff --git a/CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.common/testing/src/internal/mitkPluginActivator.h similarity index 100% rename from CoreUI/BundleTesting/org.mitk.gui.qt.common.tests/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.common/testing/src/internal/mitkPluginActivator.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/CMakeLists.txt b/Plugins/org.mitk.gui.qt.coreapplication/CMakeLists.txt similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.coreapplication/CMakeLists.txt diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.coreapplication/documentation/doxygen/modules.dox similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.coreapplication/documentation/doxygen/modules.dox diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/files.cmake b/Plugins/org.mitk.gui.qt.coreapplication/files.cmake similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/files.cmake rename to Plugins/org.mitk.gui.qt.coreapplication/files.cmake diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.coreapplication/manifest_headers.cmake similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.coreapplication/manifest_headers.cmake diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/plugin.xml b/Plugins/org.mitk.gui.qt.coreapplication/plugin.xml similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/plugin.xml rename to Plugins/org.mitk.gui.qt.coreapplication/plugin.xml diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkActionBarAdvisor.cpp b/Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkActionBarAdvisor.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkActionBarAdvisor.cpp rename to Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkActionBarAdvisor.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkActionBarAdvisor.h b/Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkActionBarAdvisor.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkActionBarAdvisor.h rename to Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkActionBarAdvisor.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkCoreApplication.cpp b/Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkCoreApplication.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkCoreApplication.cpp rename to Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkCoreApplication.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkCoreApplication.h b/Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkCoreApplication.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkCoreApplication.h rename to Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkCoreApplication.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkDefaultPerspective.cpp b/Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkDefaultPerspective.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkDefaultPerspective.cpp rename to Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkDefaultPerspective.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkDefaultPerspective.h b/Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkDefaultPerspective.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkDefaultPerspective.h rename to Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkDefaultPerspective.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchAdvisor.cpp b/Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchAdvisor.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchAdvisor.cpp rename to Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchAdvisor.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchAdvisor.h b/Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchAdvisor.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchAdvisor.h rename to Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchAdvisor.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchWindowAdvisor.cpp b/Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchWindowAdvisor.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchWindowAdvisor.cpp rename to Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchWindowAdvisor.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchWindowAdvisor.h b/Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchWindowAdvisor.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchWindowAdvisor.h rename to Plugins/org.mitk.gui.qt.coreapplication/src/internal/QmitkWorkbenchWindowAdvisor.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/org_mitk_gui_qt_coreapplication_Activator.cpp b/Plugins/org.mitk.gui.qt.coreapplication/src/internal/org_mitk_gui_qt_coreapplication_Activator.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/org_mitk_gui_qt_coreapplication_Activator.cpp rename to Plugins/org.mitk.gui.qt.coreapplication/src/internal/org_mitk_gui_qt_coreapplication_Activator.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/org_mitk_gui_qt_coreapplication_Activator.h b/Plugins/org.mitk.gui.qt.coreapplication/src/internal/org_mitk_gui_qt_coreapplication_Activator.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.coreapplication/src/internal/org_mitk_gui_qt_coreapplication_Activator.h rename to Plugins/org.mitk.gui.qt.coreapplication/src/internal/org_mitk_gui_qt_coreapplication_Activator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/CMakeLists.txt b/Plugins/org.mitk.gui.qt.datamanager/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.datamanager/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/DataManager_48.png b/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/DataManager_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/DataManager_48.png rename to Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/DataManager_48.png diff --git a/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/Image_properties.png b/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/Image_properties.png new file mode 100644 index 0000000000..29b374e995 Binary files /dev/null and b/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/Image_properties.png differ diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/Overview.png b/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/Overview.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/Overview.png rename to Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/Overview.png diff --git a/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/Parent-Child.png b/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/Parent-Child.png new file mode 100644 index 0000000000..89d13fe32b Binary files /dev/null and b/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/Parent-Child.png differ diff --git a/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/Preferences.png b/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/Preferences.png new file mode 100644 index 0000000000..ec2edcb7a1 Binary files /dev/null and b/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/Preferences.png differ diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/PropertyList.png b/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/PropertyList.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/PropertyList.png rename to Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/PropertyList.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/QmitkDatamanager.dox b/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/QmitkDatamanager.dox similarity index 94% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/QmitkDatamanager.dox rename to Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/QmitkDatamanager.dox index 81008fe249..6034939a5e 100644 --- a/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/UserManual/QmitkDatamanager.dox +++ b/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/QmitkDatamanager.dox @@ -1,108 +1,108 @@ /** \bundlemainpage{org_datamanager} The DataManager \image html DataManager_48.png "Icon of the Module" \section QmitkDataManagerIntroduction Introduction The Datamanager is the central componenent to manage medical data like images, surfaces, etc.. After loading one or more data into the Datamanager the data are shown in the four-view window, the so called Standard View. The user can now start working on the data by just clicking into the standard view or by using the MITK-modules such as "Segmentation" or "Basic Image Processing". Available sections: - \ref QmitkDataManagerIntroduction - \ref QmitkDataManagerLoading - \ref QmitkDataManagerSaving - \ref QmitkDataManagerProperties - \ref QmitkDataManagerPropertiesList - \ref QmitkDataManagerPropertiesVisibility - \ref QmitkDataManagerPropertiesRepresentation - \ref QmitkDataManagerPropertiesPreferences - \ref QmitkDataManagerPropertyList \image html Overview.png "How MITK looks when starting" \section QmitkDataManagerLoading Loading Data There are three ways of loading data into the Datamanager as so called Data-Elements. The user can just drag and drop data into the Datamanager or directly into one of the four parts of the Standard View. He can as well use the Open-Button in the right upper corner. Or he can use the standard "File->Open"-Dialog on the top. A lot of file-formats can be loaded into MITK, for example
  • 2D-images/3D-volumes with or without several timesteps (*.dcm, *.ima, *.pic, ...)
  • Surfaces (*.stl, *.vtk, ...)
  • Pointsets (*.mps)
  • ...
-The user can also load a series of 2D images (e.g. image001.bmp, image002.bmp ...) to a MITK 3D volume. +The user can also load a series of 2D images (e.g. image001.png, image002.png ...) to a MITK 3D volume. To do this, just drag and drop one of those 2D data files into the Datamanager by holding the ALT key. After loading one or more data into the Datamanager they appear as Data-Elements in a sorted list inside the Datamanager. Data-Elements can also be sorted hierarchically as a parent-child-relation. For example after using the Segmentation-Module on Data-Element1 the result is created as Data-Element2, which is a child of Data-Element1 (see Screenshot1). The order can be changed by drag and drop. -\image html Parent-Child.bmp "Screenshot1" +\image html Parent-Child.png "Screenshot1" The listed Data-Elements are shown in the standard view. Here the user can scale or rotate the medical objects or he can change the cutting planes of the object by just using the mouse inside this view. \section QmitkDataManagerSaving Saving Data There are two ways of saving data from the Datamanger. The user can either save the whole project with all Data-Elements by clicking on "File"->"Save Project" or he can save single Data-Elements by right-clicking->"Save", directly on a Data-Element. When saving the whole project, the sorting of Data-Elements is saved as well. By contrast the sorting is lost, when saving a single Data-Element. \section QmitkDataManagerProperties Working with the Datamanager \subsection QmitkDataManagerPropertiesList List of Data-Elements The Data-Elements are listed in the Datamanager. As described above the elements can be sorted hierarchically as a parent-child-relation. For example after using the Segmentation-Module on Data-Element1 the result is created as Data-Element2, which is a child of Data-Element1 (see Screenshot1). By drag and drop the sorting of Data-Elements and their hierarchical relation can be changed. \subsection QmitkDataManagerPropertiesVisibility Visibility of Data-Elements By default all loaded Data-Elements are visible in the standard view. The visibility can be changed by right-clicking on the Data-Element and then choosing "Toogle visibility". The box in front of the Data-Element in the Datamanager shows the visibility. A green-filled box means a visible Data-Element, an empty box means an invisible Data-Element (see Screenshot1). \subsection QmitkDataManagerPropertiesRepresentation Representation of Data-Elements There are different types of representations how to show the Data-Element inside the standard view. By right-clicking on the Data-Element all options are listed (see Screenshot2 and Screenshot 3).
  • An arbitrary color can be chosen
  • The opacity can be changed with a slide control
  • In case of images a texture interpolation can be switched on or off. The texture interpolation smoothes the image, so that no single pixels are visible anymore.
  • In case of surfaces the surface representation can be changed between points, wireframe or surface.
  • Global reinit updates all windows to contain all the current data. Reinit updates a single data item fits the windows to contain this data item.
-\image html Image_properties.bmp "Screenshot2: Properties for images" -\image html Surface_Properties.bmp "Screenshot3: Properties for surfaces" +\image html Image_properties.png "Screenshot2: Properties for images" +\image html Surface_Properties.png "Screenshot3: Properties for surfaces" \subsection QmitkDataManagerPropertiesPreferences Preferences For the datamanager there are already some default hotkeys like the del-key for deleting a Data-Element. The whole list is seen in Screenshot4. From here the Hotkeys can also be changed. The preference page is found in "Window"->"Preferences". -\image html Preferences.bmp "Screenshot4" +\image html Preferences.png "Screenshot4" \section QmitkDataManagerPropertyList Property List The Property List displays all the properties the currently selected Data-Element has. Which properties these are depends on the Data-Element. Examples are opacity, shader, visibility. These properties can be changed by clicking on the appropriate field in the "value" column. \image html PropertyList.png "Screenshot5: Property List" */ diff --git a/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/Surface_Properties.png b/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/Surface_Properties.png new file mode 100644 index 0000000000..1740d88ecb Binary files /dev/null and b/Plugins/org.mitk.gui.qt.datamanager/documentation/UserManual/Surface_Properties.png differ diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.datamanager/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.datamanager/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/files.cmake b/Plugins/org.mitk.gui.qt.datamanager/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/files.cmake rename to Plugins/org.mitk.gui.qt.datamanager/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.datamanager/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.datamanager/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/plugin.xml b/Plugins/org.mitk.gui.qt.datamanager/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/plugin.xml rename to Plugins/org.mitk.gui.qt.datamanager/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/DataManager_48.png b/Plugins/org.mitk.gui.qt.datamanager/resources/DataManager_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/DataManager_48.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/DataManager_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/InvertShowSelectedNode_48.png b/Plugins/org.mitk.gui.qt.datamanager/resources/InvertShowSelectedNode_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/InvertShowSelectedNode_48.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/InvertShowSelectedNode_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/Load_48.png b/Plugins/org.mitk.gui.qt.datamanager/resources/Load_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/Load_48.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/Load_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/Refresh_48.png b/Plugins/org.mitk.gui.qt.datamanager/resources/Refresh_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/Refresh_48.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/Refresh_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/Remove_48.png b/Plugins/org.mitk.gui.qt.datamanager/resources/Remove_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/Remove_48.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/Remove_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/Save_48.png b/Plugins/org.mitk.gui.qt.datamanager/resources/Save_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/Save_48.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/Save_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/ShowDataInfo_48.png b/Plugins/org.mitk.gui.qt.datamanager/resources/ShowDataInfo_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/ShowDataInfo_48.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/ShowDataInfo_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/ShowSelectedNode_48.png b/Plugins/org.mitk.gui.qt.datamanager/resources/ShowSelectedNode_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/ShowSelectedNode_48.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/ShowSelectedNode_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-image-24.png b/Plugins/org.mitk.gui.qt.datamanager/resources/data-type-image-24.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-image-24.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/data-type-image-24.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-image-mask-24.png b/Plugins/org.mitk.gui.qt.datamanager/resources/data-type-image-mask-24.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-image-mask-24.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/data-type-image-mask-24.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-image-mask-invisible-24.png b/Plugins/org.mitk.gui.qt.datamanager/resources/data-type-image-mask-invisible-24.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-image-mask-invisible-24.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/data-type-image-mask-invisible-24.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-image-mask-visible-24.png b/Plugins/org.mitk.gui.qt.datamanager/resources/data-type-image-mask-visible-24.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-image-mask-visible-24.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/data-type-image-mask-visible-24.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-mesh-24.png b/Plugins/org.mitk.gui.qt.datamanager/resources/data-type-mesh-24.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-mesh-24.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/data-type-mesh-24.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-planegeometries-24.png b/Plugins/org.mitk.gui.qt.datamanager/resources/data-type-planegeometries-24.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-planegeometries-24.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/data-type-planegeometries-24.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-planegeometry1-24.png b/Plugins/org.mitk.gui.qt.datamanager/resources/data-type-planegeometry1-24.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-planegeometry1-24.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/data-type-planegeometry1-24.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-planegeometry2-24.png b/Plugins/org.mitk.gui.qt.datamanager/resources/data-type-planegeometry2-24.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-planegeometry2-24.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/data-type-planegeometry2-24.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-planegeometry3-24.png b/Plugins/org.mitk.gui.qt.datamanager/resources/data-type-planegeometry3-24.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-planegeometry3-24.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/data-type-planegeometry3-24.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-pointset-24.png b/Plugins/org.mitk.gui.qt.datamanager/resources/data-type-pointset-24.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-pointset-24.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/data-type-pointset-24.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-unknown-24.png b/Plugins/org.mitk.gui.qt.datamanager/resources/data-type-unknown-24.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/data-type-unknown-24.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/data-type-unknown-24.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/datamanager.qrc b/Plugins/org.mitk.gui.qt.datamanager/resources/datamanager.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/datamanager.qrc rename to Plugins/org.mitk.gui.qt.datamanager/resources/datamanager.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/datamanager.xpm b/Plugins/org.mitk.gui.qt.datamanager/resources/datamanager.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/datamanager.xpm rename to Plugins/org.mitk.gui.qt.datamanager/resources/datamanager.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/propertylist.png b/Plugins/org.mitk.gui.qt.datamanager/resources/propertylist.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/propertylist.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/propertylist.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/save-chili.xpm b/Plugins/org.mitk.gui.qt.datamanager/resources/save-chili.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/save-chili.xpm rename to Plugins/org.mitk.gui.qt.datamanager/resources/save-chili.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/resources/show-data-info.png b/Plugins/org.mitk.gui.qt.datamanager/resources/show-data-info.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/resources/show-data-info.png rename to Plugins/org.mitk.gui.qt.datamanager/resources/show-data-info.png diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/QmitkDataManagerHotkeysPrefPage.cpp b/Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerHotkeysPrefPage.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/QmitkDataManagerHotkeysPrefPage.cpp rename to Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerHotkeysPrefPage.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/QmitkDataManagerHotkeysPrefPage.h b/Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerHotkeysPrefPage.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/QmitkDataManagerHotkeysPrefPage.h rename to Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerHotkeysPrefPage.h diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/QmitkDataManagerPreferencePage.cpp b/Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerPreferencePage.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/QmitkDataManagerPreferencePage.cpp rename to Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerPreferencePage.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/QmitkDataManagerPreferencePage.h b/Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerPreferencePage.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/QmitkDataManagerPreferencePage.h rename to Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerPreferencePage.h diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp b/Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp rename to Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.h b/Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.h rename to Plugins/org.mitk.gui.qt.datamanager/src/QmitkDataManagerView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/berrySingleNodeSelection.cpp b/Plugins/org.mitk.gui.qt.datamanager/src/berrySingleNodeSelection.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/berrySingleNodeSelection.cpp rename to Plugins/org.mitk.gui.qt.datamanager/src/berrySingleNodeSelection.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/berrySingleNodeSelection.h b/Plugins/org.mitk.gui.qt.datamanager/src/berrySingleNodeSelection.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/berrySingleNodeSelection.h rename to Plugins/org.mitk.gui.qt.datamanager/src/berrySingleNodeSelection.h diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkDataManagerControls.ui b/Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkDataManagerControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkDataManagerControls.ui rename to Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkDataManagerControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkDelKeyFilter.cpp b/Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkDelKeyFilter.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkDelKeyFilter.cpp rename to Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkDelKeyFilter.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkDelKeyFilter.h b/Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkDelKeyFilter.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkDelKeyFilter.h rename to Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkDelKeyFilter.h diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkInfoDialog.cpp b/Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkInfoDialog.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkInfoDialog.cpp rename to Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkInfoDialog.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkInfoDialog.h b/Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkInfoDialog.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkInfoDialog.h rename to Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkInfoDialog.h diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkNodeTableViewKeyFilter.cpp b/Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkNodeTableViewKeyFilter.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkNodeTableViewKeyFilter.cpp rename to Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkNodeTableViewKeyFilter.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkNodeTableViewKeyFilter.h b/Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkNodeTableViewKeyFilter.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkNodeTableViewKeyFilter.h rename to Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkNodeTableViewKeyFilter.h diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyListView.cpp b/Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyListView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyListView.cpp rename to Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyListView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyListView.h b/Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyListView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyListView.h rename to Plugins/org.mitk.gui.qt.datamanager/src/internal/QmitkPropertyListView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.datamanager/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.datamanager/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.datamanager/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.datamanager/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.datamanager/src/mitkIContextMenuAction.h b/Plugins/org.mitk.gui.qt.datamanager/src/mitkIContextMenuAction.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.datamanager/src/mitkIContextMenuAction.h rename to Plugins/org.mitk.gui.qt.datamanager/src/mitkIContextMenuAction.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.diffusionimaging/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.dox rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkDiffusionImagingUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberProcessingViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberProcessingViewUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberProcessingViewUserManual.dox rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberProcessingViewUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkGibbsTrackingViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkGibbsTrackingViewUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkGibbsTrackingViewUserManual.dox rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkGibbsTrackingViewUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfDetailsViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfDetailsViewUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfDetailsViewUserManual.dox rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfDetailsViewUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkPartialVolumeAnalysisViewManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkPartialVolumeAnalysisViewManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkPartialVolumeAnalysisViewManual.dox rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkPartialVolumeAnalysisViewManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkScreenshotMakerManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkScreenshotMakerManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkScreenshotMakerManual.dox rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkScreenshotMakerManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkStochasticTrackingViewUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkStochasticTrackingViewUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkStochasticTrackingViewUserManual.dox rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkStochasticTrackingViewUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkUserIVIMViewManual.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkUserIVIMViewManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkUserIVIMViewManual.dox rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkUserIVIMViewManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/dicom1.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/dicom1.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/dicom1.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/dicom1.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/dicom2.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/dicom2.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/dicom2.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/dicom2.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fiberprocessing.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fiberprocessing.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fiberprocessing.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fiberprocessing.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/gibbstrackingview.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/gibbstrackingview.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/gibbstrackingview.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/gibbstrackingview.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/ivimview.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/ivimview.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/ivimview.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/ivimview.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/odfdetails.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/odfdetails.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/odfdetails.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/odfdetails.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/overview.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/overview.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/overview.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/overview.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/prepro1.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/prepro1.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/prepro1.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/prepro1.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/pvanalysisview.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/pvanalysisview.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/pvanalysisview.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/pvanalysisview.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs1.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs1.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs1.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs1.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs2.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs2.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs2.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs2.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs3.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs3.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs3.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/qballs3.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/quantification.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/quantification.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/quantification.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/quantification.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/screenshot_maker_interface.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/screenshot_maker_interface.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/screenshot_maker_interface.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/screenshot_maker_interface.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/segmentationview.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/segmentationview.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/segmentationview.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/segmentationview.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/stochastictrackingview.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/stochastictrackingview.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/stochastictrackingview.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/stochastictrackingview.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tensor1.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tensor1.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tensor1.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tensor1.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tensor4.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tensor4.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tensor4.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/tensor4.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization1.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization1.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization1.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization1.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization2.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization2.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization2.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization2.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization3.png b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization3.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization3.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/visualization3.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.diffusionimaging/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.diffusionimaging/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/files.cmake b/Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/files.cmake rename to Plugins/org.mitk.gui.qt.diffusionimaging/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.diffusionimaging/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.diffusionimaging/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/plugin.xml b/Plugins/org.mitk.gui.qt.diffusionimaging/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/plugin.xml rename to Plugins/org.mitk.gui.qt.diffusionimaging/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/FiberBundle.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/FiberBundle.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/FiberBundle.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/FiberBundle.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/FiberBundleOperations.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/FiberBundleOperations.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/FiberBundleOperations.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/FiberBundleOperations.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/FiberBundleX.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/FiberBundleX.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/FiberBundleX.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/FiberBundleX.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/GibbsTracking.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/GibbsTracking.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/GibbsTracking.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/GibbsTracking.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/IVIM_48.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/IVIM_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/IVIM_48.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/IVIM_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/MapperEfx2D.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/MapperEfx2D.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/MapperEfx2D.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/MapperEfx2D.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/OdfDetails.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/OdfDetails.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/OdfDetails.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/OdfDetails.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_24.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_24.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_24.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_24.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_48.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_48.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_48.xcf b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_48.xcf similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_48.xcf rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_48.xcf diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_64.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_64.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_64.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/PartialVolumeAnalysis_64.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/QBallData24.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/QBallData24.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/QBallData24.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/QBallData24.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/QBallData48.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/QBallData48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/QBallData48.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/QBallData48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/QmitkDiffusionImaging.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/Refresh_48.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/Refresh_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/Refresh_48.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/Refresh_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/circle.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/circle.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/circle.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/circle.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/color24.gif b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/color24.gif similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/color24.gif rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/color24.gif diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/color48.gif b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/color48.gif similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/color48.gif rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/color48.gif diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/color64.gif b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/color64.gif similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/color64.gif rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/color64.gif diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/crosshair.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/crosshair.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/crosshair.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/crosshair.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/dwi.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/dwi.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/dwi.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/dwi.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/dwiimport.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/dwiimport.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/dwiimport.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/dwiimport.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/glyphsoff_C.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/glyphsoff_C.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/glyphsoff_C.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/glyphsoff_C.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/glyphsoff_S.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/glyphsoff_S.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/glyphsoff_S.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/glyphsoff_S.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/glyphsoff_T.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/glyphsoff_T.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/glyphsoff_T.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/glyphsoff_T.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/glyphson.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/glyphson.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/glyphson.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/glyphson.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/glyphson_C.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/glyphson_C.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/glyphson_C.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/glyphson_C.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/glyphson_S.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/glyphson_S.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/glyphson_S.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/glyphson_S.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/glyphson_T.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/glyphson_T.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/glyphson_T.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/glyphson_T.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/odf.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/odf.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/odf.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/odf.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/paint2.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/paint2.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/paint2.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/paint2.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/polygon.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/polygon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/polygon.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/polygon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/preprocessing.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/preprocessing.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/preprocessing.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/preprocessing.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/preprocessing.xcf b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/preprocessing.xcf similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/preprocessing.xcf rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/preprocessing.xcf diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/qball.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/qball.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/qball.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/qball.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/quantification.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/quantification.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/quantification.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/quantification.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/reconodf.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/reconodf.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/reconodf.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/reconodf.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/recontensor.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/recontensor.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/recontensor.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/recontensor.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/rectangle.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/rectangle.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/rectangle.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/rectangle.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/refresh.xpm b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/refresh.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/refresh.xpm rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/refresh.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/reset.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/reset.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/reset.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/reset.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/1002diffusion.cpt b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/1002diffusion.cpt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/1002diffusion.cpt rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/1002diffusion.cpt diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/1002odf.cpt b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/1002odf.cpt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/1002odf.cpt rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/1002odf.cpt diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/1002tensor.cpt b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/1002tensor.cpt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/1002tensor.cpt rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/1002tensor.cpt diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/Generator.cpt b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/Generator.cpt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/Generator.cpt rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/Generator.cpt diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/Thumbs.db b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/Thumbs.db similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/Thumbs.db rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/Thumbs.db diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/dwiimport.cpt b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/dwiimport.cpt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/dwiimport.cpt rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/dwiimport.cpt diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/gear_wheel.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/gear_wheel.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/gear_wheel.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/gear_wheel.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/one_eye_close.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/one_eye_close.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/one_eye_close.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/one_eye_close.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/one_eye_open.jpeg b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/one_eye_open.jpeg similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/one_eye_open.jpeg rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/one_eye_open.jpeg diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/one_eye_open.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/one_eye_open.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/one_eye_open.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/one_eye_open.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/pfeil.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/pfeil.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/pfeil.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/pfeil.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/quantification.cpt b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/quantification.cpt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/quantification.cpt rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/quantification.cpt diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/reconodf (+Generator.cpt).cpt b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/reconodf (+Generator.cpt).cpt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/reconodf (+Generator.cpt).cpt rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/reconodf (+Generator.cpt).cpt diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/recontensor (+Generator.cpt).cpt b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/recontensor (+Generator.cpt).cpt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/recontensor (+Generator.cpt).cpt rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/recontensor (+Generator.cpt).cpt diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/stats.cpt b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/stats.cpt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/stats.cpt rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/stats.cpt diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/texIntOFF.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/texIntOFF.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/texIntOFF.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/texIntOFF.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/texIntON.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/texIntON.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/source/texIntON.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/source/texIntON.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/stats.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/stats.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/stats.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/stats.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/stochFB.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/stochFB.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/stochFB.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/stochFB.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/tbss.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/tbss.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/tbss.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/tbss.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/tensor.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/tensor.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/tensor.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/tensor.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/texIntOFFIcon.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/texIntOFFIcon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/texIntOFFIcon.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/texIntOFFIcon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/texIntONIcon.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/texIntONIcon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/texIntONIcon.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/texIntONIcon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/vizControls.png b/Plugins/org.mitk.gui.qt.diffusionimaging/resources/vizControls.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/resources/vizControls.png rename to Plugins/org.mitk.gui.qt.diffusionimaging/resources/vizControls.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkIVIMWidget.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkIVIMWidget.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkIVIMWidget.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkIVIMWidget.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkIVIMWidget.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkIVIMWidget.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkIVIMWidget.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkIVIMWidget.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFDetailsWidget.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkODFDetailsWidget.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFDetailsWidget.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkODFDetailsWidget.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFDetailsWidget.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkODFDetailsWidget.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFDetailsWidget.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkODFDetailsWidget.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkTbssRoiAnalysisWidget.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkTbssRoiAnalysisWidget.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkTbssRoiAnalysisWidget.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkTbssRoiAnalysisWidget.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkTbssRoiAnalysisWidget.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkTbssRoiAnalysisWidget.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkTbssRoiAnalysisWidget.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkTbssRoiAnalysisWidget.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionDicomImportViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionImagingPublicPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionImagingPublicPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionImagingPublicPerspective.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionImagingPublicPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionImagingPublicPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionImagingPublicPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionImagingPublicPerspective.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionImagingPublicPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionQuantificationView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionQuantificationView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionQuantificationView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionQuantificationView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionQuantificationView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionQuantificationView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionQuantificationView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionQuantificationView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionQuantificationViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionQuantificationViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionQuantificationViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkDiffusionQuantificationViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberBundleDeveloperViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkGibbsTrackingView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkGibbsTrackingView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkGibbsTrackingView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkGibbsTrackingView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkGibbsTrackingView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkGibbsTrackingView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkGibbsTrackingView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkGibbsTrackingView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkGibbsTrackingViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkGibbsTrackingViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkGibbsTrackingViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkGibbsTrackingViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkIVIMViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkODFDetailsView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkODFDetailsView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkODFDetailsView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkODFDetailsView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkODFDetailsView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkODFDetailsView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkODFDetailsView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkODFDetailsView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkODFDetailsViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkODFDetailsViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkODFDetailsViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkODFDetailsViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPreprocessingViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkQBallReconstructionViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkStochasticFiberTrackingViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssMetaTableModel.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssMetaTableModel.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssMetaTableModel.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssMetaTableModel.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssMetaTableModel.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssMetaTableModel.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssMetaTableModel.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssMetaTableModel.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssSkeletonizationViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssTableModel.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssTableModel.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssTableModel.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssTableModel.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssTableModel.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssTableModel.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssTableModel.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTbssTableModel.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTensorReconstructionViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsView.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsView.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkTractbasedSpatialStatisticsViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/deprecated/QmitkDiffusionTensorEstimation.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/deprecated/QmitkDiffusionTensorEstimation.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/deprecated/QmitkDiffusionTensorEstimation.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/deprecated/QmitkDiffusionTensorEstimation.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/deprecated/QmitkDiffusionTensorEstimation.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/deprecated/QmitkDiffusionTensorEstimation.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/deprecated/QmitkDiffusionTensorEstimation.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/deprecated/QmitkDiffusionTensorEstimation.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/deprecated/QmitkDiffusionTensorIcon.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/deprecated/QmitkDiffusionTensorIcon.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/deprecated/QmitkDiffusionTensorIcon.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/deprecated/QmitkDiffusionTensorIcon.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.diffusionimaging/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimagingapp/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/documentation/MitkDiffusionImagingAppQtHelpCollectionProject.qhcp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/documentation/MitkDiffusionImagingAppQtHelpCollectionProject.qhcp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/documentation/MitkDiffusionImagingAppQtHelpCollectionProject.qhcp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/documentation/MitkDiffusionImagingAppQtHelpCollectionProject.qhcp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/documentation/UserManual/QmitkDiffusionImagingAppUserManual.dox b/Plugins/org.mitk.gui.qt.diffusionimagingapp/documentation/UserManual/QmitkDiffusionImagingAppUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/documentation/UserManual/QmitkDiffusionImagingAppUserManual.dox rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/documentation/UserManual/QmitkDiffusionImagingAppUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/documentation/about-logo.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/documentation/about-logo.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/documentation/about-logo.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/documentation/about-logo.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/documentation/assistant-icon.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/documentation/assistant-icon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/documentation/assistant-icon.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/documentation/assistant-icon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.diffusionimagingapp/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/files.cmake b/Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/files.cmake rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.diffusionimagingapp/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/plugin.xml b/Plugins/org.mitk.gui.qt.diffusionimagingapp/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/plugin.xml rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/ImageProcessing_48.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/ImageProcessing_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/ImageProcessing_48.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/ImageProcessing_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/Measurement_48.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/Measurement_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/Measurement_48.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/Measurement_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/RigidRegistration.xpm b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/RigidRegistration.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/RigidRegistration.xpm rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/RigidRegistration.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/app-icon.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/app-icon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/app-icon.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/app-icon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/diffusionimaging.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/diffusionimaging.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/diffusionimaging.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/diffusionimaging.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/icon_dicom.xpm b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/icon_dicom.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/icon_dicom.xpm rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/icon_dicom.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/icon_vesseltreesegmentation.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/icon_vesseltreesegmentation.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/icon_vesseltreesegmentation.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/icon_vesseltreesegmentation.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/mintLogo.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/mintLogo.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/mintLogo.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/mintLogo.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/org_mitk_gui_qt_diffusionimagingapp.qrc b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/org_mitk_gui_qt_diffusionimagingapp.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/org_mitk_gui_qt_diffusionimagingapp.qrc rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/org_mitk_gui_qt_diffusionimagingapp.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/connectomics.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/connectomics.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/connectomics.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/connectomics.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/dicomimport.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/dicomimport.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/dicomimport.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/dicomimport.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/diffusionimaging.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/diffusionimaging.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/diffusionimaging.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/diffusionimaging.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/icon_home.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/icon_home.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/icon_home.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/icon_home.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/ivim.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/ivim.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/ivim.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/ivim.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/preprocessingreconstruction.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/preprocessingreconstruction.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/preprocessingreconstruction.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/preprocessingreconstruction.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/quantification.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/quantification.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/quantification.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/quantification.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/screenshotsmovies.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/screenshotsmovies.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/screenshotsmovies.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/screenshotsmovies.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/tbss.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/tbss.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/tbss.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/tbss.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/tractography.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/tractography.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/tractography.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/tractography.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/volumevizualization.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/volumevizualization.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/volumevizualization.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/perspectives/volumevizualization.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/preprocessing.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/preprocessing.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/preprocessing.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/preprocessing.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/segmentation.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/segmentation.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/segmentation.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/segmentation.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/volvis.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/volvis.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/volvis.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/volvis.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/QmitkWelcomeScreenView.qrc b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/QmitkWelcomeScreenView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/QmitkWelcomeScreenView.qrc rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/QmitkWelcomeScreenView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/function.js b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/function.js similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/function.js rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/function.js diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/mitkdiffusionimagingappwelcomeview.html b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/mitkdiffusionimagingappwelcomeview.html similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/mitkdiffusionimagingappwelcomeview.html rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/mitkdiffusionimagingappwelcomeview.html diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/01adicomimport.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/01adicomimport.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/01adicomimport.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/01adicomimport.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/01dicomimport.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/01dicomimport.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/01dicomimport.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/01dicomimport.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/02apreprocessingreconstruction.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/02apreprocessingreconstruction.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/02apreprocessingreconstruction.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/02apreprocessingreconstruction.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/02preprocessingreconstruction.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/02preprocessingreconstruction.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/02preprocessingreconstruction.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/02preprocessingreconstruction.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03aquantification.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03aquantification.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03aquantification.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03aquantification.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03quantification.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03quantification.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03quantification.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/03quantification.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04atractography.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04atractography.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04atractography.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04atractography.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04tractography.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04tractography.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04tractography.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/04tractography.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05atbss.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05atbss.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05atbss.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05atbss.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05tbss.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05tbss.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05tbss.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/05tbss.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/06aconnectomics.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/06aconnectomics.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/06aconnectomics.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/06aconnectomics.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/06connectomics.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/06connectomics.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/06connectomics.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/06connectomics.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/07aivim.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/07aivim.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/07aivim.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/07aivim.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/07ivim.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/07ivim.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/07ivim.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/07ivim.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/08avolumevisualization.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/08avolumevisualization.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/08avolumevisualization.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/08avolumevisualization.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/08volumevisualization.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/08volumevisualization.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/08volumevisualization.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/08volumevisualization.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/09ascreenshotsmovies.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/09ascreenshotsmovies.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/09ascreenshotsmovies.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/09ascreenshotsmovies.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/09screenshotsmovies.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/09screenshotsmovies.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/09screenshotsmovies.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/09screenshotsmovies.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/background.jpg b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/background.jpg similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/background.jpg rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/background.jpg diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/button_mitk.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/button_mitk.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/button_mitk.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/button_mitk.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/button_mitka.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/button_mitka.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/button_mitka.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/button_mitka.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/experimental.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/experimental.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/experimental.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/experimental.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg_bottom.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg_bottom.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg_bottom.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg_bottom.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg_middle.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg_middle.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg_middle.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg_middle.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg_top.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg_top.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg_top.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bg_top.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bttn_close.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bttn_close.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bttn_close.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/popup_bttn_close.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/shadow.png b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/shadow.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/shadow.png rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/pics/shadow.png diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/style.css b/Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/style.css similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/style.css rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/resources/welcome/style.css diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppApplication.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppApplication.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppApplication.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppApplication.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppApplication.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppApplication.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppApplication.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppApplication.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppConnectomicsPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppConnectomicsPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppConnectomicsPerspective.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppConnectomicsPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppConnectomicsPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppConnectomicsPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppConnectomicsPerspective.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppConnectomicsPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppDicomImportPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppDicomImportPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppDicomImportPerspective.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppDicomImportPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppDicomImportPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppDicomImportPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppDicomImportPerspective.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppDicomImportPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppFiberTractographyPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppFiberTractographyPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppFiberTractographyPerspective.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppFiberTractographyPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppFiberTractographyPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppFiberTractographyPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppFiberTractographyPerspective.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppFiberTractographyPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppIVIMPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppIVIMPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppIVIMPerspective.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppIVIMPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppIVIMPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppIVIMPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppIVIMPerspective.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppIVIMPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppPreprocessingReconstructionPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppPreprocessingReconstructionPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppPreprocessingReconstructionPerspective.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppPreprocessingReconstructionPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppPreprocessingReconstructionPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppPreprocessingReconstructionPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppPreprocessingReconstructionPerspective.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppPreprocessingReconstructionPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppQuantificationPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppQuantificationPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppQuantificationPerspective.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppQuantificationPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppQuantificationPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppQuantificationPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppQuantificationPerspective.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppQuantificationPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppScreenshotsMoviesPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppScreenshotsMoviesPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppScreenshotsMoviesPerspective.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppScreenshotsMoviesPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppScreenshotsMoviesPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppScreenshotsMoviesPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppScreenshotsMoviesPerspective.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppScreenshotsMoviesPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTBSSPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTBSSPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTBSSPerspective.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTBSSPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTBSSPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTBSSPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTBSSPerspective.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTBSSPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTrackingEvaluationPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTrackingEvaluationPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTrackingEvaluationPerspective.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTrackingEvaluationPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTrackingEvaluationPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTrackingEvaluationPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTrackingEvaluationPerspective.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppTrackingEvaluationPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppVolumeVisualizationPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppVolumeVisualizationPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppVolumeVisualizationPerspective.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppVolumeVisualizationPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppVolumeVisualizationPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppVolumeVisualizationPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppVolumeVisualizationPerspective.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDIAppVolumeVisualizationPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppApplication.h~bug-8511-DTI-atlas-app b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppApplication.h~bug-8511-DTI-atlas-app similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppApplication.h~bug-8511-DTI-atlas-app rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppApplication.h~bug-8511-DTI-atlas-app diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppIntroPart.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppIntroPart.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppIntroPart.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppIntroPart.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppIntroPart.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppIntroPart.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppIntroPart.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppIntroPart.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkDiffusionImagingAppPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsView.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsView.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsView.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsView.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkNavigationButtonsViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkWelcomePerspective.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkWelcomePerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkWelcomePerspective.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkWelcomePerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkWelcomePerspective.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkWelcomePerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkWelcomePerspective.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkWelcomePerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkWelcomeScreenViewControls.ui b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkWelcomeScreenViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkWelcomeScreenViewControls.ui rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/QmitkWelcomeScreenViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.diffusionimagingapp/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/CMakeLists.txt b/Plugins/org.mitk.gui.qt.dtiatlasapp/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.dtiatlasapp/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/MitkDTIAtlasAppQtHelpCollectionProject.qhcp b/Plugins/org.mitk.gui.qt.dtiatlasapp/documentation/MitkDTIAtlasAppQtHelpCollectionProject.qhcp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/MitkDTIAtlasAppQtHelpCollectionProject.qhcp rename to Plugins/org.mitk.gui.qt.dtiatlasapp/documentation/MitkDTIAtlasAppQtHelpCollectionProject.qhcp diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/QmitkDTIAtlasAppUserManual.dox b/Plugins/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/QmitkDTIAtlasAppUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/QmitkDTIAtlasAppUserManual.dox rename to Plugins/org.mitk.gui.qt.dtiatlasapp/documentation/UserManual/QmitkDTIAtlasAppUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/about-logo.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/documentation/about-logo.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/about-logo.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/documentation/about-logo.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/assistant-icon.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/documentation/assistant-icon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/assistant-icon.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/documentation/assistant-icon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.dtiatlasapp/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.dtiatlasapp/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/files.cmake b/Plugins/org.mitk.gui.qt.dtiatlasapp/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/files.cmake rename to Plugins/org.mitk.gui.qt.dtiatlasapp/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.dtiatlasapp/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.dtiatlasapp/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/plugin.xml b/Plugins/org.mitk.gui.qt.dtiatlasapp/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/plugin.xml rename to Plugins/org.mitk.gui.qt.dtiatlasapp/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/ImageProcessing_48.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/ImageProcessing_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/ImageProcessing_48.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/ImageProcessing_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/Measurement_48.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/Measurement_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/Measurement_48.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/Measurement_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/RigidRegistration.xpm b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/RigidRegistration.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/RigidRegistration.xpm rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/RigidRegistration.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/app-icon.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/app-icon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/app-icon.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/app-icon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/diffusionimaging.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/diffusionimaging.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/diffusionimaging.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/diffusionimaging.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/icon_dicom.xpm b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/icon_dicom.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/icon_dicom.xpm rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/icon_dicom.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/icon_vesseltreesegmentation.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/icon_vesseltreesegmentation.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/icon_vesseltreesegmentation.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/icon_vesseltreesegmentation.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/mintLogo.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/mintLogo.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/mintLogo.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/mintLogo.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/org_mitk_gui_qt_dtiatlasapp.qrc b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/org_mitk_gui_qt_dtiatlasapp.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/org_mitk_gui_qt_dtiatlasapp.qrc rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/org_mitk_gui_qt_dtiatlasapp.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/segmentation.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/segmentation.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/segmentation.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/segmentation.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/volvis.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/volvis.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/volvis.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/volvis.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/QmitkWelcomeScreenView.qrc b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/QmitkWelcomeScreenView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/QmitkWelcomeScreenView.qrc rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/QmitkWelcomeScreenView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/function.js b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/function.js similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/function.js rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/function.js diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/mitkdtiatlasappwelcomeview.html b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/mitkdtiatlasappwelcomeview.html similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/mitkdtiatlasappwelcomeview.html rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/mitkdtiatlasappwelcomeview.html diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/01CING.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/01CING.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/01CING.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/01CING.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/01aCING.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/01aCING.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/01aCING.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/01aCING.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/02CORPUS.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/02CORPUS.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/02CORPUS.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/02CORPUS.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/02aCORPUS.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/02aCORPUS.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/02aCORPUS.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/02aCORPUS.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/03CST.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/03CST.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/03CST.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/03CST.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/03aCST.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/03aCST.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/03aCST.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/03aCST.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/04FORNIX.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/04FORNIX.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/04FORNIX.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/04FORNIX.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/04aFORNIX.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/04aFORNIX.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/04aFORNIX.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/04aFORNIX.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/05ILF+IFO+UNCUS.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/05ILF+IFO+UNCUS.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/05ILF+IFO+UNCUS.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/05ILF+IFO+UNCUS.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/05aILF+IFO+UNCUS.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/05aILF+IFO+UNCUS.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/05aILF+IFO+UNCUS.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/05aILF+IFO+UNCUS.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/06SLF+SOFF+ARCUATE.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/06SLF+SOFF+ARCUATE.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/06SLF+SOFF+ARCUATE.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/06SLF+SOFF+ARCUATE.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/06aSLF+SOFF+ARCUATE.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/06aSLF+SOFF+ARCUATE.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/06aSLF+SOFF+ARCUATE.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/06aSLF+SOFF+ARCUATE.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/07PEDUNCLES.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/07PEDUNCLES.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/07PEDUNCLES.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/07PEDUNCLES.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/07aPEDUNCLES.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/07aPEDUNCLES.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/07aPEDUNCLES.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/07aPEDUNCLES.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0aaref_alltracts.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0aaref_alltracts.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0aaref_alltracts.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0aaref_alltracts.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0aref_alltracts.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0aref_alltracts.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0aref_alltracts.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0aref_alltracts.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0bref_colormap.gif b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0bref_colormap.gif similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0bref_colormap.gif rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0bref_colormap.gif diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0bref_colormap.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0bref_colormap.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0bref_colormap.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0bref_colormap.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0cref_t1.gif b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0cref_t1.gif similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0cref_t1.gif rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0cref_t1.gif diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0cref_t1.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0cref_t1.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0cref_t1.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/0cref_t1.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/background.jpg b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/background.jpg similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/background.jpg rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/background.jpg diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/button_mitk.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/button_mitk.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/button_mitk.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/button_mitk.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/button_mitka.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/button_mitka.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/button_mitka.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/button_mitka.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/dti.jpg b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/dti.jpg similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/dti.jpg rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/dti.jpg diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/dti_animated.gif b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/dti_animated.gif similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/dti_animated.gif rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/dti_animated.gif diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/experimental.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/experimental.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/experimental.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/experimental.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_bottom.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_bottom.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_bottom.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_bottom.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_middle.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_middle.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_middle.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_middle.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_top.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_top.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_top.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bg_top.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bttn_close.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bttn_close.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bttn_close.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/popup_bttn_close.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/shadow.png b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/shadow.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/shadow.png rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/pics/shadow.png diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/style.css b/Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/style.css similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/resources/welcome/style.css rename to Plugins/org.mitk.gui.qt.dtiatlasapp/resources/welcome/style.css diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppApplication.cpp b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppApplication.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppApplication.cpp rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppApplication.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppApplication.h b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppApplication.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppApplication.h rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppApplication.h diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppWorkbenchAdvisor.cpp b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppWorkbenchAdvisor.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppWorkbenchAdvisor.cpp rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppWorkbenchAdvisor.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppWorkbenchAdvisor.h b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppWorkbenchAdvisor.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppWorkbenchAdvisor.h rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/QmitkDTIAtlasAppWorkbenchAdvisor.h diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplication.h~bug-8511-DTI-atlas-app b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplication.h~bug-8511-DTI-atlas-app similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplication.h~bug-8511-DTI-atlas-app rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplication.h~bug-8511-DTI-atlas-app diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplicationPlugin.cpp b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplicationPlugin.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplicationPlugin.cpp rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplicationPlugin.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplicationPlugin.h b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplicationPlugin.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplicationPlugin.h rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppApplicationPlugin.h diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppIntroPart.cpp b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppIntroPart.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppIntroPart.cpp rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppIntroPart.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppIntroPart.h b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppIntroPart.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppIntroPart.h rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppIntroPart.h diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppPerspective.cpp b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppPerspective.cpp rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppPerspective.h b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppPerspective.h rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkDTIAtlasAppPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsView.cpp b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsView.cpp rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsView.h b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsView.h rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsViewControls.ui b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsViewControls.ui rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkNavigationButtonsViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomePerspective.cpp b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomePerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomePerspective.cpp rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomePerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomePerspective.h b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomePerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomePerspective.h rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomePerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomeScreenViewControls.ui b/Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomeScreenViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomeScreenViewControls.ui rename to Plugins/org.mitk.gui.qt.dtiatlasapp/src/internal/QmitkWelcomeScreenViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/CMakeLists.txt b/Plugins/org.mitk.gui.qt.examples/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.examples/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/ColorImageProcessing.png b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/ColorImageProcessing.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/ColorImageProcessing.png rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/ColorImageProcessing.png diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/IsoSurfaceGUI.png b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/IsoSurfaceGUI.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/IsoSurfaceGUI.png rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/IsoSurfaceGUI.png diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/IsoSurfaceIcon.png b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/IsoSurfaceIcon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/IsoSurfaceIcon.png rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/IsoSurfaceIcon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/MITKExamples.dox b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/MITKExamples.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/MITKExamples.dox rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/MITKExamples.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/QmitkColourImageProcessing.dox b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/QmitkColourImageProcessing.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/QmitkColourImageProcessing.dox rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/QmitkColourImageProcessing.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/QmitkIsoSurfaceUserManual.dox b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/QmitkIsoSurfaceUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/QmitkIsoSurfaceUserManual.dox rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/QmitkIsoSurfaceUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/QmitkRegionGrowingUserManual.dox b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/QmitkRegionGrowingUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/QmitkRegionGrowingUserManual.dox rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/QmitkRegionGrowingUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/QmitkSimpleExampleUserManual.dox b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/QmitkSimpleExampleUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/QmitkSimpleExampleUserManual.dox rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/QmitkSimpleExampleUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/QmitkSimpleMeasurementUserManual.dox b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/QmitkSimpleMeasurementUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/QmitkSimpleMeasurementUserManual.dox rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/QmitkSimpleMeasurementUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/SimpleExample.png b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/SimpleExample.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/SimpleExample.png rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/SimpleExample.png diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/SimpleMeasurementGUI.png b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/SimpleMeasurementGUI.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/SimpleMeasurementGUI.png rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/SimpleMeasurementGUI.png diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/SimpleMeasurementIcon.png b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/SimpleMeasurementIcon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/SimpleMeasurementIcon.png rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/SimpleMeasurementIcon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/org_mitk_gui_qt_viewinitialization.dox b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/org_mitk_gui_qt_viewinitialization.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/org_mitk_gui_qt_viewinitialization.dox rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/org_mitk_gui_qt_viewinitialization.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/regiongrowing.png b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/regiongrowing.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/regiongrowing.png rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/regiongrowing.png diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/regiongrowing.xpm b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/regiongrowing.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/regiongrowing.xpm rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/regiongrowing.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/viewInitializationIcon.png b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/viewInitializationIcon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/viewInitializationIcon.png rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/viewInitializationIcon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/viewInitializationIcon.xpm b/Plugins/org.mitk.gui.qt.examples/documentation/Manual/viewInitializationIcon.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/Manual/viewInitializationIcon.xpm rename to Plugins/org.mitk.gui.qt.examples/documentation/Manual/viewInitializationIcon.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.examples/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.examples/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/files.cmake b/Plugins/org.mitk.gui.qt.examples/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/files.cmake rename to Plugins/org.mitk.gui.qt.examples/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.examples/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.examples/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/plugin.xml b/Plugins/org.mitk.gui.qt.examples/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/plugin.xml rename to Plugins/org.mitk.gui.qt.examples/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/resources/ColorImageProcessing.png b/Plugins/org.mitk.gui.qt.examples/resources/ColorImageProcessing.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/resources/ColorImageProcessing.png rename to Plugins/org.mitk.gui.qt.examples/resources/ColorImageProcessing.png diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/resources/QmitkColourImageProcessingView.qrc b/Plugins/org.mitk.gui.qt.examples/resources/QmitkColourImageProcessingView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/resources/QmitkColourImageProcessingView.qrc rename to Plugins/org.mitk.gui.qt.examples/resources/QmitkColourImageProcessingView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/resources/QmitkSimpleExampleView.qrc b/Plugins/org.mitk.gui.qt.examples/resources/QmitkSimpleExampleView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/resources/QmitkSimpleExampleView.qrc rename to Plugins/org.mitk.gui.qt.examples/resources/QmitkSimpleExampleView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/resources/QmitkVolumetryView.qrc b/Plugins/org.mitk.gui.qt.examples/resources/QmitkVolumetryView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/resources/QmitkVolumetryView.qrc rename to Plugins/org.mitk.gui.qt.examples/resources/QmitkVolumetryView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/resources/SimpleExample.png b/Plugins/org.mitk.gui.qt.examples/resources/SimpleExample.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/resources/SimpleExample.png rename to Plugins/org.mitk.gui.qt.examples/resources/SimpleExample.png diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/resources/SimpleMeasurement.png b/Plugins/org.mitk.gui.qt.examples/resources/SimpleMeasurement.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/resources/SimpleMeasurement.png rename to Plugins/org.mitk.gui.qt.examples/resources/SimpleMeasurement.png diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/resources/isoSurface.xpm b/Plugins/org.mitk.gui.qt.examples/resources/isoSurface.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/resources/isoSurface.xpm rename to Plugins/org.mitk.gui.qt.examples/resources/isoSurface.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/resources/isosurface.qrc b/Plugins/org.mitk.gui.qt.examples/resources/isosurface.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/resources/isosurface.qrc rename to Plugins/org.mitk.gui.qt.examples/resources/isosurface.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/resources/viewInitializationIcon.xpm b/Plugins/org.mitk.gui.qt.examples/resources/viewInitializationIcon.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/resources/viewInitializationIcon.xpm rename to Plugins/org.mitk.gui.qt.examples/resources/viewInitializationIcon.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/resources/volumetryIcon.xpm b/Plugins/org.mitk.gui.qt.examples/resources/volumetryIcon.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/resources/volumetryIcon.xpm rename to Plugins/org.mitk.gui.qt.examples/resources/volumetryIcon.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/ExamplesDll.h b/Plugins/org.mitk.gui.qt.examples/src/ExamplesDll.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/ExamplesDll.h rename to Plugins/org.mitk.gui.qt.examples/src/ExamplesDll.h diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/QmitkColourImageProcessingView.cpp b/Plugins/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/QmitkColourImageProcessingView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/QmitkColourImageProcessingView.cpp rename to Plugins/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/QmitkColourImageProcessingView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/QmitkColourImageProcessingView.h b/Plugins/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/QmitkColourImageProcessingView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/QmitkColourImageProcessingView.h rename to Plugins/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/QmitkColourImageProcessingView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/QmitkColourImageProcessingViewControls.ui b/Plugins/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/QmitkColourImageProcessingViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/QmitkColourImageProcessingViewControls.ui rename to Plugins/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/QmitkColourImageProcessingViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/mitkColourImageProcessor.cpp b/Plugins/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/mitkColourImageProcessor.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/mitkColourImageProcessor.cpp rename to Plugins/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/mitkColourImageProcessor.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/mitkColourImageProcessor.h b/Plugins/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/mitkColourImageProcessor.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/mitkColourImageProcessor.h rename to Plugins/org.mitk.gui.qt.examples/src/internal/colourimageprocessing/mitkColourImageProcessor.h diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/isosurface/QmitkIsoSurface.cpp b/Plugins/org.mitk.gui.qt.examples/src/internal/isosurface/QmitkIsoSurface.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/isosurface/QmitkIsoSurface.cpp rename to Plugins/org.mitk.gui.qt.examples/src/internal/isosurface/QmitkIsoSurface.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/isosurface/QmitkIsoSurface.h b/Plugins/org.mitk.gui.qt.examples/src/internal/isosurface/QmitkIsoSurface.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/isosurface/QmitkIsoSurface.h rename to Plugins/org.mitk.gui.qt.examples/src/internal/isosurface/QmitkIsoSurface.h diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/isosurface/QmitkIsoSurfaceControls.ui b/Plugins/org.mitk.gui.qt.examples/src/internal/isosurface/QmitkIsoSurfaceControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/isosurface/QmitkIsoSurfaceControls.ui rename to Plugins/org.mitk.gui.qt.examples/src/internal/isosurface/QmitkIsoSurfaceControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.examples/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.examples/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.examples/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.examples/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/simpleexample/QmitkSimpleExampleView.cpp b/Plugins/org.mitk.gui.qt.examples/src/internal/simpleexample/QmitkSimpleExampleView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/simpleexample/QmitkSimpleExampleView.cpp rename to Plugins/org.mitk.gui.qt.examples/src/internal/simpleexample/QmitkSimpleExampleView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/simpleexample/QmitkSimpleExampleView.h b/Plugins/org.mitk.gui.qt.examples/src/internal/simpleexample/QmitkSimpleExampleView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/simpleexample/QmitkSimpleExampleView.h rename to Plugins/org.mitk.gui.qt.examples/src/internal/simpleexample/QmitkSimpleExampleView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/simpleexample/QmitkSimpleExampleViewControls.ui b/Plugins/org.mitk.gui.qt.examples/src/internal/simpleexample/QmitkSimpleExampleViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/simpleexample/QmitkSimpleExampleViewControls.ui rename to Plugins/org.mitk.gui.qt.examples/src/internal/simpleexample/QmitkSimpleExampleViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/simplemeasurement/QmitkSimpleMeasurement.cpp b/Plugins/org.mitk.gui.qt.examples/src/internal/simplemeasurement/QmitkSimpleMeasurement.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/simplemeasurement/QmitkSimpleMeasurement.cpp rename to Plugins/org.mitk.gui.qt.examples/src/internal/simplemeasurement/QmitkSimpleMeasurement.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/simplemeasurement/QmitkSimpleMeasurement.h b/Plugins/org.mitk.gui.qt.examples/src/internal/simplemeasurement/QmitkSimpleMeasurement.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/simplemeasurement/QmitkSimpleMeasurement.h rename to Plugins/org.mitk.gui.qt.examples/src/internal/simplemeasurement/QmitkSimpleMeasurement.h diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/simplemeasurement/QmitkSimpleMeasurementControls.ui b/Plugins/org.mitk.gui.qt.examples/src/internal/simplemeasurement/QmitkSimpleMeasurementControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/simplemeasurement/QmitkSimpleMeasurementControls.ui rename to Plugins/org.mitk.gui.qt.examples/src/internal/simplemeasurement/QmitkSimpleMeasurementControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/viewinitialization/QmitkViewInitializationView.cpp b/Plugins/org.mitk.gui.qt.examples/src/internal/viewinitialization/QmitkViewInitializationView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/viewinitialization/QmitkViewInitializationView.cpp rename to Plugins/org.mitk.gui.qt.examples/src/internal/viewinitialization/QmitkViewInitializationView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/viewinitialization/QmitkViewInitializationView.h b/Plugins/org.mitk.gui.qt.examples/src/internal/viewinitialization/QmitkViewInitializationView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/viewinitialization/QmitkViewInitializationView.h rename to Plugins/org.mitk.gui.qt.examples/src/internal/viewinitialization/QmitkViewInitializationView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/viewinitialization/QmitkViewInitializationViewControls.ui b/Plugins/org.mitk.gui.qt.examples/src/internal/viewinitialization/QmitkViewInitializationViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/viewinitialization/QmitkViewInitializationViewControls.ui rename to Plugins/org.mitk.gui.qt.examples/src/internal/viewinitialization/QmitkViewInitializationViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/volumetry/QmitkVolumetryView.cpp b/Plugins/org.mitk.gui.qt.examples/src/internal/volumetry/QmitkVolumetryView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/volumetry/QmitkVolumetryView.cpp rename to Plugins/org.mitk.gui.qt.examples/src/internal/volumetry/QmitkVolumetryView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/volumetry/QmitkVolumetryView.h b/Plugins/org.mitk.gui.qt.examples/src/internal/volumetry/QmitkVolumetryView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/volumetry/QmitkVolumetryView.h rename to Plugins/org.mitk.gui.qt.examples/src/internal/volumetry/QmitkVolumetryView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.examples/src/internal/volumetry/QmitkVolumetryViewControls.ui b/Plugins/org.mitk.gui.qt.examples/src/internal/volumetry/QmitkVolumetryViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examples/src/internal/volumetry/QmitkVolumetryViewControls.ui rename to Plugins/org.mitk.gui.qt.examples/src/internal/volumetry/QmitkVolumetryViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.examplesopencv/CMakeLists.txt b/Plugins/org.mitk.gui.qt.examplesopencv/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examplesopencv/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.examplesopencv/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.examplesopencv/documentation/UserManual/MITKExamplesOpenCV.dox b/Plugins/org.mitk.gui.qt.examplesopencv/documentation/UserManual/MITKExamplesOpenCV.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examplesopencv/documentation/UserManual/MITKExamplesOpenCV.dox rename to Plugins/org.mitk.gui.qt.examplesopencv/documentation/UserManual/MITKExamplesOpenCV.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.examplesopencv/documentation/UserManual/VideoPlayerUserManual.dox b/Plugins/org.mitk.gui.qt.examplesopencv/documentation/UserManual/VideoPlayerUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examplesopencv/documentation/UserManual/VideoPlayerUserManual.dox rename to Plugins/org.mitk.gui.qt.examplesopencv/documentation/UserManual/VideoPlayerUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.examplesopencv/documentation/UserManual/videoplayer.gif b/Plugins/org.mitk.gui.qt.examplesopencv/documentation/UserManual/videoplayer.gif similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examplesopencv/documentation/UserManual/videoplayer.gif rename to Plugins/org.mitk.gui.qt.examplesopencv/documentation/UserManual/videoplayer.gif diff --git a/Modules/Bundles/org.mitk.gui.qt.examplesopencv/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.examplesopencv/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examplesopencv/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.examplesopencv/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.examplesopencv/files.cmake b/Plugins/org.mitk.gui.qt.examplesopencv/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examplesopencv/files.cmake rename to Plugins/org.mitk.gui.qt.examplesopencv/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.examplesopencv/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.examplesopencv/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examplesopencv/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.examplesopencv/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.examplesopencv/plugin.xml b/Plugins/org.mitk.gui.qt.examplesopencv/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examplesopencv/plugin.xml rename to Plugins/org.mitk.gui.qt.examplesopencv/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.examplesopencv/resources/videoplayer.gif b/Plugins/org.mitk.gui.qt.examplesopencv/resources/videoplayer.gif similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examplesopencv/resources/videoplayer.gif rename to Plugins/org.mitk.gui.qt.examplesopencv/resources/videoplayer.gif diff --git a/Modules/Bundles/org.mitk.gui.qt.examplesopencv/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.examplesopencv/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examplesopencv/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.examplesopencv/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.examplesopencv/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.examplesopencv/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examplesopencv/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.examplesopencv/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.examplesopencv/src/internal/videoplayer/QmitkVideoPlayer.cpp b/Plugins/org.mitk.gui.qt.examplesopencv/src/internal/videoplayer/QmitkVideoPlayer.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examplesopencv/src/internal/videoplayer/QmitkVideoPlayer.cpp rename to Plugins/org.mitk.gui.qt.examplesopencv/src/internal/videoplayer/QmitkVideoPlayer.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.examplesopencv/src/internal/videoplayer/QmitkVideoPlayer.h b/Plugins/org.mitk.gui.qt.examplesopencv/src/internal/videoplayer/QmitkVideoPlayer.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.examplesopencv/src/internal/videoplayer/QmitkVideoPlayer.h rename to Plugins/org.mitk.gui.qt.examplesopencv/src/internal/videoplayer/QmitkVideoPlayer.h diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/CMakeLists.txt b/Plugins/org.mitk.gui.qt.ext/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.ext/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.ext/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.ext/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/files.cmake b/Plugins/org.mitk.gui.qt.ext/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/files.cmake rename to Plugins/org.mitk.gui.qt.ext/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.ext/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.ext/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/plugin.xml b/Plugins/org.mitk.gui.qt.ext/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/plugin.xml rename to Plugins/org.mitk.gui.qt.ext/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/resources/DataManager.png b/Plugins/org.mitk.gui.qt.ext/resources/DataManager.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/resources/DataManager.png rename to Plugins/org.mitk.gui.qt.ext/resources/DataManager.png diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/resources/Load_48.png b/Plugins/org.mitk.gui.qt.ext/resources/Load_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/resources/Load_48.png rename to Plugins/org.mitk.gui.qt.ext/resources/Load_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/resources/ModuleView.png b/Plugins/org.mitk.gui.qt.ext/resources/ModuleView.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/resources/ModuleView.png rename to Plugins/org.mitk.gui.qt.ext/resources/ModuleView.png diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/resources/Redo_48.png b/Plugins/org.mitk.gui.qt.ext/resources/Redo_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/resources/Redo_48.png rename to Plugins/org.mitk.gui.qt.ext/resources/Redo_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/resources/Remove_48.png b/Plugins/org.mitk.gui.qt.ext/resources/Remove_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/resources/Remove_48.png rename to Plugins/org.mitk.gui.qt.ext/resources/Remove_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/resources/Save_48.png b/Plugins/org.mitk.gui.qt.ext/resources/Save_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/resources/Save_48.png rename to Plugins/org.mitk.gui.qt.ext/resources/Save_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/resources/Slider.png b/Plugins/org.mitk.gui.qt.ext/resources/Slider.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/resources/Slider.png rename to Plugins/org.mitk.gui.qt.ext/resources/Slider.png diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/resources/Slider_48.png b/Plugins/org.mitk.gui.qt.ext/resources/Slider_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/resources/Slider_48.png rename to Plugins/org.mitk.gui.qt.ext/resources/Slider_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/resources/Undo_48.png b/Plugins/org.mitk.gui.qt.ext/resources/Undo_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/resources/Undo_48.png rename to Plugins/org.mitk.gui.qt.ext/resources/Undo_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/resources/index.html b/Plugins/org.mitk.gui.qt.ext/resources/index.html similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/resources/index.html rename to Plugins/org.mitk.gui.qt.ext/resources/index.html diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/resources/org_mitk_gui_qt_ext.qrc b/Plugins/org.mitk.gui.qt.ext/resources/org_mitk_gui_qt_ext.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/resources/org_mitk_gui_qt_ext.qrc rename to Plugins/org.mitk.gui.qt.ext/resources/org_mitk_gui_qt_ext.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtActionBarAdvisor.cpp b/Plugins/org.mitk.gui.qt.ext/src/QmitkExtActionBarAdvisor.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtActionBarAdvisor.cpp rename to Plugins/org.mitk.gui.qt.ext/src/QmitkExtActionBarAdvisor.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtActionBarAdvisor.h b/Plugins/org.mitk.gui.qt.ext/src/QmitkExtActionBarAdvisor.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtActionBarAdvisor.h rename to Plugins/org.mitk.gui.qt.ext/src/QmitkExtActionBarAdvisor.h diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtFileSaveProjectAction.cpp b/Plugins/org.mitk.gui.qt.ext/src/QmitkExtFileSaveProjectAction.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtFileSaveProjectAction.cpp rename to Plugins/org.mitk.gui.qt.ext/src/QmitkExtFileSaveProjectAction.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtFileSaveProjectAction.h b/Plugins/org.mitk.gui.qt.ext/src/QmitkExtFileSaveProjectAction.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtFileSaveProjectAction.h rename to Plugins/org.mitk.gui.qt.ext/src/QmitkExtFileSaveProjectAction.h diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp b/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp rename to Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.h b/Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.h rename to Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.h diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkAppInstancesPreferencePage.cpp b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkAppInstancesPreferencePage.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkAppInstancesPreferencePage.cpp rename to Plugins/org.mitk.gui.qt.ext/src/internal/QmitkAppInstancesPreferencePage.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkAppInstancesPreferencePage.h b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkAppInstancesPreferencePage.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkAppInstancesPreferencePage.h rename to Plugins/org.mitk.gui.qt.ext/src/internal/QmitkAppInstancesPreferencePage.h diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkAppInstancesPreferencePage.ui b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkAppInstancesPreferencePage.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkAppInstancesPreferencePage.ui rename to Plugins/org.mitk.gui.qt.ext/src/internal/QmitkAppInstancesPreferencePage.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkCommonExtPlugin.cpp b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkCommonExtPlugin.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkCommonExtPlugin.cpp rename to Plugins/org.mitk.gui.qt.ext/src/internal/QmitkCommonExtPlugin.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkCommonExtPlugin.h b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkCommonExtPlugin.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkCommonExtPlugin.h rename to Plugins/org.mitk.gui.qt.ext/src/internal/QmitkCommonExtPlugin.h diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkExtWorkbenchWindowAdvisorHack.h b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExtWorkbenchWindowAdvisorHack.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkExtWorkbenchWindowAdvisorHack.h rename to Plugins/org.mitk.gui.qt.ext/src/internal/QmitkExtWorkbenchWindowAdvisorHack.h diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkInputDevicesPrefPage.cpp b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkInputDevicesPrefPage.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkInputDevicesPrefPage.cpp rename to Plugins/org.mitk.gui.qt.ext/src/internal/QmitkInputDevicesPrefPage.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkInputDevicesPrefPage.h b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkInputDevicesPrefPage.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkInputDevicesPrefPage.h rename to Plugins/org.mitk.gui.qt.ext/src/internal/QmitkInputDevicesPrefPage.h diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkModuleView.cpp b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkModuleView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkModuleView.cpp rename to Plugins/org.mitk.gui.qt.ext/src/internal/QmitkModuleView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkModuleView.h b/Plugins/org.mitk.gui.qt.ext/src/internal/QmitkModuleView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ext/src/internal/QmitkModuleView.h rename to Plugins/org.mitk.gui.qt.ext/src/internal/QmitkModuleView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/CMakeLists.txt b/Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.extapplication/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/documentation/UserManual/QmitkExtapplicationUserManual.dox b/Plugins/org.mitk.gui.qt.extapplication/documentation/UserManual/QmitkExtapplicationUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/documentation/UserManual/QmitkExtapplicationUserManual.dox rename to Plugins/org.mitk.gui.qt.extapplication/documentation/UserManual/QmitkExtapplicationUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.extapplication/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.extapplication/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/files.cmake b/Plugins/org.mitk.gui.qt.extapplication/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/files.cmake rename to Plugins/org.mitk.gui.qt.extapplication/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.extapplication/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.extapplication/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/plugin.xml b/Plugins/org.mitk.gui.qt.extapplication/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/plugin.xml rename to Plugins/org.mitk.gui.qt.extapplication/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/resources/icon_research.xpm b/Plugins/org.mitk.gui.qt.extapplication/resources/icon_research.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/resources/icon_research.xpm rename to Plugins/org.mitk.gui.qt.extapplication/resources/icon_research.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtAppWorkbenchAdvisor.cpp b/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtAppWorkbenchAdvisor.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtAppWorkbenchAdvisor.cpp rename to Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtAppWorkbenchAdvisor.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtAppWorkbenchAdvisor.h b/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtAppWorkbenchAdvisor.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtAppWorkbenchAdvisor.h rename to Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtAppWorkbenchAdvisor.h diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplication.cpp b/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplication.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplication.cpp rename to Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplication.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplication.h b/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplication.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplication.h rename to Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplication.h diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplicationPlugin.cpp b/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplicationPlugin.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplicationPlugin.cpp rename to Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplicationPlugin.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplicationPlugin.h b/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplicationPlugin.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplicationPlugin.h rename to Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtApplicationPlugin.h diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtDefaultPerspective.cpp b/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtDefaultPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtDefaultPerspective.cpp rename to Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtDefaultPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtDefaultPerspective.h b/Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtDefaultPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.extapplication/src/internal/QmitkExtDefaultPerspective.h rename to Plugins/org.mitk.gui.qt.extapplication/src/internal/QmitkExtDefaultPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/CMakeLists.txt b/Plugins/org.mitk.gui.qt.igtexamples/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.igtexamples/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/documentation/UserManual/ImageGuidedTherapy.png b/Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/ImageGuidedTherapy.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/documentation/UserManual/ImageGuidedTherapy.png rename to Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/ImageGuidedTherapy.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/documentation/UserManual/Manual.dox b/Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/Manual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/documentation/UserManual/Manual.dox rename to Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/Manual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/documentation/UserManual/QmitkIGTTtrackingLab.dox b/Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/QmitkIGTTtrackingLab.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/documentation/UserManual/QmitkIGTTtrackingLab.dox rename to Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/QmitkIGTTtrackingLab.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/documentation/UserManual/QmitkIGTTutorial.dox b/Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/QmitkIGTTutorial.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/documentation/UserManual/QmitkIGTTutorial.dox rename to Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/QmitkIGTTutorial.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/documentation/UserManual/icon.png b/Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/icon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/documentation/UserManual/icon.png rename to Plugins/org.mitk.gui.qt.igtexamples/documentation/UserManual/icon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.igtexamples/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.igtexamples/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/files.cmake b/Plugins/org.mitk.gui.qt.igtexamples/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/files.cmake rename to Plugins/org.mitk.gui.qt.igtexamples/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.igtexamples/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.igtexamples/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/plugin.xml b/Plugins/org.mitk.gui.qt.igtexamples/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/plugin.xml rename to Plugins/org.mitk.gui.qt.igtexamples/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/resources/IGTTutorial.png b/Plugins/org.mitk.gui.qt.igtexamples/resources/IGTTutorial.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/resources/IGTTutorial.png rename to Plugins/org.mitk.gui.qt.igtexamples/resources/IGTTutorial.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/resources/IgtTrackingLab.png b/Plugins/org.mitk.gui.qt.igtexamples/resources/IgtTrackingLab.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/resources/IgtTrackingLab.png rename to Plugins/org.mitk.gui.qt.igtexamples/resources/IgtTrackingLab.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/resources/QmitkIGTTrackingLabView.qrc b/Plugins/org.mitk.gui.qt.igtexamples/resources/QmitkIGTTrackingLabView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/resources/QmitkIGTTrackingLabView.qrc rename to Plugins/org.mitk.gui.qt.igtexamples/resources/QmitkIGTTrackingLabView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/resources/QmitkIGTTutorialView.qrc b/Plugins/org.mitk.gui.qt.igtexamples/resources/QmitkIGTTutorialView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/resources/QmitkIGTTutorialView.qrc rename to Plugins/org.mitk.gui.qt.igtexamples/resources/QmitkIGTTutorialView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/resources/start_rec.png b/Plugins/org.mitk.gui.qt.igtexamples/resources/start_rec.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/resources/start_rec.png rename to Plugins/org.mitk.gui.qt.igtexamples/resources/start_rec.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/resources/stop_rec.png b/Plugins/org.mitk.gui.qt.igtexamples/resources/stop_rec.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/resources/stop_rec.png rename to Plugins/org.mitk.gui.qt.igtexamples/resources/stop_rec.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.cpp b/Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.cpp rename to Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.h b/Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.h rename to Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabViewControls.ui b/Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabViewControls.ui rename to Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTrackingLabViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTutorialView.cpp b/Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTutorialView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTutorialView.cpp rename to Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTutorialView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTutorialView.h b/Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTutorialView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTutorialView.h rename to Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTutorialView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTutorialViewControls.ui b/Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTutorialViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTutorialViewControls.ui rename to Plugins/org.mitk.gui.qt.igtexamples/src/internal/QmitkIGTTutorialViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.igtexamples/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.igtexamples/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.igtexamples/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtexamples/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.igtexamples/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.igtnavigation/CMakeLists.txt b/Plugins/org.mitk.gui.qt.igtnavigation/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtnavigation/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.igtnavigation/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.igtnavigation/documentation/UserManual/Manual.dox b/Plugins/org.mitk.gui.qt.igtnavigation/documentation/UserManual/Manual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtnavigation/documentation/UserManual/Manual.dox rename to Plugins/org.mitk.gui.qt.igtnavigation/documentation/UserManual/Manual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.igtnavigation/documentation/UserManual/QmitkToolPairNavigation.dox b/Plugins/org.mitk.gui.qt.igtnavigation/documentation/UserManual/QmitkToolPairNavigation.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtnavigation/documentation/UserManual/QmitkToolPairNavigation.dox rename to Plugins/org.mitk.gui.qt.igtnavigation/documentation/UserManual/QmitkToolPairNavigation.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.igtnavigation/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.igtnavigation/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtnavigation/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.igtnavigation/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.igtnavigation/files.cmake b/Plugins/org.mitk.gui.qt.igtnavigation/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtnavigation/files.cmake rename to Plugins/org.mitk.gui.qt.igtnavigation/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.igtnavigation/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.igtnavigation/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtnavigation/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.igtnavigation/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.igtnavigation/plugin.xml b/Plugins/org.mitk.gui.qt.igtnavigation/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtnavigation/plugin.xml rename to Plugins/org.mitk.gui.qt.igtnavigation/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.igtnavigation/resources/QmitkToolPairNavigationView.qrc b/Plugins/org.mitk.gui.qt.igtnavigation/resources/QmitkToolPairNavigationView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtnavigation/resources/QmitkToolPairNavigationView.qrc rename to Plugins/org.mitk.gui.qt.igtnavigation/resources/QmitkToolPairNavigationView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.igtnavigation/resources/toolpair.png b/Plugins/org.mitk.gui.qt.igtnavigation/resources/toolpair.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtnavigation/resources/toolpair.png rename to Plugins/org.mitk.gui.qt.igtnavigation/resources/toolpair.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationView.cpp b/Plugins/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationView.cpp rename to Plugins/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationView.h b/Plugins/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationView.h rename to Plugins/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationViewControls.ui b/Plugins/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationViewControls.ui rename to Plugins/org.mitk.gui.qt.igtnavigation/src/internal/QmitkToolPairNavigationViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.igtnavigation/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.igtnavigation/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtnavigation/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.igtnavigation/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.igtnavigation/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.igtnavigation/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igtnavigation/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.igtnavigation/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/CMakeLists.txt b/Plugins/org.mitk.gui.qt.igttracking/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.igttracking/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/Manual.dox b/Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/Manual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/Manual.dox rename to Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/Manual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/NavigationToolManagemantStartScreen.png b/Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/NavigationToolManagemantStartScreen.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/NavigationToolManagemantStartScreen.png rename to Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/NavigationToolManagemantStartScreen.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/NavigationToolManagementAddTool.png b/Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/NavigationToolManagementAddTool.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/NavigationToolManagementAddTool.png rename to Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/NavigationToolManagementAddTool.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkMITKIGTNavigationToolManager.dox b/Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkMITKIGTNavigationToolManager.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkMITKIGTNavigationToolManager.dox rename to Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkMITKIGTNavigationToolManager.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkMITKIGTTrackingToolbox.dox b/Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkMITKIGTTrackingToolbox.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkMITKIGTTrackingToolbox.dox rename to Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkMITKIGTTrackingToolbox.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkNavigationDataPlayer.dox b/Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkNavigationDataPlayer.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkNavigationDataPlayer.dox rename to Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/QmitkNavigationDataPlayer.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/configurationWidget.png b/Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/configurationWidget.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/configurationWidget.png rename to Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/configurationWidget.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/iconNavigationDataPlayer.png b/Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/iconNavigationDataPlayer.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/iconNavigationDataPlayer.png rename to Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/iconNavigationDataPlayer.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/iconNavigationToolManager.png b/Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/iconNavigationToolManager.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/iconNavigationToolManager.png rename to Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/iconNavigationToolManager.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/iconTrackingToolbox.png b/Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/iconTrackingToolbox.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/iconTrackingToolbox.png rename to Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/iconTrackingToolbox.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/screenshot_complete.jpg.png b/Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/screenshot_complete.jpg.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/screenshot_complete.jpg.png rename to Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/screenshot_complete.jpg.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/screenshot_mitk.png b/Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/screenshot_mitk.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/screenshot_mitk.png rename to Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/screenshot_mitk.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/trackingToolsWidget.png b/Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/trackingToolsWidget.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/UserManual/trackingToolsWidget.png rename to Plugins/org.mitk.gui.qt.igttracking/documentation/UserManual/trackingToolsWidget.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.igttracking/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.igttracking/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/files.cmake b/Plugins/org.mitk.gui.qt.igttracking/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/files.cmake rename to Plugins/org.mitk.gui.qt.igttracking/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.igttracking/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.igttracking/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/plugin.xml b/Plugins/org.mitk.gui.qt.igttracking/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/plugin.xml rename to Plugins/org.mitk.gui.qt.igttracking/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/resources/iconNavigationDataPlayer.png b/Plugins/org.mitk.gui.qt.igttracking/resources/iconNavigationDataPlayer.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/resources/iconNavigationDataPlayer.png rename to Plugins/org.mitk.gui.qt.igttracking/resources/iconNavigationDataPlayer.png diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/resources/iconNavigationToolManager.xpm b/Plugins/org.mitk.gui.qt.igttracking/resources/iconNavigationToolManager.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/resources/iconNavigationToolManager.xpm rename to Plugins/org.mitk.gui.qt.igttracking/resources/iconNavigationToolManager.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/resources/iconTrackingToolBox.xpm b/Plugins/org.mitk.gui.qt.igttracking/resources/iconTrackingToolBox.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/resources/iconTrackingToolBox.xpm rename to Plugins/org.mitk.gui.qt.igttracking/resources/iconTrackingToolBox.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTNavigationToolManagerView.cpp b/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTNavigationToolManagerView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTNavigationToolManagerView.cpp rename to Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTNavigationToolManagerView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTNavigationToolManagerView.h b/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTNavigationToolManagerView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTNavigationToolManagerView.h rename to Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTNavigationToolManagerView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTNavigationToolManagerViewControls.ui b/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTNavigationToolManagerViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTNavigationToolManagerViewControls.ui rename to Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTNavigationToolManagerViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp b/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp rename to Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.h b/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.h rename to Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui b/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui rename to Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.cpp b/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.cpp rename to Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.h b/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.h rename to Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerViewControls.ui b/Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerViewControls.ui rename to Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkNavigationDataPlayerViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.igttracking/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.igttracking/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.igttracking/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.igttracking/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.igttracking/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/CMakeLists.txt b/Plugins/org.mitk.gui.qt.imagecropper/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.imagecropper/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/documentation/UserManual/QmitkImageCropperUserManual.dox b/Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/QmitkImageCropperUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/documentation/UserManual/QmitkImageCropperUserManual.dox rename to Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/QmitkImageCropperUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/documentation/UserManual/icon.png b/Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/icon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/documentation/UserManual/icon.png rename to Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/icon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/documentation/UserManual/icon.xpm b/Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/icon.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/documentation/UserManual/icon.xpm rename to Plugins/org.mitk.gui.qt.imagecropper/documentation/UserManual/icon.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.imagecropper/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.imagecropper/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/files.cmake b/Plugins/org.mitk.gui.qt.imagecropper/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/files.cmake rename to Plugins/org.mitk.gui.qt.imagecropper/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.imagecropper/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.imagecropper/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/plugin.xml b/Plugins/org.mitk.gui.qt.imagecropper/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/plugin.xml rename to Plugins/org.mitk.gui.qt.imagecropper/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/resources/btn_ctrl.xpm b/Plugins/org.mitk.gui.qt.imagecropper/resources/btn_ctrl.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/resources/btn_ctrl.xpm rename to Plugins/org.mitk.gui.qt.imagecropper/resources/btn_ctrl.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/resources/icon.xpm b/Plugins/org.mitk.gui.qt.imagecropper/resources/icon.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/resources/icon.xpm rename to Plugins/org.mitk.gui.qt.imagecropper/resources/icon.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/resources/imagecropper.qrc b/Plugins/org.mitk.gui.qt.imagecropper/resources/imagecropper.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/resources/imagecropper.qrc rename to Plugins/org.mitk.gui.qt.imagecropper/resources/imagecropper.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/resources/mouse_left.xpm b/Plugins/org.mitk.gui.qt.imagecropper/resources/mouse_left.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/resources/mouse_left.xpm rename to Plugins/org.mitk.gui.qt.imagecropper/resources/mouse_left.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/resources/mouse_middle.xpm b/Plugins/org.mitk.gui.qt.imagecropper/resources/mouse_middle.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/resources/mouse_middle.xpm rename to Plugins/org.mitk.gui.qt.imagecropper/resources/mouse_middle.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/resources/mouse_right.xpm b/Plugins/org.mitk.gui.qt.imagecropper/resources/mouse_right.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/resources/mouse_right.xpm rename to Plugins/org.mitk.gui.qt.imagecropper/resources/mouse_right.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropper.cpp b/Plugins/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropper.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropper.cpp rename to Plugins/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropper.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropper.h b/Plugins/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropper.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropper.h rename to Plugins/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropper.h diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropperControls.ui b/Plugins/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropperControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropperControls.ui rename to Plugins/org.mitk.gui.qt.imagecropper/src/internal/QmitkImageCropperControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperEventInterface.cpp b/Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperEventInterface.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperEventInterface.cpp rename to Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperEventInterface.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperEventInterface.h b/Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperEventInterface.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperEventInterface.h rename to Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperEventInterface.h diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.cpp b/Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.h b/Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.h rename to Plugins/org.mitk.gui.qt.imagecropper/src/internal/mitkImageCropperPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/CMakeLists.txt b/Plugins/org.mitk.gui.qt.imagenavigator/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.imagenavigator/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/documentation/UserManual/ImageNavigator.png b/Plugins/org.mitk.gui.qt.imagenavigator/documentation/UserManual/ImageNavigator.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/documentation/UserManual/ImageNavigator.png rename to Plugins/org.mitk.gui.qt.imagenavigator/documentation/UserManual/ImageNavigator.png diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/documentation/UserManual/QmtikImageNavigator.dox b/Plugins/org.mitk.gui.qt.imagenavigator/documentation/UserManual/QmtikImageNavigator.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/documentation/UserManual/QmtikImageNavigator.dox rename to Plugins/org.mitk.gui.qt.imagenavigator/documentation/UserManual/QmtikImageNavigator.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/documentation/UserManual/Slider.png b/Plugins/org.mitk.gui.qt.imagenavigator/documentation/UserManual/Slider.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/documentation/UserManual/Slider.png rename to Plugins/org.mitk.gui.qt.imagenavigator/documentation/UserManual/Slider.png diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.imagenavigator/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.imagenavigator/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/files.cmake b/Plugins/org.mitk.gui.qt.imagenavigator/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/files.cmake rename to Plugins/org.mitk.gui.qt.imagenavigator/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.imagenavigator/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.imagenavigator/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/plugin.xml b/Plugins/org.mitk.gui.qt.imagenavigator/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/plugin.xml rename to Plugins/org.mitk.gui.qt.imagenavigator/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/resources/ImageNavigation_48.png b/Plugins/org.mitk.gui.qt.imagenavigator/resources/ImageNavigation_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/resources/ImageNavigation_48.png rename to Plugins/org.mitk.gui.qt.imagenavigator/resources/ImageNavigation_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/resources/QmitkImageNavigatorView.qrc b/Plugins/org.mitk.gui.qt.imagenavigator/resources/QmitkImageNavigatorView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/resources/QmitkImageNavigatorView.qrc rename to Plugins/org.mitk.gui.qt.imagenavigator/resources/QmitkImageNavigatorView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/resources/Slider.png b/Plugins/org.mitk.gui.qt.imagenavigator/resources/Slider.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/resources/Slider.png rename to Plugins/org.mitk.gui.qt.imagenavigator/resources/Slider.png diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/resources/Slider_48.png b/Plugins/org.mitk.gui.qt.imagenavigator/resources/Slider_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/resources/Slider_48.png rename to Plugins/org.mitk.gui.qt.imagenavigator/resources/Slider_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.cpp b/Plugins/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.cpp rename to Plugins/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.h b/Plugins/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.h rename to Plugins/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorViewControls.ui b/Plugins/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorViewControls.ui rename to Plugins/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/mitkImageNavigatorPluginActivator.cpp b/Plugins/org.mitk.gui.qt.imagenavigator/src/internal/mitkImageNavigatorPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/mitkImageNavigatorPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.imagenavigator/src/internal/mitkImageNavigatorPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/mitkImageNavigatorPluginActivator.h b/Plugins/org.mitk.gui.qt.imagenavigator/src/internal/mitkImageNavigatorPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/mitkImageNavigatorPluginActivator.h rename to Plugins/org.mitk.gui.qt.imagenavigator/src/internal/mitkImageNavigatorPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/CMakeLists.txt b/Plugins/org.mitk.gui.qt.materialeditor/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.materialeditor/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/documentation/UserManual/QmitkSurfaceMaterialEditor.dox b/Plugins/org.mitk.gui.qt.materialeditor/documentation/UserManual/QmitkSurfaceMaterialEditor.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/documentation/UserManual/QmitkSurfaceMaterialEditor.dox rename to Plugins/org.mitk.gui.qt.materialeditor/documentation/UserManual/QmitkSurfaceMaterialEditor.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/documentation/UserManual/QmitkSurfaceMaterialEditorGui.png b/Plugins/org.mitk.gui.qt.materialeditor/documentation/UserManual/QmitkSurfaceMaterialEditorGui.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/documentation/UserManual/QmitkSurfaceMaterialEditorGui.png rename to Plugins/org.mitk.gui.qt.materialeditor/documentation/UserManual/QmitkSurfaceMaterialEditorGui.png diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/documentation/UserManual/SurfaceMaterialEditorIcon.png b/Plugins/org.mitk.gui.qt.materialeditor/documentation/UserManual/SurfaceMaterialEditorIcon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/documentation/UserManual/SurfaceMaterialEditorIcon.png rename to Plugins/org.mitk.gui.qt.materialeditor/documentation/UserManual/SurfaceMaterialEditorIcon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.materialeditor/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.materialeditor/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/files.cmake b/Plugins/org.mitk.gui.qt.materialeditor/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/files.cmake rename to Plugins/org.mitk.gui.qt.materialeditor/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.materialeditor/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.materialeditor/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/plugin.xml b/Plugins/org.mitk.gui.qt.materialeditor/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/plugin.xml rename to Plugins/org.mitk.gui.qt.materialeditor/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/resources/QmitkMITKSurfaceMaterialEditorView.qrc b/Plugins/org.mitk.gui.qt.materialeditor/resources/QmitkMITKSurfaceMaterialEditorView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/resources/QmitkMITKSurfaceMaterialEditorView.qrc rename to Plugins/org.mitk.gui.qt.materialeditor/resources/QmitkMITKSurfaceMaterialEditorView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/resources/SurfaceMaterialEditor.png b/Plugins/org.mitk.gui.qt.materialeditor/resources/SurfaceMaterialEditor.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/resources/SurfaceMaterialEditor.png rename to Plugins/org.mitk.gui.qt.materialeditor/resources/SurfaceMaterialEditor.png diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorView.cpp b/Plugins/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorView.cpp rename to Plugins/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorView.h b/Plugins/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorView.h rename to Plugins/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorViewControls.ui b/Plugins/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorViewControls.ui rename to Plugins/org.mitk.gui.qt.materialeditor/src/internal/QmitkMITKSurfaceMaterialEditorViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/mitkMaterialEditorPluginActivator.cpp b/Plugins/org.mitk.gui.qt.materialeditor/src/internal/mitkMaterialEditorPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/mitkMaterialEditorPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.materialeditor/src/internal/mitkMaterialEditorPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/mitkMaterialEditorPluginActivator.h b/Plugins/org.mitk.gui.qt.materialeditor/src/internal/mitkMaterialEditorPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.materialeditor/src/internal/mitkMaterialEditorPluginActivator.h rename to Plugins/org.mitk.gui.qt.materialeditor/src/internal/mitkMaterialEditorPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/CMakeLists.txt b/Plugins/org.mitk.gui.qt.measurementtoolbox/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.measurementtoolbox/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/BasicScreen.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/BasicScreen.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/BasicScreen.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/BasicScreen.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Basic_Screen_edited.jpg b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Basic_Screen_edited.jpg similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Basic_Screen_edited.jpg rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Basic_Screen_edited.jpg diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Basic_Screen_edited.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Basic_Screen_edited.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Basic_Screen_edited.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Basic_Screen_edited.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/ImageStatistic_48.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/ImageStatistic_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/ImageStatistic_48.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/ImageStatistic_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Image_Loaded_Screen.jpg b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Image_Loaded_Screen.jpg similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Image_Loaded_Screen.jpg rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Image_Loaded_Screen.jpg diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Image_processed.jpg b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Image_processed.jpg similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Image_processed.jpg rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Image_processed.jpg diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Image_processed_Screen.jpg b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Image_processed_Screen.jpg similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Image_processed_Screen.jpg rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Image_processed_Screen.jpg diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementFigureButtonline.jpg b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementFigureButtonline.jpg similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementFigureButtonline.jpg rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementFigureButtonline.jpg diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementFigureButtonline.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementFigureButtonline.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementFigureButtonline.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementFigureButtonline.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementGUI.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementGUI.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementGUI.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementGUI.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementIcon.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementIcon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementIcon.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/MeasurementIcon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Measurement_48.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Measurement_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Measurement_48.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Measurement_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Measurement_View.jpg b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Measurement_View.jpg similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Measurement_View.jpg rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Measurement_View.jpg diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/OpenButton.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/OpenButton.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/OpenButton.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/OpenButton.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkImageStatistics.dox b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkImageStatistics.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkImageStatistics.dox rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkImageStatistics.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkMeasurement.dox b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkMeasurement.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkMeasurement.dox rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkMeasurement.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkMeasurementToolbox.dox b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkMeasurementToolbox.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkMeasurementToolbox.dox rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkMeasurementToolbox.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Screenshot1.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Screenshot1.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Screenshot1.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Screenshot1.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Workflow.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Workflow.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Workflow.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/Workflow.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/doxygen.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/doxygen.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/doxygen.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/doxygen.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/files.cmake b/Plugins/org.mitk.gui.qt.measurementtoolbox/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/files.cmake rename to Plugins/org.mitk.gui.qt.measurementtoolbox/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.measurementtoolbox/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.measurementtoolbox/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/plugin.xml b/Plugins/org.mitk.gui.qt.measurementtoolbox/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/plugin.xml rename to Plugins/org.mitk.gui.qt.measurementtoolbox/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/ImageStatistic_24.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/ImageStatistic_24.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/ImageStatistic_24.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/ImageStatistic_24.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/ImageStatistic_48.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/ImageStatistic_48.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/ImageStatistic_48.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/ImageStatistic_48.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/ImageStatistic_64.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/ImageStatistic_64.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/ImageStatistic_64.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/ImageStatistic_64.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/QmitkImageStatisticsView.qrc b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/QmitkImageStatisticsView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/QmitkImageStatisticsView.qrc rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/QmitkImageStatisticsView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/angle.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/angle.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/angle.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/angle.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/arrow.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/arrow.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/arrow.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/arrow.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/circle.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/circle.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/circle.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/circle.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/four-point-angle.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/four-point-angle.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/four-point-angle.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/four-point-angle.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/lena.xpm b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/lena.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/lena.xpm rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/lena.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/line.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/line.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/line.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/line.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/measurement.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/measurement.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/measurement.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/measurement.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/measurement.qrc b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/measurement.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/measurement.qrc rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/measurement.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/path.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/path.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/path.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/path.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/polygon.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/polygon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/polygon.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/polygon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/rectangle.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/rectangle.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/rectangle.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/rectangle.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/stats.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/stats.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/stats.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/stats.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/text.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/resources/text.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/resources/text.png rename to Plugins/org.mitk.gui.qt.measurementtoolbox/resources/text.png diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp rename to Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h rename to Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui rename to Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementControls.ui b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementControls.ui rename to Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementView.cpp b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementView.cpp rename to Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementView.h b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementView.h rename to Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkMeasurementView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkPlanarFiguresTableModel.cpp b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkPlanarFiguresTableModel.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkPlanarFiguresTableModel.cpp rename to Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkPlanarFiguresTableModel.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkPlanarFiguresTableModel.h b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkPlanarFiguresTableModel.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkPlanarFiguresTableModel.h rename to Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkPlanarFiguresTableModel.h diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.measurementtoolbox/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/CMakeLists.txt b/Plugins/org.mitk.gui.qt.moviemaker/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.moviemaker/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMakerControlArea.png b/Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMakerControlArea.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMakerControlArea.png rename to Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMakerControlArea.png diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMakerUserManual.dox b/Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMakerUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMakerUserManual.dox rename to Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/QmitkMovieMakerUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/documentation/UserManual/icon.png b/Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/icon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/documentation/UserManual/icon.png rename to Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/icon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/documentation/UserManual/icon.xpm b/Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/icon.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/documentation/UserManual/icon.xpm rename to Plugins/org.mitk.gui.qt.moviemaker/documentation/UserManual/icon.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.moviemaker/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.moviemaker/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/files.cmake b/Plugins/org.mitk.gui.qt.moviemaker/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/files.cmake rename to Plugins/org.mitk.gui.qt.moviemaker/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.moviemaker/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.moviemaker/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/plugin.xml b/Plugins/org.mitk.gui.qt.moviemaker/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/plugin.xml rename to Plugins/org.mitk.gui.qt.moviemaker/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMaker.qrc b/Plugins/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMaker.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMaker.qrc rename to Plugins/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMaker.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMakerClasses.png b/Plugins/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMakerClasses.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMakerClasses.png rename to Plugins/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMakerClasses.png diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMakerGUI.png b/Plugins/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMakerGUI.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMakerGUI.png rename to Plugins/org.mitk.gui.qt.moviemaker/resources/QmitkMovieMakerGUI.png diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/icon.xpm b/Plugins/org.mitk.gui.qt.moviemaker/resources/icon.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/icon.xpm rename to Plugins/org.mitk.gui.qt.moviemaker/resources/icon.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/pause.xpm b/Plugins/org.mitk.gui.qt.moviemaker/resources/pause.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/pause.xpm rename to Plugins/org.mitk.gui.qt.moviemaker/resources/pause.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/play.xpm b/Plugins/org.mitk.gui.qt.moviemaker/resources/play.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/play.xpm rename to Plugins/org.mitk.gui.qt.moviemaker/resources/play.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/screenshot_maker.png b/Plugins/org.mitk.gui.qt.moviemaker/resources/screenshot_maker.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/screenshot_maker.png rename to Plugins/org.mitk.gui.qt.moviemaker/resources/screenshot_maker.png diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/stop.xpm b/Plugins/org.mitk.gui.qt.moviemaker/resources/stop.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/resources/stop.xpm rename to Plugins/org.mitk.gui.qt.moviemaker/resources/stop.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMaker.cpp b/Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMaker.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMaker.cpp rename to Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMaker.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMaker.h b/Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMaker.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMaker.h rename to Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMaker.h diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerControls.ui b/Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerControls.ui rename to Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkMovieMakerControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMaker.cpp b/Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMaker.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMaker.cpp rename to Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMaker.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMaker.h b/Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMaker.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMaker.h rename to Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMaker.h diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMakerControls.ui b/Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMakerControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMakerControls.ui rename to Plugins/org.mitk.gui.qt.moviemaker/src/internal/QmitkScreenshotMakerControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/mitkMovieMakerPluginActivator.cpp b/Plugins/org.mitk.gui.qt.moviemaker/src/internal/mitkMovieMakerPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/mitkMovieMakerPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.moviemaker/src/internal/mitkMovieMakerPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/mitkMovieMakerPluginActivator.h b/Plugins/org.mitk.gui.qt.moviemaker/src/internal/mitkMovieMakerPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.moviemaker/src/internal/mitkMovieMakerPluginActivator.h rename to Plugins/org.mitk.gui.qt.moviemaker/src/internal/mitkMovieMakerPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/CMakeLists.txt b/Plugins/org.mitk.gui.qt.pointsetinteraction/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.pointsetinteraction/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/AddPointSet.png b/Plugins/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/AddPointSet.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/AddPointSet.png rename to Plugins/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/AddPointSet.png diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/CurrentPointSetArea.png b/Plugins/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/CurrentPointSetArea.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/CurrentPointSetArea.png rename to Plugins/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/CurrentPointSetArea.png diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/QmitkPointSetInteraction.png b/Plugins/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/QmitkPointSetInteraction.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/QmitkPointSetInteraction.png rename to Plugins/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/QmitkPointSetInteraction.png diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/QmitkPointSetInteractionUserManual.dox b/Plugins/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/QmitkPointSetInteractionUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/QmitkPointSetInteractionUserManual.dox rename to Plugins/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/QmitkPointSetInteractionUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/pointset_interaction.png b/Plugins/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/pointset_interaction.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/pointset_interaction.png rename to Plugins/org.mitk.gui.qt.pointsetinteraction/documentation/UserManual/pointset_interaction.png diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.pointsetinteraction/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.pointsetinteraction/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/files.cmake b/Plugins/org.mitk.gui.qt.pointsetinteraction/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/files.cmake rename to Plugins/org.mitk.gui.qt.pointsetinteraction/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.pointsetinteraction/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.pointsetinteraction/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/plugin.xml b/Plugins/org.mitk.gui.qt.pointsetinteraction/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/plugin.xml rename to Plugins/org.mitk.gui.qt.pointsetinteraction/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/resources/QmitkPointSetInteractionView.qrc b/Plugins/org.mitk.gui.qt.pointsetinteraction/resources/QmitkPointSetInteractionView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/resources/QmitkPointSetInteractionView.qrc rename to Plugins/org.mitk.gui.qt.pointsetinteraction/resources/QmitkPointSetInteractionView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/resources/pointset_interaction.png b/Plugins/org.mitk.gui.qt.pointsetinteraction/resources/pointset_interaction.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/resources/pointset_interaction.png rename to Plugins/org.mitk.gui.qt.pointsetinteraction/resources/pointset_interaction.png diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cmake b/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cmake rename to Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cpp b/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cpp rename to Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.h b/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.h rename to Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionViewControls.ui b/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionViewControls.ui rename to Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/QmitkPointSetInteractionViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.pointsetinteraction/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.pointsetinteraction/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/CMakeLists.txt b/Plugins/org.mitk.gui.qt.python.console/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.python.console/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.python.console/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.python.console/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/files.cmake b/Plugins/org.mitk.gui.qt.python.console/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/files.cmake rename to Plugins/org.mitk.gui.qt.python.console/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.python.console/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.python.console/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/mitkPythonPath.h.in b/Plugins/org.mitk.gui.qt.python.console/mitkPythonPath.h.in similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/mitkPythonPath.h.in rename to Plugins/org.mitk.gui.qt.python.console/mitkPythonPath.h.in diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/plugin.xml b/Plugins/org.mitk.gui.qt.python.console/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/plugin.xml rename to Plugins/org.mitk.gui.qt.python.console/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/resources/QmitkPythonConsoleView.qrc b/Plugins/org.mitk.gui.qt.python.console/resources/QmitkPythonConsoleView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/resources/QmitkPythonConsoleView.qrc rename to Plugins/org.mitk.gui.qt.python.console/resources/QmitkPythonConsoleView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/resources/icon.xpm b/Plugins/org.mitk.gui.qt.python.console/resources/icon.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/resources/icon.xpm rename to Plugins/org.mitk.gui.qt.python.console/resources/icon.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/resources/py.png b/Plugins/org.mitk.gui.qt.python.console/resources/py.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/resources/py.png rename to Plugins/org.mitk.gui.qt.python.console/resources/py.png diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkCTKPythonShell.cpp b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkCTKPythonShell.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkCTKPythonShell.cpp rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkCTKPythonShell.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkCTKPythonShell.h b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkCTKPythonShell.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkCTKPythonShell.h rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkCTKPythonShell.h diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistory.cpp b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistory.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistory.cpp rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistory.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistory.h b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistory.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistory.h rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistory.h diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistoryTreeWidget.cpp b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistoryTreeWidget.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistoryTreeWidget.cpp rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistoryTreeWidget.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistoryTreeWidget.h b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistoryTreeWidget.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistoryTreeWidget.h rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistoryTreeWidget.h diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonConsoleView.cpp b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonConsoleView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonConsoleView.cpp rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonConsoleView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonConsoleView.h b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonConsoleView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonConsoleView.h rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonConsoleView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonConsoleViewControls.ui b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonConsoleViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonConsoleViewControls.ui rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonConsoleViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonEditor.cpp b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonEditor.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonEditor.cpp rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonEditor.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonEditor.h b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonEditor.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonEditor.h rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonEditor.h diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonEditor.ui b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonEditor.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonEditor.ui rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonEditor.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonMediator.cpp b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonMediator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonMediator.cpp rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonMediator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonMediator.h b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonMediator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonMediator.h rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonMediator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonPerspective.cpp b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonPerspective.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonPerspective.cpp rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonPerspective.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonPerspective.h b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonPerspective.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonPerspective.h rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonPerspective.h diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditor.cpp b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditor.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditor.cpp rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditor.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditor.h b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditor.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditor.h rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditor.h diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditorHighlighter.cpp b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditorHighlighter.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditorHighlighter.cpp rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditorHighlighter.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditorHighlighter.h b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditorHighlighter.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditorHighlighter.h rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonScriptEditorHighlighter.h diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonSnippets.cpp b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonSnippets.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonSnippets.cpp rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonSnippets.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonSnippets.h b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonSnippets.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonSnippets.h rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonSnippets.h diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonSnippets.ui b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonSnippets.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonSnippets.ui rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonSnippets.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonTextEditor.cpp b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonTextEditor.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonTextEditor.cpp rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonTextEditor.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonTextEditor.h b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonTextEditor.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonTextEditor.h rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonTextEditor.h diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStack.cpp b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStack.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStack.cpp rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStack.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStack.h b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStack.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStack.h rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStack.h diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStack.ui b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStack.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStack.ui rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStack.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStackTreeWidget.cpp b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStackTreeWidget.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStackTreeWidget.cpp rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStackTreeWidget.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStackTreeWidget.h b/Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStackTreeWidget.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStackTreeWidget.h rename to Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonVariableStackTreeWidget.h diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.python.console/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.python.console/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.python.console/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.python.console/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.python.console/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/CMakeLists.txt b/Plugins/org.mitk.gui.qt.registration/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.registration/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/DisplayOptionsPointBased.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/DisplayOptionsPointBased.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/DisplayOptionsPointBased.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/DisplayOptionsPointBased.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/FixedDataPointBased.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/FixedDataPointBased.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/FixedDataPointBased.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/FixedDataPointBased.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/ImageArea.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/ImageArea.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/ImageArea.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/ImageArea.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/ImageSelectionDeformable.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/ImageSelectionDeformable.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/ImageSelectionDeformable.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/ImageSelectionDeformable.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/ManualRegistrationArea.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/ManualRegistrationArea.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/ManualRegistrationArea.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/ManualRegistrationArea.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/MovingDataPointBased.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/MovingDataPointBased.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/MovingDataPointBased.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/MovingDataPointBased.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/PointBasedRegistration.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/PointBasedRegistration.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/PointBasedRegistration.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/PointBasedRegistration.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/PointBasedRegistration.xpm b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/PointBasedRegistration.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/PointBasedRegistration.xpm rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/PointBasedRegistration.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/PointBasedRegistration_small.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/PointBasedRegistration_small.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/PointBasedRegistration_small.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/PointBasedRegistration_small.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/QmitkDeformableRegistration.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/QmitkDeformableRegistration.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/QmitkDeformableRegistration.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/QmitkDeformableRegistration.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/QmitkDeformableRegistrationUserManual.dox b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/QmitkDeformableRegistrationUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/QmitkDeformableRegistrationUserManual.dox rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/QmitkDeformableRegistrationUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/QmitkDeformableRegistration_small.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/QmitkDeformableRegistration_small.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/QmitkDeformableRegistration_small.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/QmitkDeformableRegistration_small.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/QmitkPointBasedRegistration.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/QmitkPointBasedRegistration.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/QmitkPointBasedRegistration.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/QmitkPointBasedRegistration.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/QmitkPointBasedRegistrationUserManual.dox b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/QmitkPointBasedRegistrationUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/QmitkPointBasedRegistrationUserManual.dox rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/QmitkPointBasedRegistrationUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/QmitkRigidRegistrationUserManual.dox b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/QmitkRigidRegistrationUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/QmitkRigidRegistrationUserManual.dox rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/QmitkRigidRegistrationUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationArea.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationArea.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationArea.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationArea.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationDeformable.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationDeformable.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationDeformable.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationDeformable.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationModuleOverview.dox b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationModuleOverview.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationModuleOverview.dox rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationModuleOverview.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationPointBased.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationPointBased.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationPointBased.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/RegistrationPointBased.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/RigidRegistration.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/RigidRegistration.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/RigidRegistration.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/RigidRegistration.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/RigidRegistration.xpm b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/RigidRegistration.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/RigidRegistration.xpm rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/RigidRegistration.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/RigidRegistration_small.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/RigidRegistration_small.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/RigidRegistration_small.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/RigidRegistration_small.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/Tab2.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/Tab2.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/Tab2.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/Tab2.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/pointBasedIcon.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/pointBasedIcon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/pointBasedIcon.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/pointBasedIcon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/rigidRegistrationIcon.png b/Plugins/org.mitk.gui.qt.registration/documentation/UserManual/rigidRegistrationIcon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/documentation/UserManual/rigidRegistrationIcon.png rename to Plugins/org.mitk.gui.qt.registration/documentation/UserManual/rigidRegistrationIcon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/files.cmake b/Plugins/org.mitk.gui.qt.registration/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/files.cmake rename to Plugins/org.mitk.gui.qt.registration/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.registration/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.registration/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/plugin.xml b/Plugins/org.mitk.gui.qt.registration/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/plugin.xml rename to Plugins/org.mitk.gui.qt.registration/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/resources/DeformableRegistration.xpm b/Plugins/org.mitk.gui.qt.registration/resources/DeformableRegistration.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/resources/DeformableRegistration.xpm rename to Plugins/org.mitk.gui.qt.registration/resources/DeformableRegistration.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/resources/PointBasedRegistration.xpm b/Plugins/org.mitk.gui.qt.registration/resources/PointBasedRegistration.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/resources/PointBasedRegistration.xpm rename to Plugins/org.mitk.gui.qt.registration/resources/PointBasedRegistration.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/resources/QmitkDeformableRegistrationView.qrc b/Plugins/org.mitk.gui.qt.registration/resources/QmitkDeformableRegistrationView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/resources/QmitkDeformableRegistrationView.qrc rename to Plugins/org.mitk.gui.qt.registration/resources/QmitkDeformableRegistrationView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/resources/QmitkPointBasedRegistrationView.qrc b/Plugins/org.mitk.gui.qt.registration/resources/QmitkPointBasedRegistrationView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/resources/QmitkPointBasedRegistrationView.qrc rename to Plugins/org.mitk.gui.qt.registration/resources/QmitkPointBasedRegistrationView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/resources/QmitkRigidRegistrationView.qrc b/Plugins/org.mitk.gui.qt.registration/resources/QmitkRigidRegistrationView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/resources/QmitkRigidRegistrationView.qrc rename to Plugins/org.mitk.gui.qt.registration/resources/QmitkRigidRegistrationView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/resources/RigidRegistration.xpm b/Plugins/org.mitk.gui.qt.registration/resources/RigidRegistration.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/resources/RigidRegistration.xpm rename to Plugins/org.mitk.gui.qt.registration/resources/RigidRegistration.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/resources/btnReinit.xpm b/Plugins/org.mitk.gui.qt.registration/resources/btnReinit.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/resources/btnReinit.xpm rename to Plugins/org.mitk.gui.qt.registration/resources/btnReinit.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkDeformableRegistrationView.cpp b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkDeformableRegistrationView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkDeformableRegistrationView.cpp rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkDeformableRegistrationView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkDeformableRegistrationView.h b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkDeformableRegistrationView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkDeformableRegistrationView.h rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkDeformableRegistrationView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkDeformableRegistrationViewControls.ui b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkDeformableRegistrationViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkDeformableRegistrationViewControls.ui rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkDeformableRegistrationViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkLoadPresetDialog.cpp b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkLoadPresetDialog.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkLoadPresetDialog.cpp rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkLoadPresetDialog.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkLoadPresetDialog.h b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkLoadPresetDialog.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkLoadPresetDialog.h rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkLoadPresetDialog.h diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationTesting.cpp b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationTesting.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationTesting.cpp rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationTesting.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationView.cpp b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationView.cpp rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationView.h b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationView.h rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationViewControls.ui b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationViewControls.ui rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkPointBasedRegistrationViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationSelector.ui b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationSelector.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationSelector.ui rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationSelector.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationSelectorView.cpp b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationSelectorView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationSelectorView.cpp rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationSelectorView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationSelectorView.h b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationSelectorView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationSelectorView.h rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationSelectorView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationView.cpp b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationView.cpp rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationView.h b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationView.h rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationViewControls.ui b/Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationViewControls.ui rename to Plugins/org.mitk.gui.qt.registration/src/internal/QmitkRigidRegistrationViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/mitkLandmarkWarping.cpp b/Plugins/org.mitk.gui.qt.registration/src/internal/mitkLandmarkWarping.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/mitkLandmarkWarping.cpp rename to Plugins/org.mitk.gui.qt.registration/src/internal/mitkLandmarkWarping.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/mitkLandmarkWarping.h b/Plugins/org.mitk.gui.qt.registration/src/internal/mitkLandmarkWarping.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/mitkLandmarkWarping.h rename to Plugins/org.mitk.gui.qt.registration/src/internal/mitkLandmarkWarping.h diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.registration/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.registration/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.registration/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.registration/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.registration/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.registration/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/CMakeLists.txt b/Plugins/org.mitk.gui.qt.segmentation/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.segmentation/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentationTechnical.dox b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentationTechnical.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentationTechnical.dox rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/QmitkSegmentationTechnical.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/ToolExtensionsGeneralOverview.dox b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/ToolExtensionsGeneralOverview.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/ToolExtensionsGeneralOverview.dox rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/ToolExtensionsGeneralOverview.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/interactive_segmentation_classes.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/interactive_segmentation_classes.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/interactive_segmentation_classes.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/interactive_segmentation_classes.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/interactive_segmentation_classes.xcf b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/interactive_segmentation_classes.xcf similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/interactive_segmentation_classes.xcf rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/interactive_segmentation_classes.xcf diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentation.dox b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentation.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentation.dox rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentation.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGDataManagerContextMenu.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGDataManagerContextMenu.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGDataManagerContextMenu.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGDataManagerContextMenu.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGapplication.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGapplication.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGapplication.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGapplication.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGcorrectionActions.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGcorrectionActions.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGcorrectionActions.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGcorrectionActions.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGdatamanagerview.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGdatamanagerview.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGdatamanagerview.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGdatamanagerview.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconAddSubtract.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconAddSubtract.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconAddSubtract.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconAddSubtract.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconCorrection.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconCorrection.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconCorrection.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconCorrection.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconErase.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconErase.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconErase.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconErase.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconFill.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconFill.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconFill.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconFill.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconPaintWipe.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconPaintWipe.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconPaintWipe.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconPaintWipe.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconRegionGrowing.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconRegionGrowing.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconRegionGrowing.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGiconRegionGrowing.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGleakage.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGleakage.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGleakage.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGleakage.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGselection.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGselection.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGselection.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/org_mitk_gui_qt_segmentationIMGselection.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/segmentation.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/segmentation.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/segmentation.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/segmentation.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/segmentationFromSurfaceAfter.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/segmentationFromSurfaceAfter.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/segmentationFromSurfaceAfter.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/segmentationFromSurfaceAfter.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/segmentationFromSurfaceBefore.png b/Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/segmentationFromSurfaceBefore.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/UserManual/segmentationFromSurfaceBefore.png rename to Plugins/org.mitk.gui.qt.segmentation/documentation/UserManual/segmentationFromSurfaceBefore.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/doxygen/SegmentationProperties.dox b/Plugins/org.mitk.gui.qt.segmentation/documentation/doxygen/SegmentationProperties.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/documentation/doxygen/SegmentationProperties.dox rename to Plugins/org.mitk.gui.qt.segmentation/documentation/doxygen/SegmentationProperties.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/files.cmake b/Plugins/org.mitk.gui.qt.segmentation/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/files.cmake rename to Plugins/org.mitk.gui.qt.segmentation/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.segmentation/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.segmentation/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/plugin.xml b/Plugins/org.mitk.gui.qt.segmentation/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/plugin.xml rename to Plugins/org.mitk.gui.qt.segmentation/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/boolean.png b/Plugins/org.mitk.gui.qt.segmentation/resources/boolean.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/boolean.png rename to Plugins/org.mitk.gui.qt.segmentation/resources/boolean.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/boolean.qrc b/Plugins/org.mitk.gui.qt.segmentation/resources/boolean.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/boolean.qrc rename to Plugins/org.mitk.gui.qt.segmentation/resources/boolean.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnDelete.png b/Plugins/org.mitk.gui.qt.segmentation/resources/btnDelete.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnDelete.png rename to Plugins/org.mitk.gui.qt.segmentation/resources/btnDelete.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnDifference.png b/Plugins/org.mitk.gui.qt.segmentation/resources/btnDifference.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnDifference.png rename to Plugins/org.mitk.gui.qt.segmentation/resources/btnDifference.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnIntersection.png b/Plugins/org.mitk.gui.qt.segmentation/resources/btnIntersection.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnIntersection.png rename to Plugins/org.mitk.gui.qt.segmentation/resources/btnIntersection.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnLoad.png b/Plugins/org.mitk.gui.qt.segmentation/resources/btnLoad.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnLoad.png rename to Plugins/org.mitk.gui.qt.segmentation/resources/btnLoad.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnNew.png b/Plugins/org.mitk.gui.qt.segmentation/resources/btnNew.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnNew.png rename to Plugins/org.mitk.gui.qt.segmentation/resources/btnNew.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnReinit.xpm b/Plugins/org.mitk.gui.qt.segmentation/resources/btnReinit.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnReinit.xpm rename to Plugins/org.mitk.gui.qt.segmentation/resources/btnReinit.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnSave.png b/Plugins/org.mitk.gui.qt.segmentation/resources/btnSave.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnSave.png rename to Plugins/org.mitk.gui.qt.segmentation/resources/btnSave.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnUnion.png b/Plugins/org.mitk.gui.qt.segmentation/resources/btnUnion.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/btnUnion.png rename to Plugins/org.mitk.gui.qt.segmentation/resources/btnUnion.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/deformablePlane.png b/Plugins/org.mitk.gui.qt.segmentation/resources/deformablePlane.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/deformablePlane.png rename to Plugins/org.mitk.gui.qt.segmentation/resources/deformablePlane.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/regiongrowing.qrc b/Plugins/org.mitk.gui.qt.segmentation/resources/regiongrowing.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/regiongrowing.qrc rename to Plugins/org.mitk.gui.qt.segmentation/resources/regiongrowing.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/regiongrowing.xpm b/Plugins/org.mitk.gui.qt.segmentation/resources/regiongrowing.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/regiongrowing.xpm rename to Plugins/org.mitk.gui.qt.segmentation/resources/regiongrowing.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/segmentation.png b/Plugins/org.mitk.gui.qt.segmentation/resources/segmentation.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/segmentation.png rename to Plugins/org.mitk.gui.qt.segmentation/resources/segmentation.png diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/resources/segmentation.qrc b/Plugins/org.mitk.gui.qt.segmentation/resources/segmentation.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/resources/segmentation.qrc rename to Plugins/org.mitk.gui.qt.segmentation/resources/segmentation.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.cpp rename to Plugins/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.h b/Plugins/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.h rename to Plugins/org.mitk.gui.qt.segmentation/src/QmitkSegmentationPreferencePage.h diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkAutocropAction.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkAutocropAction.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkAutocropAction.cpp rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkAutocropAction.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkAutocropAction.h b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkAutocropAction.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkAutocropAction.h rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkAutocropAction.h diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkBooleanOperationsView.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkBooleanOperationsView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkBooleanOperationsView.cpp rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkBooleanOperationsView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkBooleanOperationsView.h b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkBooleanOperationsView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkBooleanOperationsView.h rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkBooleanOperationsView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkBooleanOperationsView.ui b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkBooleanOperationsView.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkBooleanOperationsView.ui rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkBooleanOperationsView.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkCreatePolygonModelAction.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkCreatePolygonModelAction.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkCreatePolygonModelAction.cpp rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkCreatePolygonModelAction.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkCreatePolygonModelAction.h b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkCreatePolygonModelAction.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkCreatePolygonModelAction.h rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkCreatePolygonModelAction.h diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.cpp rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.h b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.h rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneViewControls.ui b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneViewControls.ui rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkDeformableClippingPlaneViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationControls.ui b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationControls.ui rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationOrganNamesHandling.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationOrganNamesHandling.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationOrganNamesHandling.cpp rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationOrganNamesHandling.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationPostProcessing.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationPostProcessing.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationPostProcessing.cpp rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationPostProcessing.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationPostProcessing.h b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationPostProcessing.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationPostProcessing.h rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationPostProcessing.h diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.h b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.h rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkStatisticsAction.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkStatisticsAction.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkStatisticsAction.cpp rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkStatisticsAction.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkStatisticsAction.h b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkStatisticsAction.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkStatisticsAction.h rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkStatisticsAction.h diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkThresholdAction.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkThresholdAction.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkThresholdAction.cpp rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkThresholdAction.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkThresholdAction.h b/Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkThresholdAction.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/QmitkThresholdAction.h rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkThresholdAction.h diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.segmentation/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingView.cpp b/Plugins/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingView.cpp rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingView.h b/Plugins/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingView.h rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingViewControls.ui b/Plugins/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingViewControls.ui rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/regiongrowing/QmitkRegionGrowingViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/segmentation.h b/Plugins/org.mitk.gui.qt.segmentation/src/internal/segmentation.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.segmentation/src/internal/segmentation.h rename to Plugins/org.mitk.gui.qt.segmentation/src/internal/segmentation.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/CMakeLists.txt b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/CMakeLists.txt similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/CMakeLists.txt diff --git a/CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/documentation/doxygen/modules.dox similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/documentation/doxygen/modules.dox diff --git a/CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/files.cmake b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/files.cmake similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/files.cmake rename to Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/files.cmake diff --git a/CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/manifest_headers.cmake similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/manifest_headers.cmake diff --git a/CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/plugin.xml b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/plugin.xml similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/plugin.xml rename to Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/plugin.xml diff --git a/CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.cpp b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.cpp rename to Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.h b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.h rename to Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/QmitkStdMultiWidgetEditor.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/QmitkStdMultiWidgetEditorPreferencePage.cpp b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/QmitkStdMultiWidgetEditorPreferencePage.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/QmitkStdMultiWidgetEditorPreferencePage.cpp rename to Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/QmitkStdMultiWidgetEditorPreferencePage.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/QmitkStdMultiWidgetEditorPreferencePage.h b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/QmitkStdMultiWidgetEditorPreferencePage.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/QmitkStdMultiWidgetEditorPreferencePage.h rename to Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/QmitkStdMultiWidgetEditorPreferencePage.h diff --git a/CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/org_mitk_gui_qt_stdmultiwidgeteditor_Activator.cpp b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/org_mitk_gui_qt_stdmultiwidgeteditor_Activator.cpp similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/org_mitk_gui_qt_stdmultiwidgeteditor_Activator.cpp rename to Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/org_mitk_gui_qt_stdmultiwidgeteditor_Activator.cpp diff --git a/CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/org_mitk_gui_qt_stdmultiwidgeteditor_Activator.h b/Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/org_mitk_gui_qt_stdmultiwidgeteditor_Activator.h similarity index 100% rename from CoreUI/Bundles/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/org_mitk_gui_qt_stdmultiwidgeteditor_Activator.h rename to Plugins/org.mitk.gui.qt.stdmultiwidgeteditor/src/internal/org_mitk_gui_qt_stdmultiwidgeteditor_Activator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/CMakeLists.txt b/Plugins/org.mitk.gui.qt.toftutorial/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.toftutorial/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.toftutorial/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/documentation/Manual/Manual.dox b/Plugins/org.mitk.gui.qt.toftutorial/documentation/Manual/Manual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.toftutorial/documentation/Manual/Manual.dox rename to Plugins/org.mitk.gui.qt.toftutorial/documentation/Manual/Manual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/documentation/Manual/icon.png b/Plugins/org.mitk.gui.qt.toftutorial/documentation/Manual/icon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.toftutorial/documentation/Manual/icon.png rename to Plugins/org.mitk.gui.qt.toftutorial/documentation/Manual/icon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.toftutorial/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.toftutorial/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.toftutorial/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/files.cmake b/Plugins/org.mitk.gui.qt.toftutorial/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.toftutorial/files.cmake rename to Plugins/org.mitk.gui.qt.toftutorial/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.toftutorial/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.toftutorial/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.toftutorial/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/plugin.xml b/Plugins/org.mitk.gui.qt.toftutorial/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.toftutorial/plugin.xml rename to Plugins/org.mitk.gui.qt.toftutorial/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/resources/QmitkToFTutorialView.qrc b/Plugins/org.mitk.gui.qt.toftutorial/resources/QmitkToFTutorialView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.toftutorial/resources/QmitkToFTutorialView.qrc rename to Plugins/org.mitk.gui.qt.toftutorial/resources/QmitkToFTutorialView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/resources/icon.xpm b/Plugins/org.mitk.gui.qt.toftutorial/resources/icon.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.toftutorial/resources/icon.xpm rename to Plugins/org.mitk.gui.qt.toftutorial/resources/icon.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialView.cpp b/Plugins/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialView.cpp rename to Plugins/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialView.h b/Plugins/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialView.h rename to Plugins/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialViewControls.ui b/Plugins/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialViewControls.ui rename to Plugins/org.mitk.gui.qt.toftutorial/src/internal/QmitkToFTutorialViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.toftutorial/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.toftutorial/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.toftutorial/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.toftutorial/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.toftutorial/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/CMakeLists.txt b/Plugins/org.mitk.gui.qt.tofutil/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.tofutil/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.tofutil/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.tofutil/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.tofutil/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.tofutil/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/files.cmake b/Plugins/org.mitk.gui.qt.tofutil/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.tofutil/files.cmake rename to Plugins/org.mitk.gui.qt.tofutil/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.tofutil/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.tofutil/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.tofutil/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/plugin.xml b/Plugins/org.mitk.gui.qt.tofutil/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.tofutil/plugin.xml rename to Plugins/org.mitk.gui.qt.tofutil/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/resources/QmitkToFUtilView.qrc b/Plugins/org.mitk.gui.qt.tofutil/resources/QmitkToFUtilView.qrc similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.tofutil/resources/QmitkToFUtilView.qrc rename to Plugins/org.mitk.gui.qt.tofutil/resources/QmitkToFUtilView.qrc diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/resources/icon.xpm b/Plugins/org.mitk.gui.qt.tofutil/resources/icon.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.tofutil/resources/icon.xpm rename to Plugins/org.mitk.gui.qt.tofutil/resources/icon.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFImageBackground.cpp b/Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFImageBackground.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFImageBackground.cpp rename to Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFImageBackground.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFImageBackground.h b/Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFImageBackground.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFImageBackground.h rename to Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFImageBackground.h diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp b/Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp rename to Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.h b/Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.h rename to Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilViewControls.ui b/Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilViewControls.ui rename to Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.tofutil/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.tofutil/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.tofutil/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.tofutil/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.ugvisualization/CMakeLists.txt b/Plugins/org.mitk.gui.qt.ugvisualization/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ugvisualization/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.ugvisualization/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.ugvisualization/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.ugvisualization/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ugvisualization/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.ugvisualization/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.ugvisualization/files.cmake b/Plugins/org.mitk.gui.qt.ugvisualization/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ugvisualization/files.cmake rename to Plugins/org.mitk.gui.qt.ugvisualization/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.ugvisualization/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.ugvisualization/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ugvisualization/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.ugvisualization/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.ugvisualization/plugin.xml b/Plugins/org.mitk.gui.qt.ugvisualization/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ugvisualization/plugin.xml rename to Plugins/org.mitk.gui.qt.ugvisualization/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.ugvisualization/resources/icon.png b/Plugins/org.mitk.gui.qt.ugvisualization/resources/icon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ugvisualization/resources/icon.png rename to Plugins/org.mitk.gui.qt.ugvisualization/resources/icon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.ugvisualization/src/internal/QmitkUGVisualizationView.cpp b/Plugins/org.mitk.gui.qt.ugvisualization/src/internal/QmitkUGVisualizationView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ugvisualization/src/internal/QmitkUGVisualizationView.cpp rename to Plugins/org.mitk.gui.qt.ugvisualization/src/internal/QmitkUGVisualizationView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.ugvisualization/src/internal/QmitkUGVisualizationView.h b/Plugins/org.mitk.gui.qt.ugvisualization/src/internal/QmitkUGVisualizationView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ugvisualization/src/internal/QmitkUGVisualizationView.h rename to Plugins/org.mitk.gui.qt.ugvisualization/src/internal/QmitkUGVisualizationView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.ugvisualization/src/internal/QmitkUGVisualizationViewControls.ui b/Plugins/org.mitk.gui.qt.ugvisualization/src/internal/QmitkUGVisualizationViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ugvisualization/src/internal/QmitkUGVisualizationViewControls.ui rename to Plugins/org.mitk.gui.qt.ugvisualization/src/internal/QmitkUGVisualizationViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.ugvisualization/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.ugvisualization/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ugvisualization/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.ugvisualization/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.ugvisualization/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.ugvisualization/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.ugvisualization/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.ugvisualization/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/CMakeLists.txt b/Plugins/org.mitk.gui.qt.volumevisualization/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/CMakeLists.txt rename to Plugins/org.mitk.gui.qt.volumevisualization/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/QmitkVolumeVisualizationUserManual.dox b/Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/QmitkVolumeVisualizationUserManual.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/QmitkVolumeVisualizationUserManual.dox rename to Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/QmitkVolumeVisualizationUserManual.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/bell.png b/Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/bell.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/bell.png rename to Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/bell.png diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/checkboxen.png b/Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/checkboxen.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/checkboxen.png rename to Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/checkboxen.png diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/color.png b/Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/color.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/color.png rename to Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/color.png diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/gradient.png b/Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/gradient.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/gradient.png rename to Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/gradient.png diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/icon.png b/Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/icon.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/icon.png rename to Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/icon.png diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/icon.xpm b/Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/icon.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/icon.xpm rename to Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/icon.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/mitkInternalPresets.png b/Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/mitkInternalPresets.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/mitkInternalPresets.png rename to Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/mitkInternalPresets.png diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/opacity.png b/Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/opacity.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/opacity.png rename to Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/opacity.png diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/slider.png b/Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/slider.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/slider.png rename to Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/slider.png diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/threshold.png b/Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/threshold.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/threshold.png rename to Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/threshold.png diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/vroverview.png b/Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/vroverview.png similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/UserManual/vroverview.png rename to Plugins/org.mitk.gui.qt.volumevisualization/documentation/UserManual/vroverview.png diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.volumevisualization/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/documentation/doxygen/modules.dox rename to Plugins/org.mitk.gui.qt.volumevisualization/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/files.cmake b/Plugins/org.mitk.gui.qt.volumevisualization/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/files.cmake rename to Plugins/org.mitk.gui.qt.volumevisualization/files.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/manifest_headers.cmake b/Plugins/org.mitk.gui.qt.volumevisualization/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/manifest_headers.cmake rename to Plugins/org.mitk.gui.qt.volumevisualization/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/plugin.xml b/Plugins/org.mitk.gui.qt.volumevisualization/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/plugin.xml rename to Plugins/org.mitk.gui.qt.volumevisualization/plugin.xml diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/resources/icon.xpm b/Plugins/org.mitk.gui.qt.volumevisualization/resources/icon.xpm similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/resources/icon.xpm rename to Plugins/org.mitk.gui.qt.volumevisualization/resources/icon.xpm diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.cpp b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.cpp rename to Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.h b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.h rename to Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.h diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationViewControls.ui b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationViewControls.ui similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationViewControls.ui rename to Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationViewControls.ui diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.cpp rename to Plugins/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.cpp diff --git a/Modules/Bundles/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.h rename to Plugins/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.h diff --git a/Modules/Bundles/org.mitk.inputdevices.spacenavigator/CMakeLists.txt b/Plugins/org.mitk.inputdevices.spacenavigator/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.spacenavigator/CMakeLists.txt rename to Plugins/org.mitk.inputdevices.spacenavigator/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.inputdevices.spacenavigator/META-INF/MANIFEST.MF b/Plugins/org.mitk.inputdevices.spacenavigator/META-INF/MANIFEST.MF similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.spacenavigator/META-INF/MANIFEST.MF rename to Plugins/org.mitk.inputdevices.spacenavigator/META-INF/MANIFEST.MF diff --git a/Modules/Bundles/org.mitk.inputdevices.spacenavigator/files.cmake b/Plugins/org.mitk.inputdevices.spacenavigator/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.spacenavigator/files.cmake rename to Plugins/org.mitk.inputdevices.spacenavigator/files.cmake diff --git a/Modules/Bundles/org.mitk.inputdevices.spacenavigator/manifest.cpp b/Plugins/org.mitk.inputdevices.spacenavigator/manifest.cpp similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.spacenavigator/manifest.cpp rename to Plugins/org.mitk.inputdevices.spacenavigator/manifest.cpp diff --git a/Modules/Bundles/org.mitk.inputdevices.spacenavigator/plugin.xml b/Plugins/org.mitk.inputdevices.spacenavigator/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.spacenavigator/plugin.xml rename to Plugins/org.mitk.inputdevices.spacenavigator/plugin.xml diff --git a/Modules/Bundles/org.mitk.inputdevices.spacenavigator/src/SpacenavigatorDll.h b/Plugins/org.mitk.inputdevices.spacenavigator/src/SpacenavigatorDll.h similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.spacenavigator/src/SpacenavigatorDll.h rename to Plugins/org.mitk.inputdevices.spacenavigator/src/SpacenavigatorDll.h diff --git a/Modules/Bundles/org.mitk.inputdevices.spacenavigator/src/internal/mitkSpaceNavigatorActivator.cpp b/Plugins/org.mitk.inputdevices.spacenavigator/src/internal/mitkSpaceNavigatorActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.spacenavigator/src/internal/mitkSpaceNavigatorActivator.cpp rename to Plugins/org.mitk.inputdevices.spacenavigator/src/internal/mitkSpaceNavigatorActivator.cpp diff --git a/Modules/Bundles/org.mitk.inputdevices.spacenavigator/src/internal/mitkSpaceNavigatorActivator.h b/Plugins/org.mitk.inputdevices.spacenavigator/src/internal/mitkSpaceNavigatorActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.spacenavigator/src/internal/mitkSpaceNavigatorActivator.h rename to Plugins/org.mitk.inputdevices.spacenavigator/src/internal/mitkSpaceNavigatorActivator.h diff --git a/Modules/Bundles/org.mitk.inputdevices.wiimote/CMakeLists.txt b/Plugins/org.mitk.inputdevices.wiimote/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.wiimote/CMakeLists.txt rename to Plugins/org.mitk.inputdevices.wiimote/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.inputdevices.wiimote/META-INF/MANIFEST.MF b/Plugins/org.mitk.inputdevices.wiimote/META-INF/MANIFEST.MF similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.wiimote/META-INF/MANIFEST.MF rename to Plugins/org.mitk.inputdevices.wiimote/META-INF/MANIFEST.MF diff --git a/Modules/Bundles/org.mitk.inputdevices.wiimote/files.cmake b/Plugins/org.mitk.inputdevices.wiimote/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.wiimote/files.cmake rename to Plugins/org.mitk.inputdevices.wiimote/files.cmake diff --git a/Modules/Bundles/org.mitk.inputdevices.wiimote/manifest.cpp b/Plugins/org.mitk.inputdevices.wiimote/manifest.cpp similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.wiimote/manifest.cpp rename to Plugins/org.mitk.inputdevices.wiimote/manifest.cpp diff --git a/Modules/Bundles/org.mitk.inputdevices.wiimote/plugin.xml b/Plugins/org.mitk.inputdevices.wiimote/plugin.xml similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.wiimote/plugin.xml rename to Plugins/org.mitk.inputdevices.wiimote/plugin.xml diff --git a/Modules/Bundles/org.mitk.inputdevices.wiimote/src/WiimoteDll.h b/Plugins/org.mitk.inputdevices.wiimote/src/WiimoteDll.h similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.wiimote/src/WiimoteDll.h rename to Plugins/org.mitk.inputdevices.wiimote/src/WiimoteDll.h diff --git a/Modules/Bundles/org.mitk.inputdevices.wiimote/src/internal/mitkWiiMoteActivator.cpp b/Plugins/org.mitk.inputdevices.wiimote/src/internal/mitkWiiMoteActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.wiimote/src/internal/mitkWiiMoteActivator.cpp rename to Plugins/org.mitk.inputdevices.wiimote/src/internal/mitkWiiMoteActivator.cpp diff --git a/Modules/Bundles/org.mitk.inputdevices.wiimote/src/internal/mitkWiiMoteActivator.h b/Plugins/org.mitk.inputdevices.wiimote/src/internal/mitkWiiMoteActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.inputdevices.wiimote/src/internal/mitkWiiMoteActivator.h rename to Plugins/org.mitk.inputdevices.wiimote/src/internal/mitkWiiMoteActivator.h diff --git a/Modules/Bundles/org.mitk.planarfigure/CMakeLists.txt b/Plugins/org.mitk.planarfigure/CMakeLists.txt similarity index 100% rename from Modules/Bundles/org.mitk.planarfigure/CMakeLists.txt rename to Plugins/org.mitk.planarfigure/CMakeLists.txt diff --git a/Modules/Bundles/org.mitk.planarfigure/documentation/doxygen/modules.dox b/Plugins/org.mitk.planarfigure/documentation/doxygen/modules.dox similarity index 100% rename from Modules/Bundles/org.mitk.planarfigure/documentation/doxygen/modules.dox rename to Plugins/org.mitk.planarfigure/documentation/doxygen/modules.dox diff --git a/Modules/Bundles/org.mitk.planarfigure/files.cmake b/Plugins/org.mitk.planarfigure/files.cmake similarity index 100% rename from Modules/Bundles/org.mitk.planarfigure/files.cmake rename to Plugins/org.mitk.planarfigure/files.cmake diff --git a/Modules/Bundles/org.mitk.planarfigure/manifest_headers.cmake b/Plugins/org.mitk.planarfigure/manifest_headers.cmake similarity index 100% rename from Modules/Bundles/org.mitk.planarfigure/manifest_headers.cmake rename to Plugins/org.mitk.planarfigure/manifest_headers.cmake diff --git a/Modules/Bundles/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.cpp b/Plugins/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.cpp similarity index 100% rename from Modules/Bundles/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.cpp rename to Plugins/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.cpp diff --git a/Modules/Bundles/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.h b/Plugins/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.h similarity index 100% rename from Modules/Bundles/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.h rename to Plugins/org.mitk.planarfigure/src/internal/mitkPlanarFigureActivator.h