diff --git a/CMake/mitkFunctionCreateModule.cmake b/CMake/mitkFunctionCreateModule.cmake
index 1b09437ca0..a69cad312b 100644
--- a/CMake/mitkFunctionCreateModule.cmake
+++ b/CMake/mitkFunctionCreateModule.cmake
@@ -1,639 +1,654 @@
 ##################################################################
 #
 # mitk_create_module
 #
 #! Creates a module for the automatic module dependency system within MITK.
 #!
 #! Example:
 #!
 #! \code
 #! mitk_create_module(
 #!     DEPENDS PUBLIC MitkCore
 #!     PACKAGE_DEPENDS
 #!       PRIVATE Qt5|Xml+Networking
 #!       PUBLIC  ITK|Watershed
 #!     WARNINGS_AS_ERRORS
 #! \endcode
 #!
 #! The <moduleName> parameter specifies the name of the module which is used
 #! to create a logical target name. The parameter is optional in case the
 #! MITK_MODULE_NAME_DEFAULTS_TO_DIRECTORY_NAME variable evaluates to TRUE. The
 #! module name will then be derived from the directory name in which this
 #! function is called.
 #!
 #! If set, the following variables will be used to validate the module name:
 #!
 #!   MITK_MODULE_NAME_REGEX_MATCH The module name must match this regular expression.
 #!   MITK_MODULE_NAME_REGEX_NOT_MATCH The module name must not match this regular expression.
 #!
 #! If the MITK_MODULE_NAME_PREFIX variable is set, the module name will be prefixed
 #! with its contents.
 #!
 #! A modules source files are specified in a separate CMake file usually
 #! called files.cmake, located in the module root directory. The
 #! mitk_create_module() macro evaluates the following CMake variables
 #! from the files.cmake file:
 #!
 #! - CPP_FILES A list of .cpp files
 #! - H_FILES A list of .h files without a corresponding .cpp file
 #! - TXX_FILES A list of .txx files
 #! - RESOURCE_FILES A list of files (resources) which are embedded into the module
 #! - MOC_H_FILES A list of Qt header files which should be processed by the MOC
 #! - UI_FILES A list of .ui Qt UI files
 #! - QRC_FILES A list of .qrc Qt resource files
 #! - DOX_FILES A list of .dox Doxygen files
 #!
 #! List of variables available after the function is called:
 #! - MODULE_NAME
 #! - MODULE_TARGET
 #! - MODULE_IS_ENABLED
 #! - MODULE_SUBPROJECTS
 #! - ALL_META_DEPENDENCIES
 #!
 #! \sa mitk_create_executable
 #!
 #! Parameters (all optional):
 #!
 #! \param <moduleName> The module name (also used as target name)
 #! \param FILES_CMAKE File name of a CMake file setting source list variables
 #!        (defaults to files.cmake)
 #! \param VERSION Module version number, e.g. "1.2.0"
 #! \param AUTOLOAD_WITH A module target name identifying the module which will
 #!        trigger the automatic loading of this module
 #! \param DEPRECATED_SINCE Marks this modules as deprecated since <arg>
 #! \param DESCRIPTION A description for this module
 #!
 #! Multi-value Parameters (all optional):
 #!
 #! \param SUBPROJECTS List of CDash labels
 #! \param INCLUDE_DIRS Include directories for this module:
 #!        \verbatim
 #! [[PUBLIC|PRIVATE|INTERFACE] <dir1>...]...
 #! \endverbatim
 #!        The default scope for include directories is PUBLIC.
 #! \param DEPENDS List of module dependencies:
 #!        \verbatim
 #! [[PUBLIC|PRIVATE|INTERFACE] <module1>...]...
 #! \endverbatim
 #!        The default scope for module dependencies is PUBLIC.
 #! \param PACKAGE_DEPENDS List of public packages dependencies (e.g. Qt, VTK, etc.).
 #!        Package dependencies have the following syntax:
 #!        \verbatim
 #! [PUBLIC|PRIVATE|INTERFACE] PACKAGE[|COMPONENT1[+COMPONENT2]...]
 #! \endverbatim
 #!        The default scope for package dependencies is PRIVATE.
 #! \param ADDITIONAL_LIBS List of addidtional private libraries linked to this module.
 #!        The folder containing the library will be added to the global list of library search paths.
 #! \param CPP_FILES List of source files for this module. If the list is non-empty,
 #!        the module does not need to provide a files.cmake file or FILES_CMAKE argument.
 #! \param H_FILES List of public header files for this module. It is recommended to use
 #!        a files.cmake file instead.
 #!
 #! Options (optional)
 #!
 #! \param FORCE_STATIC Force building this module as a static library
 #! \param GCC_DEFAULT_VISIBILITY Do not use gcc visibility flags - all
 #!        symbols will be exported
 #! \param NO_INIT Do not create CppMicroServices initialization code
 #! \param NO_FEATURE_INFO Do not create a feature info by calling add_feature_info()
 #! \param WARNINGS_AS_ERRORS Treat compiler warnings as errors
 #
 ##################################################################
 function(mitk_create_module)
 
   set(_macro_params
       VERSION                # module version number, e.g. "1.2.0"
       EXPORT_DEFINE          # export macro name for public symbols of this module (DEPRECATED)
       AUTOLOAD_WITH          # a module target name identifying the module which will trigger the
                              # automatic loading of this module
       FILES_CMAKE            # file name of a CMake file setting source list variables
                              # (defaults to files.cmake)
       DEPRECATED_SINCE       # marks this modules as deprecated
       DESCRIPTION            # a description for this module
      )
 
   set(_macro_multiparams
       SUBPROJECTS            # list of CDash labels
       INCLUDE_DIRS           # include directories: [PUBLIC|PRIVATE|INTERFACE] <list>
       INTERNAL_INCLUDE_DIRS  # include dirs internal to this module (DEPRECATED)
       DEPENDS                # list of modules this module depends on: [PUBLIC|PRIVATE|INTERFACE] <list>
       DEPENDS_INTERNAL       # list of modules this module internally depends on (DEPRECATED)
       PACKAGE_DEPENDS        # list of "packages this module depends on (e.g. Qt, VTK, etc.): [PUBLIC|PRIVATE|INTERFACE] <package-list>
       TARGET_DEPENDS         # list of CMake targets this module should depend on
       ADDITIONAL_LIBS        # list of addidtional private libraries linked to this module.
       CPP_FILES              # list of cpp files
       H_FILES                # list of header files: [PUBLIC|PRIVATE] <list>
      )
 
   set(_macro_options
       FORCE_STATIC           # force building this module as a static library
       HEADERS_ONLY           # this module is a headers-only library
       GCC_DEFAULT_VISIBILITY # do not use gcc visibility flags - all symbols will be exported
       NO_DEFAULT_INCLUDE_DIRS # do not add default include directories like "include" or "."
       NO_INIT                # do not create CppMicroServices initialization code
       NO_FEATURE_INFO        # do not create a feature info by calling add_feature_info()
       WARNINGS_AS_ERRORS     # treat all compiler warnings as errors
       EXECUTABLE             # create an executable; do not use directly, use mitk_create_executable() instead
       C_MODULE               # compile all source files as C sources
       CXX_MODULE             # compile all source files as C++ sources
      )
 
   cmake_parse_arguments(MODULE "${_macro_options}" "${_macro_params}" "${_macro_multiparams}" ${ARGN})
 
   set(MODULE_NAME ${MODULE_UNPARSED_ARGUMENTS})
 
   if(NOT MODULE_NAME)
     if(MITK_MODULE_NAME_DEFAULTS_TO_DIRECTORY_NAME)
       get_filename_component(MODULE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
     else()
       message(SEND_ERROR "The module name must not be empty")
     endif()
   endif()
 
   set(_deprecated_args INTERNAL_INCLUDE_DIRS DEPENDS_INTERNAL EXPORT_DEFINE TARGET_DEPENDS HEADERS_ONLY)
   foreach(_deprecated_arg ${_deprecated_args})
     if(MODULE_${_deprecated_arg})
       message(WARNING "The ${_deprecated_arg} argument is deprecated")
     endif()
   endforeach()
 
   set(_module_type module)
   set(_Module_type Module)
   if(MODULE_EXECUTABLE)
     set(_module_type executable)
     set(_Module_type Executable)
   endif()
 
   if(MITK_MODULE_NAME_REGEX_MATCH)
     if(NOT ${MODULE_NAME} MATCHES ${MITK_MODULE_NAME_REGEX_MATCH})
       message(SEND_ERROR "The ${_module_type} name \"${MODULE_NAME}\" does not match the regular expression \"${MITK_MODULE_NAME_REGEX_MATCH}\".")
     endif()
   endif()
   if(MITK_MODULE_NAME_REGEX_NOT_MATCH)
     if(${MODULE_NAME} MATCHES ${MITK_MODULE_NAME_REGEX_NOT_MATCH})
       message(SEND_ERROR "The ${_module_type} name \"${MODULE_NAME}\" must not match the regular expression \"${MITK_MODULE_NAME_REGEX_NOT_MATCH}\".")
     endif()
   endif()
 
   if(MITK_MODULE_NAME_PREFIX AND NOT MODULE_NAME MATCHES "^${MITK_MODULE_NAME_PREFIX}.*$")
     set(MODULE_NAME "${MITK_MODULE_NAME_PREFIX}${MODULE_NAME}")
   endif()
 
   if(NOT MODULE_FILES_CMAKE)
     set(MODULE_FILES_CMAKE files.cmake)
   endif()
   if(NOT IS_ABSOLUTE ${MODULE_FILES_CMAKE})
     set(MODULE_FILES_CMAKE ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE_FILES_CMAKE})
   endif()
 
   if(MODULE_HEADERS_ONLY)
     set(MODULE_TARGET )
     if(MODULE_AUTOLOAD_WITH)
       message(SEND_ERROR "A headers only module cannot be auto-loaded")
     endif()
   else()
     set(MODULE_TARGET ${MODULE_NAME})
   endif()
 
   if(NOT MODULE_SUBPROJECTS)
     if(MITK_DEFAULT_SUBPROJECTS)
       set(MODULE_SUBPROJECTS ${MITK_DEFAULT_SUBPROJECTS})
     endif()
   endif()
 
   # check if the subprojects exist as targets
   if(MODULE_SUBPROJECTS)
     foreach(subproject ${MODULE_SUBPROJECTS})
       if(NOT TARGET ${subproject})
         message(SEND_ERROR "The subproject ${subproject} does not have a corresponding target")
       endif()
     endforeach()
   endif()
 
   # assume worst case
   set(MODULE_IS_ENABLED 0)
   # first we check if we have an explicit module build list
   if(MITK_MODULES_TO_BUILD)
     list(FIND MITK_MODULES_TO_BUILD ${MODULE_NAME} _MOD_INDEX)
     if(_MOD_INDEX EQUAL -1)
       set(MODULE_IS_EXCLUDED 1)
     endif()
   endif()
 
   if(NOT MODULE_IS_EXCLUDED)
     # first of all we check for the dependencies
     _mitk_parse_package_args(${MODULE_PACKAGE_DEPENDS})
     mitk_check_module_dependencies(MODULES ${MODULE_DEPENDS}
                                    PACKAGES ${PACKAGE_NAMES}
                                    MISSING_DEPENDENCIES_VAR _MISSING_DEP
                                    PACKAGE_DEPENDENCIES_VAR PACKAGE_NAMES)
 
     if(_MISSING_DEP)
       if(MODULE_NO_FEATURE_INFO)
         message("${_Module_type} ${MODULE_NAME} won't be built, missing dependency: ${_MISSING_DEP}")
       endif()
       set(MODULE_IS_ENABLED 0)
     else()
       set(MODULE_IS_ENABLED 1)
       # now check for every package if it is enabled. This overlaps a bit with
       # MITK_CHECK_MODULE ...
       foreach(_package ${PACKAGE_NAMES})
         if((DEFINED MITK_USE_${_package}) AND NOT (MITK_USE_${_package}))
           message("${_Module_type} ${MODULE_NAME} won't be built. Turn on MITK_USE_${_package} if you want to use it.")
           set(MODULE_IS_ENABLED 0)
           break()
         endif()
       endforeach()
 
       if(MODULE_IS_ENABLED)
 
         # clear variables defined in files.cmake
         set(RESOURCE_FILES )
         set(CPP_FILES )
         set(H_FILES )
         set(TXX_FILES )
         set(DOX_FILES )
         set(UI_FILES )
         set(MOC_H_FILES )
         set(QRC_FILES )
 
         # clear other variables
         set(Q${KITNAME}_GENERATED_CPP )
         set(Q${KITNAME}_GENERATED_MOC_CPP )
         set(Q${KITNAME}_GENERATED_QRC_CPP )
         set(Q${KITNAME}_GENERATED_UI_CPP )
 
         # check and set-up auto-loading
         if(MODULE_AUTOLOAD_WITH)
           if(NOT TARGET "${MODULE_AUTOLOAD_WITH}")
             message(SEND_ERROR "The module target \"${MODULE_AUTOLOAD_WITH}\" specified as the auto-loading module for \"${MODULE_NAME}\" does not exist")
           endif()
           set(_module_autoload_meta_target "${MODULE_AUTOLOAD_WITH}-autoload")
           # create a meta-target if it does not already exist
           if(NOT TARGET ${_module_autoload_meta_target})
             add_custom_target(${_module_autoload_meta_target})
           endif()
         endif()
 
         if(NOT MODULE_EXPORT_DEFINE)
           set(MODULE_EXPORT_DEFINE ${MODULE_NAME}_EXPORT)
         endif()
 
         if(MITK_GENERATE_MODULE_DOT)
           message("MODULEDOTNAME ${MODULE_NAME}")
           foreach(dep ${MODULE_DEPENDS})
             message("MODULEDOT \"${MODULE_NAME}\" -> \"${dep}\" ; ")
           endforeach(dep)
         endif(MITK_GENERATE_MODULE_DOT)
 
         # ok, now create the module itself
         if (EXISTS ${MODULE_FILES_CMAKE})
           include(${MODULE_FILES_CMAKE})
         elseif(NOT MODULE_CPP_FILES AND NOT MODULE_HEADERS_ONLY)
           message("WARNING No cmake file found AND no cpp files specified... ")
         endif()
 
         if(MODULE_CPP_FILES)
           list(APPEND CPP_FILES ${MODULE_CPP_FILES})
         endif()
 
+        if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src")
+          # Preprend the "src" directory to the cpp file list
+          set(_cpp_files ${CPP_FILES})
+          set(CPP_FILES )
+          foreach(_cpp_file ${_cpp_files})
+            list(APPEND CPP_FILES "src/${_cpp_file}")
+          endforeach()
+        endif()
+
         if(CPP_FILES)
           set(MODULE_HEADERS_ONLY 0)
           if(MODULE_C_MODULE)
             set_source_files_properties(${CPP_FILES} PROPERTIES LANGUAGE C)
           elseif(MODULE_CXX_MODULE)
             set_source_files_properties(${CPP_FILES} PROPERTIES LANGUAGE CXX)
           endif()
         else()
           set(MODULE_HEADERS_ONLY 1)
         endif()
 
         set(module_c_flags )
         set(module_c_flags_debug )
         set(module_c_flags_release )
         set(module_cxx_flags )
         set(module_cxx_flags_debug )
         set(module_cxx_flags_release )
 
         if(MODULE_GCC_DEFAULT_VISIBILITY)
           set(CMAKE_CXX_VISIBILITY_PRESET default)
           set(CMAKE_VISIBILITY_INLINES_HIDDEN 0)
         else()
           set(CMAKE_CXX_VISIBILITY_PRESET hidden)
           set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
         endif()
 
         if(MODULE_WARNINGS_AS_ERRORS)
           if(MSVC_VERSION)
             mitkFunctionCheckCAndCXXCompilerFlags("/WX" module_c_flags module_cxx_flags)
           else()
             mitkFunctionCheckCAndCXXCompilerFlags(-Werror module_c_flags module_cxx_flags)
 
             # The flag "c++0x-static-nonintegral-init" has been renamed in newer Clang
             # versions to "static-member-init", see
             # http://clang-developers.42468.n3.nabble.com/Wc-0x-static-nonintegral-init-gone-td3999651.html
             #
             # Also, older Clang and seemingly all gcc versions do not warn if unknown
             # "-no-*" flags are used, so CMake will happily append any -Wno-* flag to the
             # command line. This may get confusing if unrelated compiler errors happen and
             # the error output then additionally contains errors about unknown flags (which
             # is not the case if there were no compile errors).
             #
             # So instead of using -Wno-* we use -Wno-error=*, which will be properly rejected by
             # the compiler and if applicable, prints the specific warning as a real warning and
             # not as an error (although -Werror was given).
 
             mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=c++0x-static-nonintegral-init" module_c_flags module_cxx_flags)
             mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=static-member-init" module_c_flags module_cxx_flags)
             mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=unknown-warning" module_c_flags module_cxx_flags)
             mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=gnu" module_c_flags module_cxx_flags)
           endif()
         endif(MODULE_WARNINGS_AS_ERRORS)
 
         if(MODULE_FORCE_STATIC)
           set(_STATIC STATIC)
         else()
           set(_STATIC )
         endif(MODULE_FORCE_STATIC)
 
         # create a meta-target for auto-loaded modules
         add_custom_target(${MODULE_NAME}-autoload)
 
         if(NOT MODULE_HEADERS_ONLY)
           if(NOT MODULE_NO_INIT OR RESOURCE_FILES)
             find_package(CppMicroServices QUIET NO_MODULE REQUIRED)
           endif()
           if(NOT MODULE_NO_INIT)
             usFunctionGenerateModuleInit(CPP_FILES)
           endif()
 
           set(binary_res_files )
           set(source_res_files )
           if(RESOURCE_FILES)
-            set(res_dir Resources)
+            if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/resources")
+              set(res_dir resources)
+            elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Resources")
+              set(res_dir Resources)
+            else()
+              message(SEND_ERROR "Resources specified but ${CMAKE_CURRENT_SOURCE_DIR}/resources directory not found.")
+            endif()
             foreach(res_file ${RESOURCE_FILES})
               if(EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${res_dir}/${res_file})
                 list(APPEND binary_res_files "${res_file}")
               else()
                 list(APPEND source_res_files "${res_file}")
               endif()
             endforeach()
 
             # Add a source level dependencies on resource files
             usFunctionGetResourceSource(TARGET ${MODULE_TARGET} OUT CPP_FILES)
           endif()
         endif()
 
         # Qt 4 case
         if(MITK_USE_Qt4)
           if(UI_FILES)
             qt4_wrap_ui(Q${KITNAME}_GENERATED_UI_CPP ${UI_FILES})
           endif()
           if(MOC_H_FILES)
             qt4_wrap_cpp(Q${KITNAME}_GENERATED_MOC_CPP ${MOC_H_FILES} OPTIONS -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
           endif()
           if(QRC_FILES)
             qt4_add_resources(Q${KITNAME}_GENERATED_QRC_CPP ${QRC_FILES})
           endif()
         endif()
 
         # all the same for Qt 5
         if(MITK_USE_Qt5)
           if(UI_FILES)
             qt5_wrap_ui(Q${KITNAME}_GENERATED_UI_CPP ${UI_FILES})
           endif()
           if(MOC_H_FILES)
             qt5_wrap_cpp(Q${KITNAME}_GENERATED_MOC_CPP ${MOC_H_FILES} OPTIONS -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
           endif()
           if(QRC_FILES)
             qt5_add_resources(Q${KITNAME}_GENERATED_QRC_CPP ${QRC_FILES})
           endif()
         endif()
 
         set(Q${KITNAME}_GENERATED_CPP ${Q${KITNAME}_GENERATED_CPP} ${Q${KITNAME}_GENERATED_UI_CPP} ${Q${KITNAME}_GENERATED_MOC_CPP} ${Q${KITNAME}_GENERATED_QRC_CPP})
 
         ORGANIZE_SOURCES(SOURCE ${CPP_FILES}
                          HEADER ${H_FILES}
                          TXX ${TXX_FILES}
                          DOC ${DOX_FILES}
                          UI ${UI_FILES}
                          QRC ${QRC_FILES}
                          MOC ${Q${KITNAME}_GENERATED_MOC_CPP}
                          GEN_QRC ${Q${KITNAME}_GENERATED_QRC_CPP}
                          GEN_UI ${Q${KITNAME}_GENERATED_UI_CPP})
 
         set(coverage_sources
             ${CPP_FILES} ${H_FILES} ${GLOBBED__H_FILES} ${CORRESPONDING__H_FILES} ${TXX_FILES}
             ${TOOL_CPPS} ${TOOL_GUI_CPPS})
 
         if(MODULE_SUBPROJECTS)
           set_property(SOURCE ${coverage_sources} APPEND PROPERTY LABELS ${MODULE_SUBPROJECTS} MITK)
         endif()
 
         if(NOT MODULE_HEADERS_ONLY)
 
           if(MODULE_EXECUTABLE)
             add_executable(${MODULE_TARGET}
                            ${MODULE_CPP_FILES} ${coverage_sources} ${CPP_FILES_GENERATED} ${Q${KITNAME}_GENERATED_CPP}
                            ${DOX_FILES} ${UI_FILES} ${QRC_FILES})
             set(_us_module_name main)
           else()
             add_library(${MODULE_TARGET} ${_STATIC}
                         ${coverage_sources} ${CPP_FILES_GENERATED} ${Q${KITNAME}_GENERATED_CPP}
                         ${DOX_FILES} ${UI_FILES} ${QRC_FILES})
             set(_us_module_name ${MODULE_TARGET})
           endif()
 
           # Apply properties to the module target.
           target_compile_definitions(${MODULE_TARGET} PRIVATE US_MODULE_NAME=${_us_module_name})
           if(MODULE_C_MODULE)
             if(module_c_flags)
               string(REPLACE " " ";" module_c_flags "${module_c_flags}")
               target_compile_options(${MODULE_TARGET} PRIVATE ${module_c_flags})
             endif()
             if(module_c_flags_debug)
               string(REPLACE " " ";" module_c_flags_debug "${module_c_flags_debug}")
               target_compile_options(${MODULE_TARGET} PRIVATE $<$<CONFIG:Debug>:${module_c_flags_debug}>)
             endif()
             if(module_c_flags_release)
               string(REPLACE " " ";" module_c_flags_release "${module_c_flags_release}")
               target_compile_options(${MODULE_TARGET} PRIVATE $<$<CONFIG:Release>:${module_c_flags_release}>)
             endif()
           else()
             if(module_cxx_flags)
               string(REPLACE " " ";" module_cxx_flags "${module_cxx_flags}")
               target_compile_options(${MODULE_TARGET} PRIVATE ${module_cxx_flags})
             endif()
             if(module_cxx_flags_debug)
               string(REPLACE " " ";" module_cxx_flags_debug "${module_cxx_flags_debug}")
               target_compile_options(${MODULE_TARGET} PRIVATE $<$<CONFIG:Debug>:${module_cxx_flags_debug}>)
             endif()
             if(module_cxx_flags_release)
               string(REPLACE " " ";" module_cxx_flags_release "${module_cxx_flags_release}")
               target_compile_options(${MODULE_TARGET} PRIVATE $<$<CONFIG:Release>:${module_cxx_flags_release}>)
             endif()
           endif()
 
           set_property(TARGET ${MODULE_TARGET} PROPERTY US_MODULE_NAME ${_us_module_name})
           if(MODULE_DEPRECATED_SINCE)
             set_property(TARGET ${MODULE_TARGET} PROPERTY MITK_MODULE_DEPRECATED_SINCE ${MODULE_DEPRECATED_SINCE})
           endif()
 
           if(MODULE_TARGET_DEPENDS)
             add_dependencies(${MODULE_TARGET} ${MODULE_TARGET_DEPENDS})
           endif()
 
           if(MODULE_SUBPROJECTS)
             set_property(TARGET ${MODULE_TARGET} PROPERTY LABELS ${MODULE_SUBPROJECTS} MITK)
             foreach(subproject ${MODULE_SUBPROJECTS})
               add_dependencies(${subproject} ${MODULE_TARGET})
             endforeach()
           endif()
 
           set(DEPENDS "${MODULE_DEPENDS}")
           if(NOT MODULE_NO_INIT)
             # Add a CppMicroServices dependency implicitly, since it is
             # needed for the generated "module initialization" code.
             set(DEPENDS "CppMicroServices;${DEPENDS}")
           endif()
           if(DEPENDS OR MODULE_PACKAGE_DEPENDS)
             mitk_use_modules(TARGET ${MODULE_TARGET}
                              MODULES ${DEPENDS}
                              PACKAGES ${MODULE_PACKAGE_DEPENDS}
                             )
           endif()
 
           if(MINGW)
             target_link_libraries(${MODULE_TARGET} ssp) # add stack smash protection lib
           endif()
 
           # Add additional library search directories to a global property which
           # can be evaluated by other CMake macros, e.g. our install scripts.
           if(MODULE_ADDITIONAL_LIBS)
             target_link_libraries(${MODULE_TARGET} PRIVATE ${MODULE_ADDITIONAL_LIBS})
             get_property(_mitk_additional_library_search_paths GLOBAL PROPERTY MITK_ADDITIONAL_LIBRARY_SEARCH_PATHS)
             foreach(_lib_filepath ${MODULE_ADDITIONAL_LIBS})
               get_filename_component(_search_path "${_lib_filepath}" PATH)
               if(_search_path)
                 list(APPEND _mitk_additional_library_search_paths "${_search_path}")
               endif()
             endforeach()
             if(_mitk_additional_library_search_paths)
               list(REMOVE_DUPLICATES _mitk_additional_library_search_paths)
               set_property(GLOBAL PROPERTY MITK_ADDITIONAL_LIBRARY_SEARCH_PATHS ${_mitk_additional_library_search_paths})
             endif()
           endif()
 
           # add the target name to a global property which is used in the top-level
           # CMakeLists.txt file to export the target
           set_property(GLOBAL APPEND PROPERTY MITK_MODULE_TARGETS ${MODULE_TARGET})
           if(MODULE_AUTOLOAD_WITH)
             # for auto-loaded modules, adapt the output directory
             add_dependencies(${_module_autoload_meta_target} ${MODULE_TARGET})
             if(WIN32)
               set(_module_output_prop RUNTIME_OUTPUT_DIRECTORY)
             else()
               set(_module_output_prop LIBRARY_OUTPUT_DIRECTORY)
             endif()
             set(_module_output_dir ${CMAKE_${_module_output_prop}}/${MODULE_AUTOLOAD_WITH})
             get_target_property(_module_is_imported ${MODULE_AUTOLOAD_WITH} IMPORTED)
             if(NOT _module_is_imported)
               # if the auto-loading module is not imported, get its location
               # and put the auto-load module relative to it.
               get_target_property(_module_output_dir ${MODULE_AUTOLOAD_WITH} ${_module_output_prop})
               set_target_properties(${MODULE_TARGET} PROPERTIES
                                     ${_module_output_prop} ${_module_output_dir}/${MODULE_AUTOLOAD_WITH})
             else()
               set_target_properties(${MODULE_TARGET} PROPERTIES
                                     ${_module_output_prop} ${CMAKE_${_module_output_prop}}/${MODULE_AUTOLOAD_WITH})
             endif()
             set_target_properties(${MODULE_TARGET} PROPERTIES
                                   MITK_AUTOLOAD_DIRECTORY ${MODULE_AUTOLOAD_WITH})
 
             # add the auto-load module name as a property
             set_property(TARGET ${MODULE_AUTOLOAD_WITH} APPEND PROPERTY MITK_AUTOLOAD_TARGETS ${MODULE_TARGET})
           endif()
 
           if(binary_res_files)
             usFunctionAddResources(TARGET ${MODULE_TARGET}
                                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${res_dir}
                                    FILES ${binary_res_files})
           endif()
           if(source_res_files)
             usFunctionAddResources(TARGET ${MODULE_TARGET}
                                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${res_dir}
                                    FILES ${source_res_files})
           endif()
           if(binary_res_files OR source_res_files)
             usFunctionEmbedResources(TARGET ${MODULE_TARGET})
           endif()
 
         endif()
 
         if(NOT MODULE_C_MODULE)
           # Add required compile features, currently works only for GNU (gcc) and Clang (not AppleClang).
           # For all other cases, MITKConfig.cmake prints an error if CMAKE_CXX_STANDARD is not set to C++11
           if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
              CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
             target_compile_features(${MODULE_TARGET} PUBLIC ${MITK_CXX_FEATURES})
           endif()
         endif()
 
         # create export macros for all modules (also header-only)
         if (NOT MODULE_EXECUTABLE)
           set(_export_macro_name )
           if(MITK_LEGACY_EXPORT_MACRO_NAME)
             set(_export_macro_names
               EXPORT_MACRO_NAME ${MODULE_EXPORT_DEFINE}
               NO_EXPORT_MACRO_NAME ${MODULE_NAME}_NO_EXPORT
               DEPRECATED_MACRO_NAME ${MODULE_NAME}_DEPRECATED
               NO_DEPRECATED_MACRO_NAME ${MODULE_NAME}_NO_DEPRECATED
             )
           endif()
           generate_export_header(${MODULE_NAME}
             ${_export_macro_names}
             EXPORT_FILE_NAME ${MODULE_NAME}Exports.h
           )
         endif()
 
         # add include directories
         if(MODULE_INTERNAL_INCLUDE_DIRS)
           target_include_directories(${MODULE_TARGET} PRIVATE ${MODULE_INTERNAL_INCLUDE_DIRS})
         endif()
         if(NOT MODULE_NO_DEFAULT_INCDLUE_DIRS)
           if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/include)
             target_include_directories(${MODULE_TARGET} PUBLIC include)
           else()
             target_include_directories(${MODULE_TARGET} PUBLIC .)
           endif()
           if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src)
             target_include_directories(${MODULE_TARGET} PRIVATE src)
           endif()
         endif()
         target_include_directories(${MODULE_TARGET}
           PUBLIC ${MODULE_INCLUDE_DIRS}
           PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
         )
 
       endif()
     endif()
   endif()
 
   if(_MISSING_DEP)
     if(MODULE_DESCRIPTION)
       set(MODULE_DESCRIPTION "${MODULE_DESCRIPTION} (missing dependencies: ${_MISSING_DEP})")
     else()
       set(MODULE_DESCRIPTION "(missing dependencies: ${_MISSING_DEP})")
     endif()
   endif()
   if(NOT MODULE_NO_FEATURE_INFO)
     add_feature_info(${MODULE_NAME} MODULE_IS_ENABLED "${MODULE_DESCRIPTION}")
   endif()
 
   set(MODULE_NAME ${MODULE_NAME} PARENT_SCOPE)
   set(MODULE_TARGET ${MODULE_TARGET} PARENT_SCOPE)
   set(MODULE_IS_ENABLED ${MODULE_IS_ENABLED} PARENT_SCOPE)
   set(MODULE_SUBPROJECTS ${MODULE_SUBPROJECTS} PARENT_SCOPE)
   set(ALL_META_DEPENDENCIES ${ALL_META_DEPENDENCIES} PARENT_SCOPE)
 
 endfunction()
diff --git a/Modules/Core/CMakeLists.txt b/Modules/Core/CMakeLists.txt
index f42932f7a3..3e93c1960a 100644
--- a/Modules/Core/CMakeLists.txt
+++ b/Modules/Core/CMakeLists.txt
@@ -1,77 +1,77 @@
 
 set(TOOL_CPPS "")
 
 # temporary suppress warnings in the following files until image accessors are fully integrated.
-set_source_files_properties( DataManagement/mitkImage.cpp COMPILE_FLAGS -DMITK_NO_DEPRECATED_WARNINGS )
-set_source_files_properties( Controllers/mitkSliceNavigationController.cpp COMPILE_FLAGS -DMITK_NO_DEPRECATED_WARNINGS )
+set_source_files_properties( src/DataManagement/mitkImage.cpp COMPILE_FLAGS -DMITK_NO_DEPRECATED_WARNINGS )
+set_source_files_properties( src/Controllers/mitkSliceNavigationController.cpp COMPILE_FLAGS -DMITK_NO_DEPRECATED_WARNINGS )
 
 MITK_CREATE_MODULE(
   INCLUDE_DIRS
-    PUBLIC Algorithms Common DataManagement Controllers Interactions Interfaces IO Rendering ${MITK_BINARY_DIR}
-    PRIVATE Internal ${OPENGL_INCLUDE_DIR}
+    PUBLIC ${MITK_BINARY_DIR}
+    PRIVATE src/Algorithms src/Controllers src/DataManagement src/Interactions src/IO src/Rendering ${OPENGL_INCLUDE_DIR}
   DEPENDS PUBLIC mbilog CppMicroServices
   PACKAGE_DEPENDS
     PRIVATE tinyxml OpenGL
     # Remove public GDCM and ITKIOGDCM dependency after mitkDicomSeriesReader was removed
     PUBLIC  GDCM ITK|ITKIOGDCM
     PUBLIC  ITK|ITKTransform+ITKImageGrid+ITKImageFeature
     # We privately use/link all ITK modules in order to support all IO, Transform, etc.
     # factories from ITK which are registered "automatically" via a factory manager.
     PRIVATE ITK
     PUBLIC  VTK|vtkFiltersTexture+vtkFiltersParallel+vtkImagingStencil+vtkImagingMath+vtkInteractionStyle+vtkRenderingOpenGL+vtkRenderingVolumeOpenGL+vtkRenderingFreeTypeOpenGL+vtkRenderingLabel+vtkInteractionWidgets+vtkIOGeometry+vtkIOXML
   WARNINGS_AS_ERRORS
   SUBPROJECTS MITK-Core
   # Do not automatically create CppMicroServices initialization code.
   # Because the VTK 6 "auto-init" functionality injects file-local static
   # initialization code in every cpp file which includes a VTK header,
   # static initialization order becomes an issue again. For the Mitk
   # core library, we need to ensure that the VTK static initialization stuff
   # happens before the CppMicroServices initialization, since the latter
   # might already use VTK code which needs to access VTK object factories.
   # Hence, CppMicroServices initialization code is placed manually within
   # the mitkCoreActivator.cpp file.
   NO_INIT
 )
 if(NOT TARGET ${MODULE_TARGET})
   message(SEND_ERROR "Core target ${MODULE_TARGET} does not exist")
 endif()
 function(_itk_create_factory_register_manager)
   # In MITK_ITK_Config.cmake, we do *not* include ITK_USE_FILE, which
   # prevents multiple registrations/unregistrations of ITK IO factories
   # during library loading/unloading (of MITK libraries). However, we need
   # "one" place where the IO factories are registered at
   # least once. This could be the application executable, but every executable would
   # need to take care of that itself. Instead, we allow the auto registration in the
   # Mitk Core library.
   set(NO_DIRECTORY_SCOPED_ITK_COMPILE_DEFINITION 1)
   find_package(ITK)
   include(${ITK_USE_FILE})
 
   if(NOT ITK_NO_IO_FACTORY_REGISTER_MANAGER)
     # We manually add the define which will be of target scope. MITK
     # patches ITK_USE_FILE to remove the directory scoped compile
     # definition since it would be propagated to other targets in the
     # same directory scope but these targets might want to *not*
     # use the ITK factory manager stuff.
     target_compile_definitions(${MODULE_TARGET} PRIVATE ITK_IO_FACTORY_REGISTER_MANAGER)
   endif()
 endfunction()
 _itk_create_factory_register_manager()
 
 # this is needed for libraries which link to Mitk and need
 # symbols from explicitly instantiated templates
 if(MINGW)
   get_target_property(_mitkCore_MINGW_linkflags ${MODULE_TARGET} LINK_FLAGS)
   if(NOT _mitkCore_MINGW_linkflags)
     set(_mitkCore_MINGW_linkflags "")
   endif(NOT _mitkCore_MINGW_linkflags)
   set_target_properties(${MODULE_TARGET} PROPERTIES LINK_FLAGS "${_mitkCore_MINGW_linkflags} -Wl,--export-all-symbols")
 endif(MINGW)
 
 if(MSVC_IDE OR MSVC_VERSION OR MINGW)
   target_link_libraries(${MODULE_TARGET} psapi.lib)
 endif(MSVC_IDE OR MSVC_VERSION OR MINGW)
 
 add_subdirectory(TestingHelper)
 
-add_subdirectory(Testing)
+add_subdirectory(tests)
diff --git a/Modules/Core/TestingHelper/files.cmake b/Modules/Core/TestingHelper/files.cmake
index bce4101306..6e96a4b477 100644
--- a/Modules/Core/TestingHelper/files.cmake
+++ b/Modules/Core/TestingHelper/files.cmake
@@ -1,11 +1,7 @@
-set(H_FILES
-  mitkTestCaller.h
-  mitkTestFixture.h
-  mitkTestingMacros.h
-)
+file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
 
 set(CPP_FILES
   mitkRenderingTestHelper.cpp
   mitkInteractionTestHelper.cpp
 )
 
diff --git a/Modules/Core/TestingHelper/mitkInteractionTestHelper.h b/Modules/Core/TestingHelper/include/mitkInteractionTestHelper.h
similarity index 100%
rename from Modules/Core/TestingHelper/mitkInteractionTestHelper.h
rename to Modules/Core/TestingHelper/include/mitkInteractionTestHelper.h
diff --git a/Modules/Core/TestingHelper/mitkRenderingTestHelper.h b/Modules/Core/TestingHelper/include/mitkRenderingTestHelper.h
similarity index 100%
rename from Modules/Core/TestingHelper/mitkRenderingTestHelper.h
rename to Modules/Core/TestingHelper/include/mitkRenderingTestHelper.h
diff --git a/Modules/Core/TestingHelper/mitkTestCaller.h b/Modules/Core/TestingHelper/include/mitkTestCaller.h
similarity index 100%
rename from Modules/Core/TestingHelper/mitkTestCaller.h
rename to Modules/Core/TestingHelper/include/mitkTestCaller.h
diff --git a/Modules/Core/TestingHelper/mitkTestFixture.h b/Modules/Core/TestingHelper/include/mitkTestFixture.h
similarity index 100%
rename from Modules/Core/TestingHelper/mitkTestFixture.h
rename to Modules/Core/TestingHelper/include/mitkTestFixture.h
diff --git a/Modules/Core/TestingHelper/mitkTestingMacros.h b/Modules/Core/TestingHelper/include/mitkTestingMacros.h
similarity index 100%
rename from Modules/Core/TestingHelper/mitkTestingMacros.h
rename to Modules/Core/TestingHelper/include/mitkTestingMacros.h
diff --git a/Modules/Core/TestingHelper/mitkInteractionTestHelper.cpp b/Modules/Core/TestingHelper/src/mitkInteractionTestHelper.cpp
similarity index 100%
rename from Modules/Core/TestingHelper/mitkInteractionTestHelper.cpp
rename to Modules/Core/TestingHelper/src/mitkInteractionTestHelper.cpp
diff --git a/Modules/Core/TestingHelper/mitkRenderingTestHelper.cpp b/Modules/Core/TestingHelper/src/mitkRenderingTestHelper.cpp
similarity index 100%
rename from Modules/Core/TestingHelper/mitkRenderingTestHelper.cpp
rename to Modules/Core/TestingHelper/src/mitkRenderingTestHelper.cpp
diff --git a/Modules/Core/Documentation/Doxygen/ModuleAdaptors.dox b/Modules/Core/doc/Doxygen/ModuleAdaptors.dox
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/ModuleAdaptors.dox
rename to Modules/Core/doc/Doxygen/ModuleAdaptors.dox
diff --git a/Modules/Core/Documentation/Doxygen/ModuleGeometry.dox b/Modules/Core/doc/Doxygen/ModuleGeometry.dox
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/ModuleGeometry.dox
rename to Modules/Core/doc/Doxygen/ModuleGeometry.dox
diff --git a/Modules/Core/Documentation/Doxygen/ModuleMicroServicesInterfaces.dox b/Modules/Core/doc/Doxygen/ModuleMicroServicesInterfaces.dox
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/ModuleMicroServicesInterfaces.dox
rename to Modules/Core/doc/Doxygen/ModuleMicroServicesInterfaces.dox
diff --git a/Modules/Core/Documentation/Doxygen/ModuleVisualization.dox b/Modules/Core/doc/Doxygen/ModuleVisualization.dox
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/ModuleVisualization.dox
rename to Modules/Core/doc/Doxygen/ModuleVisualization.dox
diff --git a/Modules/Core/Documentation/Doxygen/ModuleVisualizationMapper.dox b/Modules/Core/doc/Doxygen/ModuleVisualizationMapper.dox
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/ModuleVisualizationMapper.dox
rename to Modules/Core/doc/Doxygen/ModuleVisualizationMapper.dox
diff --git a/Modules/Core/Documentation/Doxygen/ModuleVisualizationNavigationControl.dox b/Modules/Core/doc/Doxygen/ModuleVisualizationNavigationControl.dox
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/ModuleVisualizationNavigationControl.dox
rename to Modules/Core/doc/Doxygen/ModuleVisualizationNavigationControl.dox
diff --git a/Modules/Core/Documentation/Doxygen/ModuleVisualizationRenderer.dox b/Modules/Core/doc/Doxygen/ModuleVisualizationRenderer.dox
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/ModuleVisualizationRenderer.dox
rename to Modules/Core/doc/Doxygen/ModuleVisualizationRenderer.dox
diff --git a/Modules/Core/Documentation/Doxygen/Modules.dox b/Modules/Core/doc/Doxygen/Modules.dox
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/Modules.dox
rename to Modules/Core/doc/Doxygen/Modules.dox
diff --git a/Modules/Core/Documentation/Doxygen/images/ModuleGeometryFig1.png b/Modules/Core/doc/Doxygen/images/ModuleGeometryFig1.png
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/images/ModuleGeometryFig1.png
rename to Modules/Core/doc/Doxygen/images/ModuleGeometryFig1.png
diff --git a/Modules/Core/Documentation/Doxygen/images/rendering/ExampleColorYellow.png b/Modules/Core/doc/Doxygen/images/rendering/ExampleColorYellow.png
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/images/rendering/ExampleColorYellow.png
rename to Modules/Core/doc/Doxygen/images/rendering/ExampleColorYellow.png
diff --git a/Modules/Core/Documentation/Doxygen/images/rendering/ExampleLevelWindowColor.png b/Modules/Core/doc/Doxygen/images/rendering/ExampleLevelWindowColor.png
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/images/rendering/ExampleLevelWindowColor.png
rename to Modules/Core/doc/Doxygen/images/rendering/ExampleLevelWindowColor.png
diff --git a/Modules/Core/Documentation/Doxygen/images/rendering/ExampleLookupTable.png b/Modules/Core/doc/Doxygen/images/rendering/ExampleLookupTable.png
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/images/rendering/ExampleLookupTable.png
rename to Modules/Core/doc/Doxygen/images/rendering/ExampleLookupTable.png
diff --git a/Modules/Core/Documentation/Doxygen/images/rendering/ExampleTransferFunction.png b/Modules/Core/doc/Doxygen/images/rendering/ExampleTransferFunction.png
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/images/rendering/ExampleTransferFunction.png
rename to Modules/Core/doc/Doxygen/images/rendering/ExampleTransferFunction.png
diff --git a/Modules/Core/Documentation/Doxygen/images/rendering/ImageMapperdisplayGeometry.png b/Modules/Core/doc/Doxygen/images/rendering/ImageMapperdisplayGeometry.png
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/images/rendering/ImageMapperdisplayGeometry.png
rename to Modules/Core/doc/Doxygen/images/rendering/ImageMapperdisplayGeometry.png
diff --git a/Modules/Core/Documentation/Doxygen/images/rendering/cameraPositioning.png b/Modules/Core/doc/Doxygen/images/rendering/cameraPositioning.png
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/images/rendering/cameraPositioning.png
rename to Modules/Core/doc/Doxygen/images/rendering/cameraPositioning.png
diff --git a/Modules/Core/Documentation/Doxygen/images/rendering/cameraPositioning3D.png b/Modules/Core/doc/Doxygen/images/rendering/cameraPositioning3D.png
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/images/rendering/cameraPositioning3D.png
rename to Modules/Core/doc/Doxygen/images/rendering/cameraPositioning3D.png
diff --git a/Modules/Core/Documentation/Doxygen/images/rendering/imageVtkMapper2Darchitecture.png b/Modules/Core/doc/Doxygen/images/rendering/imageVtkMapper2Darchitecture.png
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/images/rendering/imageVtkMapper2Darchitecture.png
rename to Modules/Core/doc/Doxygen/images/rendering/imageVtkMapper2Darchitecture.png
diff --git a/Modules/Core/Documentation/Doxygen/images/rendering/scaling.png b/Modules/Core/doc/Doxygen/images/rendering/scaling.png
similarity index 100%
rename from Modules/Core/Documentation/Doxygen/images/rendering/scaling.png
rename to Modules/Core/doc/Doxygen/images/rendering/scaling.png
diff --git a/Modules/Core/files.cmake b/Modules/Core/files.cmake
index 2195795f13..df3fda12a7 100644
--- a/Modules/Core/files.cmake
+++ b/Modules/Core/files.cmake
@@ -1,418 +1,325 @@
-set(H_FILES
-  Algorithms/itkImportMitkImageContainer.h
-  Algorithms/itkImportMitkImageContainer.txx
-  Algorithms/itkMITKScalarImageToHistogramGenerator.h
-  Algorithms/itkMITKScalarImageToHistogramGenerator.txx
-  Algorithms/mitkInstantiateAccessFunctions.h
-  Algorithms/mitkPixelTypeList.h
-  Algorithms/mitkPPArithmeticDec.h
-  Algorithms/mitkPPArgCount.h
-  Algorithms/mitkPPCat.h
-  Algorithms/mitkPPConfig.h
-  Algorithms/mitkPPControlExprIIf.h
-  Algorithms/mitkPPControlIf.h
-  Algorithms/mitkPPControlIIf.h
-  Algorithms/mitkPPDebugError.h
-  Algorithms/mitkPPDetailAutoRec.h
-  Algorithms/mitkPPDetailDMCAutoRec.h
-  Algorithms/mitkPPExpand.h
-  Algorithms/mitkPPFacilitiesEmpty.h
-  Algorithms/mitkPPFacilitiesExpand.h
-  Algorithms/mitkPPLogicalBool.h
-  Algorithms/mitkPPRepetitionDetailDMCFor.h
-  Algorithms/mitkPPRepetitionDetailEDGFor.h
-  Algorithms/mitkPPRepetitionDetailFor.h
-  Algorithms/mitkPPRepetitionDetailMSVCFor.h
-  Algorithms/mitkPPRepetitionFor.h
-  Algorithms/mitkPPSeqElem.h
-  Algorithms/mitkPPSeqForEach.h
-  Algorithms/mitkPPSeqForEachProduct.h
-  Algorithms/mitkPPSeq.h
-  Algorithms/mitkPPSeqEnum.h
-  Algorithms/mitkPPSeqSize.h
-  Algorithms/mitkPPSeqToTuple.h
-  Algorithms/mitkPPStringize.h
-  Algorithms/mitkPPTupleEat.h
-  Algorithms/mitkPPTupleElem.h
-  Algorithms/mitkPPTupleRem.h
-  Algorithms/mitkClippedSurfaceBoundsCalculator.h
-  Algorithms/mitkExtractSliceFilter.h
-  Algorithms/mitkConvert2Dto3DImageFilter.h
-  Algorithms/mitkPlaneClipping.h
-
-  Common/mitkCommon.h
-  Common/mitkExceptionMacro.h
-  Common/mitkGetClassHierarchy.h
-
-  DataManagement/mitkProportionalTimeGeometry.h
-  DataManagement/mitkTimeGeometry.h
-  DataManagement/mitkImageAccessByItk.h
-  DataManagement/mitkImageCast.h
-  DataManagement/mitkImagePixelAccessor.h
-  DataManagement/mitkImagePixelReadAccessor.h
-  DataManagement/mitkImagePixelWriteAccessor.h
-  DataManagement/mitkImageReadAccessor.h
-  DataManagement/mitkImageWriteAccessor.h
-  DataManagement/mitkITKImageImport.h
-  DataManagement/mitkITKImageImport.txx
-  DataManagement/mitkImageToItk.h
-  DataManagement/mitkShaderProperty.h
-  DataManagement/mitkImageToItk.txx
-  DataManagement/mitkTimeSlicedGeometry.h # Deprecated, empty for compatibility reasons.
-  DataManagement/mitkPropertyListReplacedObserver.cpp
-  DataManagement/mitkVectorDeprecated.h
-  DataManagement/mitkArray.h
-  DataManagement/mitkQuaternion.h
-  DataManagement/mitkNumericTypes.h
-  DataManagement/mitkVector.h
-  DataManagement/mitkPoint.h
-  DataManagement/mitkMatrix.h
-
-  Interactions/mitkEventMapperAddOn.h
-  Interactions/mitkInteractionConst.h
-
-
-  Interfaces/mitkIDataNodeReader.h
-  Interfaces/mitkIFileWriter.h
-  Interfaces/mitkIFileWriter.cpp
-  Interfaces/mitkIFileReader.h
-  Interfaces/mitkIFileReader.cpp
-
-  Rendering/mitkLocalStorageHandler.h
-  Rendering/Colortables/HotIron.h
-  Rendering/Colortables/Jet.h
-  Rendering/Colortables/PET20.h
-  Rendering/Colortables/PETColor.h
-
-  IO/mitkIOAdapter.h
-  IO/mitkLocaleSwitch.h
-  IO/mitkPixelTypeTraits.h
-)
+file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
 
 set(CPP_FILES
+  mitkCoreActivator.cpp
+  mitkCoreObjectFactoryBase.cpp
+  mitkCoreObjectFactory.cpp
+  mitkCoreServices.cpp
+  mitkException.cpp
+
   Algorithms/mitkBaseDataSource.cpp
+  Algorithms/mitkClippedSurfaceBoundsCalculator.cpp
   Algorithms/mitkCompareImageDataFilter.cpp
-  Algorithms/mitkMultiComponentImageDataComparisonFilter.cpp
+  Algorithms/mitkConvert2Dto3DImageFilter.cpp
   Algorithms/mitkDataNodeSource.cpp
-  Algorithms/mitkPlaneGeometryDataToSurfaceFilter.cpp
+  Algorithms/mitkExtractSliceFilter.cpp
   Algorithms/mitkHistogramGenerator.cpp
   Algorithms/mitkImageChannelSelector.cpp
   Algorithms/mitkImageSliceSelector.cpp
   Algorithms/mitkImageSource.cpp
   Algorithms/mitkImageTimeSelector.cpp
   Algorithms/mitkImageToImageFilter.cpp
   Algorithms/mitkImageToSurfaceFilter.cpp
+  Algorithms/mitkMultiComponentImageDataComparisonFilter.cpp
+  Algorithms/mitkPlaneGeometryDataToSurfaceFilter.cpp
   Algorithms/mitkPointSetSource.cpp
   Algorithms/mitkPointSetToPointSetFilter.cpp
   Algorithms/mitkRGBToRGBACastImageFilter.cpp
   Algorithms/mitkSubImageSelector.cpp
   Algorithms/mitkSurfaceSource.cpp
   Algorithms/mitkSurfaceToImageFilter.cpp
   Algorithms/mitkSurfaceToSurfaceFilter.cpp
   Algorithms/mitkUIDGenerator.cpp
   Algorithms/mitkVolumeCalculator.cpp
-  Algorithms/mitkClippedSurfaceBoundsCalculator.cpp
-  Algorithms/mitkExtractSliceFilter.cpp
-  Algorithms/mitkConvert2Dto3DImageFilter.cpp
 
   Controllers/mitkBaseController.cpp
   Controllers/mitkCallbackFromGUIThread.cpp
   Controllers/mitkCameraController.cpp
   Controllers/mitkCameraRotationController.cpp
   Controllers/mitkFocusManager.cpp
   Controllers/mitkLimitedLinearUndo.cpp
   Controllers/mitkOperationEvent.cpp
   Controllers/mitkPlanePositionManager.cpp
   Controllers/mitkProgressBar.cpp
   Controllers/mitkRenderingManager.cpp
   Controllers/mitkSliceNavigationController.cpp
   Controllers/mitkSlicesCoordinator.cpp
   Controllers/mitkSlicesRotator.cpp
   Controllers/mitkSlicesSwiveller.cpp
   Controllers/mitkStatusBar.cpp
   Controllers/mitkStepper.cpp
   Controllers/mitkTestManager.cpp
   Controllers/mitkUndoController.cpp
   Controllers/mitkVerboseLimitedLinearUndo.cpp
   Controllers/mitkVtkInteractorCameraController.cpp
   Controllers/mitkVtkLayerController.cpp
-  DataManagement/mitkProportionalTimeGeometry.cpp
-  DataManagement/mitkTimeGeometry.cpp
+
   DataManagement/mitkAbstractTransformGeometry.cpp
   DataManagement/mitkAnnotationProperty.cpp
   DataManagement/mitkApplicationCursor.cpp
+  DataManagement/mitkApplyTransformMatrixOperation.cpp
   DataManagement/mitkBaseData.cpp
   DataManagement/mitkBaseGeometry.cpp
-  DataManagement/mitkGeometryTransformHolder.cpp
   DataManagement/mitkBaseProperty.cpp
-  DataManagement/mitkClippingProperty.cpp
   DataManagement/mitkChannelDescriptor.cpp
+  DataManagement/mitkClippingProperty.cpp
   DataManagement/mitkColorProperty.cpp
-  DataManagement/mitkDataStorage.cpp
-# DataManagement/mitkDataTree.cpp
   DataManagement/mitkDataNode.cpp
-# DataManagement/mitkDataTreeStorage.cpp
+  DataManagement/mitkDataStorage.cpp
   DataManagement/mitkDisplayGeometry.cpp
   DataManagement/mitkEnumerationProperty.cpp
-  DataManagement/mitkPlaneGeometryData.cpp
+  DataManagement/mitkFloatPropertyExtension.cpp
   DataManagement/mitkGeometry3D.cpp
   DataManagement/mitkGeometryData.cpp
+  DataManagement/mitkGeometryTransformHolder.cpp
   DataManagement/mitkGroupTagProperty.cpp
-  DataManagement/mitkImage.cpp
   DataManagement/mitkImageAccessorBase.cpp
   DataManagement/mitkImageCaster.cpp
   DataManagement/mitkImageCastPart1.cpp
   DataManagement/mitkImageCastPart2.cpp
   DataManagement/mitkImageCastPart3.cpp
   DataManagement/mitkImageCastPart4.cpp
+  DataManagement/mitkImage.cpp
   DataManagement/mitkImageDataItem.cpp
   DataManagement/mitkImageDescriptor.cpp
   DataManagement/mitkImageReadAccessor.cpp
   DataManagement/mitkImageStatisticsHolder.cpp
   DataManagement/mitkImageVtkAccessor.cpp
   DataManagement/mitkImageVtkReadAccessor.cpp
   DataManagement/mitkImageVtkWriteAccessor.cpp
   DataManagement/mitkImageWriteAccessor.cpp
+  DataManagement/mitkIntPropertyExtension.cpp
+  DataManagement/mitkIPersistenceService.cpp
+  DataManagement/mitkIPropertyAliases.cpp
+  DataManagement/mitkIPropertyDescriptions.cpp
+  DataManagement/mitkIPropertyExtensions.cpp
+  DataManagement/mitkIPropertyFilters.cpp
   DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp
   DataManagement/mitkLandmarkProjector.cpp
-  DataManagement/mitkLine.cpp
   DataManagement/mitkLevelWindow.cpp
   DataManagement/mitkLevelWindowManager.cpp
   DataManagement/mitkLevelWindowPreset.cpp
   DataManagement/mitkLevelWindowProperty.cpp
+  DataManagement/mitkLine.cpp
   DataManagement/mitkLookupTable.cpp
   DataManagement/mitkLookupTableProperty.cpp
   DataManagement/mitkLookupTables.cpp # specializations of GenericLookupTable
+  DataManagement/mitkMaterial.cpp
   DataManagement/mitkMemoryUtilities.cpp
   DataManagement/mitkModalityProperty.cpp
   DataManagement/mitkModeOperation.cpp
   DataManagement/mitkModifiedLock.cpp
   DataManagement/mitkNodePredicateAnd.cpp
   DataManagement/mitkNodePredicateBase.cpp
   DataManagement/mitkNodePredicateCompositeBase.cpp
   DataManagement/mitkNodePredicateData.cpp
   DataManagement/mitkNodePredicateDataType.cpp
   DataManagement/mitkNodePredicateDimension.cpp
   DataManagement/mitkNodePredicateFirstLevel.cpp
   DataManagement/mitkNodePredicateNot.cpp
   DataManagement/mitkNodePredicateOr.cpp
   DataManagement/mitkNodePredicateProperty.cpp
   DataManagement/mitkNodePredicateSource.cpp
-  DataManagement/mitkPlaneOrientationProperty.cpp
+  DataManagement/mitkNumericConstants.cpp
   DataManagement/mitkPlaneGeometry.cpp
+  DataManagement/mitkPlaneGeometryData.cpp
   DataManagement/mitkPlaneOperation.cpp
+  DataManagement/mitkPlaneOrientationProperty.cpp
   DataManagement/mitkPointOperation.cpp
   DataManagement/mitkPointSet.cpp
+  DataManagement/mitkPointSetShapeProperty.cpp
   DataManagement/mitkProperties.cpp
+  DataManagement/mitkPropertyAliases.cpp
+  DataManagement/mitkPropertyDescriptions.cpp
+  DataManagement/mitkPropertyExtension.cpp
+  DataManagement/mitkPropertyExtensions.cpp
+  DataManagement/mitkPropertyFilter.cpp
+  DataManagement/mitkPropertyFilters.cpp
   DataManagement/mitkPropertyList.cpp
   DataManagement/mitkPropertyObserver.cpp
+  DataManagement/mitkProportionalTimeGeometry.cpp
+  DataManagement/mitkRenderingModeProperty.cpp
+  DataManagement/mitkResliceMethodProperty.cpp
   DataManagement/mitkRestorePlanePositionOperation.cpp
-  DataManagement/mitkApplyTransformMatrixOperation.cpp
   DataManagement/mitkRotationOperation.cpp
+  DataManagement/mitkShaderProperty.cpp
   DataManagement/mitkSlicedData.cpp
   DataManagement/mitkSlicedGeometry3D.cpp
   DataManagement/mitkSmartPointerProperty.cpp
   DataManagement/mitkStandaloneDataStorage.cpp
   DataManagement/mitkStateTransitionOperation.cpp
   DataManagement/mitkStringProperty.cpp
   DataManagement/mitkSurface.cpp
   DataManagement/mitkSurfaceOperation.cpp
   DataManagement/mitkThinPlateSplineCurvedGeometry.cpp
+  DataManagement/mitkTimeGeometry.cpp
   DataManagement/mitkTransferFunction.cpp
-  DataManagement/mitkTransferFunctionProperty.cpp
   DataManagement/mitkTransferFunctionInitializer.cpp
+  DataManagement/mitkTransferFunctionProperty.cpp
   DataManagement/mitkVector.cpp
-
-  DataManagement/mitkNumericConstants.cpp
   DataManagement/mitkVtkInterpolationProperty.cpp
   DataManagement/mitkVtkRepresentationProperty.cpp
   DataManagement/mitkVtkResliceInterpolationProperty.cpp
   DataManagement/mitkVtkScalarModeProperty.cpp
   DataManagement/mitkVtkVolumeRenderingProperty.cpp
   DataManagement/mitkWeakPointerProperty.cpp
-  DataManagement/mitkRenderingModeProperty.cpp
-  DataManagement/mitkResliceMethodProperty.cpp
-  DataManagement/mitkMaterial.cpp
-  DataManagement/mitkPointSetShapeProperty.cpp
-  DataManagement/mitkFloatPropertyExtension.cpp
-  DataManagement/mitkIntPropertyExtension.cpp
-  DataManagement/mitkPropertyExtension.cpp
-  DataManagement/mitkPropertyFilter.cpp
-  DataManagement/mitkPropertyAliases.cpp
-  DataManagement/mitkPropertyDescriptions.cpp
-  DataManagement/mitkPropertyExtensions.cpp
-  DataManagement/mitkPropertyFilters.cpp
-  DataManagement/mitkShaderProperty.cpp
 
   Interactions/mitkAction.cpp
   Interactions/mitkAffineInteractor.cpp
   Interactions/mitkBindDispatcherInteractor.cpp
   Interactions/mitkCoordinateSupplier.cpp
+  Interactions/mitkCrosshairPositionEvent.cpp
   Interactions/mitkDataInteractor.cpp
   Interactions/mitkDispatcher.cpp
   Interactions/mitkDisplayCoordinateOperation.cpp
   Interactions/mitkDisplayInteractor.cpp
   Interactions/mitkDisplayPositionEvent.cpp
 # Interactions/mitkDisplayVectorInteractorLevelWindow.cpp # legacy, prob even now unneeded
 # Interactions/mitkDisplayVectorInteractorScroll.cpp
-  Interactions/mitkEvent.cpp
   Interactions/mitkEventConfig.cpp
+  Interactions/mitkEvent.cpp
   Interactions/mitkEventDescription.cpp
   Interactions/mitkEventFactory.cpp
-  Interactions/mitkInteractionEventHandler.cpp
   Interactions/mitkEventMapper.cpp
   Interactions/mitkEventRecorder.cpp
   Interactions/mitkEventStateMachine.cpp
   Interactions/mitkGlobalInteraction.cpp
-  Interactions/mitkInteractor.cpp
-  Interactions/mitkInternalEvent.cpp
-  Interactions/mitkInteractionEvent.cpp
   Interactions/mitkInteractionEventConst.cpp
-  Interactions/mitkInteractionPositionEvent.cpp
+  Interactions/mitkInteractionEvent.cpp
+  Interactions/mitkInteractionEventHandler.cpp
+  Interactions/mitkInteractionEventObserver.cpp
   Interactions/mitkInteractionKeyEvent.cpp
-  Interactions/mitkMousePressEvent.cpp
-  Interactions/mitkMouseMoveEvent.cpp
-  Interactions/mitkMouseReleaseEvent.cpp
-  Interactions/mitkMouseWheelEvent.cpp
+  Interactions/mitkInteractionPositionEvent.cpp
+  Interactions/mitkInteractor.cpp
+  Interactions/mitkInternalEvent.cpp
+  Interactions/mitkKeyEvent.cpp
   Interactions/mitkMouseDoubleClickEvent.cpp
   Interactions/mitkMouseModeSwitcher.cpp
+  Interactions/mitkMouseMoveEvent.cpp
   Interactions/mitkMouseMovePointSetInteractor.cpp
+  Interactions/mitkMousePressEvent.cpp
+  Interactions/mitkMouseReleaseEvent.cpp
+  Interactions/mitkMouseWheelEvent.cpp
   Interactions/mitkMoveBaseDataInteractor.cpp
   Interactions/mitkNodeDepententPointSetInteractor.cpp
   Interactions/mitkPointSetDataInteractor.cpp
   Interactions/mitkPointSetInteractor.cpp
   Interactions/mitkPositionEvent.cpp
   Interactions/mitkPositionTracker.cpp
   Interactions/mitkSinglePointDataInteractor.cpp
+  Interactions/mitkState.cpp
+  Interactions/mitkStateEvent.cpp
   Interactions/mitkStateMachineAction.cpp
   Interactions/mitkStateMachineCondition.cpp
-  Interactions/mitkStateMachineState.cpp
-  Interactions/mitkStateMachineTransition.cpp
-  Interactions/mitkState.cpp
   Interactions/mitkStateMachineContainer.cpp
-  Interactions/mitkStateEvent.cpp
   Interactions/mitkStateMachine.cpp
   Interactions/mitkStateMachineFactory.cpp
+  Interactions/mitkStateMachineState.cpp
+  Interactions/mitkStateMachineTransition.cpp
   Interactions/mitkTransition.cpp
-  Interactions/mitkWheelEvent.cpp
-  Interactions/mitkKeyEvent.cpp
   Interactions/mitkVtkEventAdapter.cpp
   Interactions/mitkVtkInteractorStyle.cxx
-  Interactions/mitkCrosshairPositionEvent.cpp
+  Interactions/mitkWheelEvent.cpp
   Interactions/mitkXML2EventParser.cpp
 
-  Interfaces/mitkIMimeTypeProvider.cpp
-  Interfaces/mitkInteractionEventObserver.cpp
-  Interfaces/mitkIShaderRepository.cpp
-  Interfaces/mitkIPropertyAliases.cpp
-  Interfaces/mitkIPropertyDescriptions.cpp
-  Interfaces/mitkIPropertyExtensions.cpp
-  Interfaces/mitkIPropertyFilters.cpp
-  Interfaces/mitkIPersistenceService.cpp
-
+  IO/mitkAbstractFileIO.cpp
   IO/mitkAbstractFileReader.cpp
   IO/mitkAbstractFileWriter.cpp
-  IO/mitkAbstractFileIO.cpp
   IO/mitkCustomMimeType.cpp
   IO/mitkDicomSeriesReader.cpp
-  IO/mitkDicomSR_LoadDICOMScalar.cpp
-  IO/mitkDicomSR_LoadDICOMScalar4D.cpp
-  IO/mitkDicomSR_LoadDICOMRGBPixel.cpp
-  IO/mitkDicomSR_LoadDICOMRGBPixel4D.cpp
-  IO/mitkDicomSR_ImageBlockDescriptor.cpp
+  IO/mitkDicomSeriesReaderService.cpp
   IO/mitkDicomSR_GantryTiltInformation.cpp
+  IO/mitkDicomSR_ImageBlockDescriptor.cpp
+  IO/mitkDicomSR_LoadDICOMRGBPixel4D.cpp
+  IO/mitkDicomSR_LoadDICOMRGBPixel.cpp
+  IO/mitkDicomSR_LoadDICOMScalar4D.cpp
+  IO/mitkDicomSR_LoadDICOMScalar.cpp
   IO/mitkDicomSR_SliceGroupingResult.cpp
-
   IO/mitkFileReader.cpp
   IO/mitkFileReaderRegistry.cpp
   IO/mitkFileReaderSelector.cpp
+  IO/mitkFileReaderWriterBase.cpp
   IO/mitkFileWriter.cpp
   IO/mitkFileWriterRegistry.cpp
   IO/mitkFileWriterSelector.cpp
   IO/mitkIFileIO.cpp
+  IO/mitkIFileReader.cpp
+  IO/mitkIFileWriter.cpp
   IO/mitkImageGenerator.cpp
+  IO/mitkImageVtkLegacyIO.cpp
+  IO/mitkImageVtkXmlIO.cpp
+  IO/mitkIMimeTypeProvider.cpp
   IO/mitkIOConstants.cpp
-  IO/mitkIOUtil.cpp
   IO/mitkIOMimeTypes.cpp
+  IO/mitkIOUtil.cpp
+  IO/mitkItkImageIO.cpp
   IO/mitkItkLoggingAdapter.cpp
+  IO/mitkLegacyFileReaderService.cpp
+  IO/mitkLegacyFileWriterService.cpp
+  IO/mitkLog.cpp
   IO/mitkMimeType.cpp
+  IO/mitkMimeTypeProvider.cpp
   IO/mitkOperation.cpp
   IO/mitkPixelType.cpp
+  IO/mitkPointSetReaderService.cpp
+  IO/mitkPointSetWriterService.cpp
+  IO/mitkRawImageFileReader.cpp
   IO/mitkStandardFileLocations.cpp
+  IO/mitkSurfaceStlIO.cpp
+  IO/mitkSurfaceVtkIO.cpp
+  IO/mitkSurfaceVtkLegacyIO.cpp
+  IO/mitkSurfaceVtkXmlIO.cpp
   IO/mitkVtkLoggingAdapter.cpp
-  IO/mitkLog.cpp
 
+  Rendering/mitkAbstractOverlayLayouter.cpp
   Rendering/mitkBaseRenderer.cpp
-  Rendering/mitkVtkMapper.cpp
-  Rendering/mitkRenderWindowFrame.cpp
-  Rendering/mitkPlaneGeometryDataMapper2D.cpp
-  Rendering/mitkPlaneGeometryDataVtkMapper3D.cpp
   #Rendering/mitkGLMapper.cpp Moved to deprecated LegacyGL Module
   Rendering/mitkGradientBackground.cpp
+  Rendering/mitkImageVtkMapper2D.cpp
+  Rendering/mitkIShaderRepository.cpp
   Rendering/mitkManufacturerLogo.cpp
   Rendering/mitkMapper.cpp
+  Rendering/mitkOverlay.cpp
+  Rendering/mitkOverlayManager.cpp
+  Rendering/mitkPlaneGeometryDataMapper2D.cpp
+  Rendering/mitkPlaneGeometryDataVtkMapper3D.cpp
   Rendering/mitkPointSetVtkMapper2D.cpp
   Rendering/mitkPointSetVtkMapper3D.cpp
-  Rendering/mitkSurfaceVtkMapper2D.cpp
+  Rendering/mitkRenderWindowBase.cpp
+  Rendering/mitkRenderWindow.cpp
+  Rendering/mitkRenderWindowFrame.cpp
   #Rendering/mitkSurfaceGLMapper2D.cpp Moved to deprecated LegacyGL Module
+  Rendering/mitkSurfaceVtkMapper2D.cpp
   Rendering/mitkSurfaceVtkMapper3D.cpp
   Rendering/mitkVolumeDataVtkMapper3D.cpp
+  Rendering/mitkVtkEventProvider.cpp
+  Rendering/mitkVtkMapper.cpp
+  Rendering/mitkVtkOverlay2D.cpp
+  Rendering/mitkVtkOverlay3D.cpp
+  Rendering/mitkVtkOverlay.cpp
   Rendering/mitkVtkPropRenderer.cpp
   Rendering/mitkVtkWidgetRendering.cpp
+  Rendering/vtkMitkLevelWindowFilter.cpp
   Rendering/vtkMitkRectangleProp.cpp
   Rendering/vtkMitkRenderProp.cpp
-  Rendering/mitkVtkEventProvider.cpp
-  Rendering/mitkRenderWindow.cpp
-  Rendering/mitkRenderWindowBase.cpp
-  Rendering/mitkImageVtkMapper2D.cpp
   Rendering/vtkMitkThickSlicesFilter.cpp
-  Rendering/vtkMitkLevelWindowFilter.cpp
   Rendering/vtkNeverTranslucentTexture.cpp
-
-  Rendering/mitkOverlay.cpp
-  Rendering/mitkVtkOverlay.cpp
-  Rendering/mitkVtkOverlay2D.cpp
-  Rendering/mitkVtkOverlay3D.cpp
-  Rendering/mitkOverlayManager.cpp
-  Rendering/mitkAbstractOverlayLayouter.cpp
-
-  Common/mitkException.cpp
-  Common/mitkCoreObjectFactoryBase.cpp
-  Common/mitkCoreObjectFactory.cpp
-  Common/mitkCoreServices.cpp
-
-  Internal/mitkCoreActivator.cpp
-  Internal/mitkDicomSeriesReaderService.cpp
-  Internal/mitkFileReaderWriterBase.cpp
-  Internal/mitkImageVtkLegacyIO.cpp
-  Internal/mitkImageVtkXmlIO.cpp
-  Internal/mitkItkImageIO.cpp
-  Internal/mitkLegacyFileReaderService.cpp
-  Internal/mitkLegacyFileWriterService.cpp
-  Internal/mitkMimeTypeProvider.cpp
-  Internal/mitkPointSetReaderService.cpp
-  Internal/mitkPointSetWriterService.cpp
-  Internal/mitkRawImageFileReader.cpp
-  Internal/mitkSurfaceStlIO.cpp
-  Internal/mitkSurfaceVtkIO.cpp
-  Internal/mitkSurfaceVtkLegacyIO.cpp
-  Internal/mitkSurfaceVtkXmlIO.cpp
 )
 
 set(RESOURCE_FILES
 Interactions/globalConfig.xml
 Interactions/DisplayInteraction.xml
 Interactions/DisplayConfig.xml
 Interactions/DisplayConfigPACS.xml
 Interactions/DisplayConfigPACSPan.xml
 Interactions/DisplayConfigPACSScroll.xml
 Interactions/DisplayConfigPACSZoom.xml
 Interactions/DisplayConfigPACSLevelWindow.xml
 Interactions/DisplayConfigMITK.xml
 Interactions/PointSet.xml
 Interactions/Legacy/StateMachine.xml
 Interactions/Legacy/DisplayConfigMITKTools.xml
 Interactions/PointSetConfig.xml
 
 mitkLevelWindowPresets.xml
 )
diff --git a/Modules/Core/Rendering/Colortables/HotIron.h b/Modules/Core/include/Colortables/HotIron.h
similarity index 100%
rename from Modules/Core/Rendering/Colortables/HotIron.h
rename to Modules/Core/include/Colortables/HotIron.h
diff --git a/Modules/Core/Rendering/Colortables/Jet.h b/Modules/Core/include/Colortables/Jet.h
similarity index 100%
rename from Modules/Core/Rendering/Colortables/Jet.h
rename to Modules/Core/include/Colortables/Jet.h
diff --git a/Modules/Core/Rendering/Colortables/PET20.h b/Modules/Core/include/Colortables/PET20.h
similarity index 100%
rename from Modules/Core/Rendering/Colortables/PET20.h
rename to Modules/Core/include/Colortables/PET20.h
diff --git a/Modules/Core/Rendering/Colortables/PETColor.h b/Modules/Core/include/Colortables/PETColor.h
similarity index 100%
rename from Modules/Core/Rendering/Colortables/PETColor.h
rename to Modules/Core/include/Colortables/PETColor.h
diff --git a/Modules/Core/Algorithms/itkImportMitkImageContainer.h b/Modules/Core/include/itkImportMitkImageContainer.h
similarity index 100%
rename from Modules/Core/Algorithms/itkImportMitkImageContainer.h
rename to Modules/Core/include/itkImportMitkImageContainer.h
diff --git a/Modules/Core/Algorithms/itkImportMitkImageContainer.txx b/Modules/Core/include/itkImportMitkImageContainer.txx
similarity index 100%
rename from Modules/Core/Algorithms/itkImportMitkImageContainer.txx
rename to Modules/Core/include/itkImportMitkImageContainer.txx
diff --git a/Modules/Core/Algorithms/itkMITKScalarImageToHistogramGenerator.h b/Modules/Core/include/itkMITKScalarImageToHistogramGenerator.h
similarity index 100%
rename from Modules/Core/Algorithms/itkMITKScalarImageToHistogramGenerator.h
rename to Modules/Core/include/itkMITKScalarImageToHistogramGenerator.h
diff --git a/Modules/Core/Algorithms/itkMITKScalarImageToHistogramGenerator.txx b/Modules/Core/include/itkMITKScalarImageToHistogramGenerator.txx
similarity index 100%
rename from Modules/Core/Algorithms/itkMITKScalarImageToHistogramGenerator.txx
rename to Modules/Core/include/itkMITKScalarImageToHistogramGenerator.txx
diff --git a/Modules/Core/DataManagement/itkVtkAbstractTransform.h b/Modules/Core/include/itkVtkAbstractTransform.h
similarity index 100%
rename from Modules/Core/DataManagement/itkVtkAbstractTransform.h
rename to Modules/Core/include/itkVtkAbstractTransform.h
diff --git a/Modules/Core/DataManagement/itkVtkAbstractTransform.txx b/Modules/Core/include/itkVtkAbstractTransform.txx
similarity index 100%
rename from Modules/Core/DataManagement/itkVtkAbstractTransform.txx
rename to Modules/Core/include/itkVtkAbstractTransform.txx
diff --git a/Modules/Core/Rendering/mbilogo.h b/Modules/Core/include/mbilogo.h
similarity index 100%
rename from Modules/Core/Rendering/mbilogo.h
rename to Modules/Core/include/mbilogo.h
diff --git a/Modules/Core/IO/mitkAbstractFileIO.h b/Modules/Core/include/mitkAbstractFileIO.h
similarity index 100%
rename from Modules/Core/IO/mitkAbstractFileIO.h
rename to Modules/Core/include/mitkAbstractFileIO.h
diff --git a/Modules/Core/IO/mitkAbstractFileReader.h b/Modules/Core/include/mitkAbstractFileReader.h
similarity index 100%
rename from Modules/Core/IO/mitkAbstractFileReader.h
rename to Modules/Core/include/mitkAbstractFileReader.h
diff --git a/Modules/Core/IO/mitkAbstractFileWriter.h b/Modules/Core/include/mitkAbstractFileWriter.h
similarity index 100%
rename from Modules/Core/IO/mitkAbstractFileWriter.h
rename to Modules/Core/include/mitkAbstractFileWriter.h
diff --git a/Modules/Core/Rendering/mitkAbstractOverlayLayouter.h b/Modules/Core/include/mitkAbstractOverlayLayouter.h
similarity index 100%
rename from Modules/Core/Rendering/mitkAbstractOverlayLayouter.h
rename to Modules/Core/include/mitkAbstractOverlayLayouter.h
diff --git a/Modules/Core/DataManagement/mitkAbstractTransformGeometry.h b/Modules/Core/include/mitkAbstractTransformGeometry.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkAbstractTransformGeometry.h
rename to Modules/Core/include/mitkAbstractTransformGeometry.h
diff --git a/Modules/Core/Interactions/mitkAction.h b/Modules/Core/include/mitkAction.h
similarity index 100%
rename from Modules/Core/Interactions/mitkAction.h
rename to Modules/Core/include/mitkAction.h
diff --git a/Modules/Core/Interactions/mitkAffineInteractor.h b/Modules/Core/include/mitkAffineInteractor.h
similarity index 100%
rename from Modules/Core/Interactions/mitkAffineInteractor.h
rename to Modules/Core/include/mitkAffineInteractor.h
diff --git a/Modules/Core/DataManagement/mitkAffineTransform3D.h b/Modules/Core/include/mitkAffineTransform3D.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkAffineTransform3D.h
rename to Modules/Core/include/mitkAffineTransform3D.h
diff --git a/Modules/Core/DataManagement/mitkAnnotationProperty.h b/Modules/Core/include/mitkAnnotationProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkAnnotationProperty.h
rename to Modules/Core/include/mitkAnnotationProperty.h
diff --git a/Modules/Core/DataManagement/mitkApplicationCursor.h b/Modules/Core/include/mitkApplicationCursor.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkApplicationCursor.h
rename to Modules/Core/include/mitkApplicationCursor.h
diff --git a/Modules/Core/DataManagement/mitkApplyTransformMatrixOperation.h b/Modules/Core/include/mitkApplyTransformMatrixOperation.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkApplyTransformMatrixOperation.h
rename to Modules/Core/include/mitkApplyTransformMatrixOperation.h
diff --git a/Modules/Core/DataManagement/mitkArray.h b/Modules/Core/include/mitkArray.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkArray.h
rename to Modules/Core/include/mitkArray.h
diff --git a/Modules/Core/Controllers/mitkBaseController.h b/Modules/Core/include/mitkBaseController.h
similarity index 100%
rename from Modules/Core/Controllers/mitkBaseController.h
rename to Modules/Core/include/mitkBaseController.h
diff --git a/Modules/Core/DataManagement/mitkBaseData.h b/Modules/Core/include/mitkBaseData.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkBaseData.h
rename to Modules/Core/include/mitkBaseData.h
diff --git a/Modules/Core/Algorithms/mitkBaseDataSource.h b/Modules/Core/include/mitkBaseDataSource.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkBaseDataSource.h
rename to Modules/Core/include/mitkBaseDataSource.h
diff --git a/Modules/Core/DataManagement/mitkBaseDataTestImplementation.h b/Modules/Core/include/mitkBaseDataTestImplementation.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkBaseDataTestImplementation.h
rename to Modules/Core/include/mitkBaseDataTestImplementation.h
diff --git a/Modules/Core/DataManagement/mitkBaseGeometry.h b/Modules/Core/include/mitkBaseGeometry.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkBaseGeometry.h
rename to Modules/Core/include/mitkBaseGeometry.h
diff --git a/Modules/Core/Algorithms/mitkBaseProcess.h b/Modules/Core/include/mitkBaseProcess.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkBaseProcess.h
rename to Modules/Core/include/mitkBaseProcess.h
diff --git a/Modules/Core/DataManagement/mitkBaseProperty.h b/Modules/Core/include/mitkBaseProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkBaseProperty.h
rename to Modules/Core/include/mitkBaseProperty.h
diff --git a/Modules/Core/Rendering/mitkBaseRenderer.h b/Modules/Core/include/mitkBaseRenderer.h
similarity index 100%
rename from Modules/Core/Rendering/mitkBaseRenderer.h
rename to Modules/Core/include/mitkBaseRenderer.h
diff --git a/Modules/Core/Interactions/mitkBindDispatcherInteractor.h b/Modules/Core/include/mitkBindDispatcherInteractor.h
similarity index 100%
rename from Modules/Core/Interactions/mitkBindDispatcherInteractor.h
rename to Modules/Core/include/mitkBindDispatcherInteractor.h
diff --git a/Modules/Core/Controllers/mitkCallbackFromGUIThread.h b/Modules/Core/include/mitkCallbackFromGUIThread.h
similarity index 100%
rename from Modules/Core/Controllers/mitkCallbackFromGUIThread.h
rename to Modules/Core/include/mitkCallbackFromGUIThread.h
diff --git a/Modules/Core/Controllers/mitkCameraController.h b/Modules/Core/include/mitkCameraController.h
similarity index 100%
rename from Modules/Core/Controllers/mitkCameraController.h
rename to Modules/Core/include/mitkCameraController.h
diff --git a/Modules/Core/Controllers/mitkCameraRotationController.h b/Modules/Core/include/mitkCameraRotationController.h
similarity index 100%
rename from Modules/Core/Controllers/mitkCameraRotationController.h
rename to Modules/Core/include/mitkCameraRotationController.h
diff --git a/Modules/Core/DataManagement/mitkChannelDescriptor.h b/Modules/Core/include/mitkChannelDescriptor.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkChannelDescriptor.h
rename to Modules/Core/include/mitkChannelDescriptor.h
diff --git a/Modules/Core/Algorithms/mitkClippedSurfaceBoundsCalculator.h b/Modules/Core/include/mitkClippedSurfaceBoundsCalculator.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkClippedSurfaceBoundsCalculator.h
rename to Modules/Core/include/mitkClippedSurfaceBoundsCalculator.h
diff --git a/Modules/Core/DataManagement/mitkClippingProperty.h b/Modules/Core/include/mitkClippingProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkClippingProperty.h
rename to Modules/Core/include/mitkClippingProperty.h
diff --git a/Modules/Core/DataManagement/mitkColorProperty.h b/Modules/Core/include/mitkColorProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkColorProperty.h
rename to Modules/Core/include/mitkColorProperty.h
diff --git a/Modules/Core/Common/mitkCommon.h b/Modules/Core/include/mitkCommon.h
similarity index 100%
rename from Modules/Core/Common/mitkCommon.h
rename to Modules/Core/include/mitkCommon.h
diff --git a/Modules/Core/Algorithms/mitkCompareImageDataFilter.h b/Modules/Core/include/mitkCompareImageDataFilter.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkCompareImageDataFilter.h
rename to Modules/Core/include/mitkCompareImageDataFilter.h
diff --git a/Modules/Core/Algorithms/mitkConvert2Dto3DImageFilter.h b/Modules/Core/include/mitkConvert2Dto3DImageFilter.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkConvert2Dto3DImageFilter.h
rename to Modules/Core/include/mitkConvert2Dto3DImageFilter.h
diff --git a/Modules/Core/Interactions/mitkCoordinateSupplier.h b/Modules/Core/include/mitkCoordinateSupplier.h
similarity index 100%
rename from Modules/Core/Interactions/mitkCoordinateSupplier.h
rename to Modules/Core/include/mitkCoordinateSupplier.h
diff --git a/Modules/Core/Common/mitkCoreObjectFactory.h b/Modules/Core/include/mitkCoreObjectFactory.h
similarity index 100%
rename from Modules/Core/Common/mitkCoreObjectFactory.h
rename to Modules/Core/include/mitkCoreObjectFactory.h
diff --git a/Modules/Core/Common/mitkCoreObjectFactoryBase.h b/Modules/Core/include/mitkCoreObjectFactoryBase.h
similarity index 100%
rename from Modules/Core/Common/mitkCoreObjectFactoryBase.h
rename to Modules/Core/include/mitkCoreObjectFactoryBase.h
diff --git a/Modules/Core/Common/mitkCoreServices.h b/Modules/Core/include/mitkCoreServices.h
similarity index 100%
rename from Modules/Core/Common/mitkCoreServices.h
rename to Modules/Core/include/mitkCoreServices.h
diff --git a/Modules/Core/Interactions/mitkCrosshairPositionEvent.h b/Modules/Core/include/mitkCrosshairPositionEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkCrosshairPositionEvent.h
rename to Modules/Core/include/mitkCrosshairPositionEvent.h
diff --git a/Modules/Core/IO/mitkCustomMimeType.h b/Modules/Core/include/mitkCustomMimeType.h
similarity index 100%
rename from Modules/Core/IO/mitkCustomMimeType.h
rename to Modules/Core/include/mitkCustomMimeType.h
diff --git a/Modules/Core/Interactions/mitkDataInteractor.h b/Modules/Core/include/mitkDataInteractor.h
similarity index 100%
rename from Modules/Core/Interactions/mitkDataInteractor.h
rename to Modules/Core/include/mitkDataInteractor.h
diff --git a/Modules/Core/DataManagement/mitkDataNode.h b/Modules/Core/include/mitkDataNode.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkDataNode.h
rename to Modules/Core/include/mitkDataNode.h
diff --git a/Modules/Core/Algorithms/mitkDataNodeSource.h b/Modules/Core/include/mitkDataNodeSource.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkDataNodeSource.h
rename to Modules/Core/include/mitkDataNodeSource.h
diff --git a/Modules/Core/DataManagement/mitkDataStorage.h b/Modules/Core/include/mitkDataStorage.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkDataStorage.h
rename to Modules/Core/include/mitkDataStorage.h
diff --git a/Modules/Core/IO/mitkDicomSeriesReader.h b/Modules/Core/include/mitkDicomSeriesReader.h
similarity index 100%
rename from Modules/Core/IO/mitkDicomSeriesReader.h
rename to Modules/Core/include/mitkDicomSeriesReader.h
diff --git a/Modules/Core/IO/mitkDicomSeriesReader.txx b/Modules/Core/include/mitkDicomSeriesReader.txx
similarity index 100%
rename from Modules/Core/IO/mitkDicomSeriesReader.txx
rename to Modules/Core/include/mitkDicomSeriesReader.txx
diff --git a/Modules/Core/Interactions/mitkDispatcher.h b/Modules/Core/include/mitkDispatcher.h
similarity index 100%
rename from Modules/Core/Interactions/mitkDispatcher.h
rename to Modules/Core/include/mitkDispatcher.h
diff --git a/Modules/Core/Interactions/mitkDisplayCoordinateOperation.h b/Modules/Core/include/mitkDisplayCoordinateOperation.h
similarity index 100%
rename from Modules/Core/Interactions/mitkDisplayCoordinateOperation.h
rename to Modules/Core/include/mitkDisplayCoordinateOperation.h
diff --git a/Modules/Core/DataManagement/mitkDisplayGeometry.h b/Modules/Core/include/mitkDisplayGeometry.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkDisplayGeometry.h
rename to Modules/Core/include/mitkDisplayGeometry.h
diff --git a/Modules/Core/Interactions/mitkDisplayInteractor.h b/Modules/Core/include/mitkDisplayInteractor.h
similarity index 100%
rename from Modules/Core/Interactions/mitkDisplayInteractor.h
rename to Modules/Core/include/mitkDisplayInteractor.h
diff --git a/Modules/Core/Interactions/mitkDisplayPositionEvent.h b/Modules/Core/include/mitkDisplayPositionEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkDisplayPositionEvent.h
rename to Modules/Core/include/mitkDisplayPositionEvent.h
diff --git a/Modules/Core/Interactions/mitkDisplayVectorInteractorLevelWindow.h b/Modules/Core/include/mitkDisplayVectorInteractorLevelWindow.h
similarity index 100%
rename from Modules/Core/Interactions/mitkDisplayVectorInteractorLevelWindow.h
rename to Modules/Core/include/mitkDisplayVectorInteractorLevelWindow.h
diff --git a/Modules/Core/Interactions/mitkDisplayVectorInteractorScroll.h b/Modules/Core/include/mitkDisplayVectorInteractorScroll.h
similarity index 100%
rename from Modules/Core/Interactions/mitkDisplayVectorInteractorScroll.h
rename to Modules/Core/include/mitkDisplayVectorInteractorScroll.h
diff --git a/Modules/Core/DataManagement/mitkEnumerationProperty.h b/Modules/Core/include/mitkEnumerationProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkEnumerationProperty.h
rename to Modules/Core/include/mitkEnumerationProperty.h
diff --git a/Modules/Core/DataManagement/mitkEqual.h b/Modules/Core/include/mitkEqual.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkEqual.h
rename to Modules/Core/include/mitkEqual.h
diff --git a/Modules/Core/Interactions/mitkEvent.h b/Modules/Core/include/mitkEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkEvent.h
rename to Modules/Core/include/mitkEvent.h
diff --git a/Modules/Core/Interactions/mitkEventConfig.h b/Modules/Core/include/mitkEventConfig.h
similarity index 100%
rename from Modules/Core/Interactions/mitkEventConfig.h
rename to Modules/Core/include/mitkEventConfig.h
diff --git a/Modules/Core/Interactions/mitkEventDescription.h b/Modules/Core/include/mitkEventDescription.h
similarity index 100%
rename from Modules/Core/Interactions/mitkEventDescription.h
rename to Modules/Core/include/mitkEventDescription.h
diff --git a/Modules/Core/Interactions/mitkEventFactory.h b/Modules/Core/include/mitkEventFactory.h
similarity index 100%
rename from Modules/Core/Interactions/mitkEventFactory.h
rename to Modules/Core/include/mitkEventFactory.h
diff --git a/Modules/Core/Interactions/mitkEventInformer.h b/Modules/Core/include/mitkEventInformer.h
similarity index 100%
rename from Modules/Core/Interactions/mitkEventInformer.h
rename to Modules/Core/include/mitkEventInformer.h
diff --git a/Modules/Core/Interactions/mitkEventMapper.h b/Modules/Core/include/mitkEventMapper.h
similarity index 100%
rename from Modules/Core/Interactions/mitkEventMapper.h
rename to Modules/Core/include/mitkEventMapper.h
diff --git a/Modules/Core/Interactions/mitkEventMapperAddOn.h b/Modules/Core/include/mitkEventMapperAddOn.h
similarity index 100%
rename from Modules/Core/Interactions/mitkEventMapperAddOn.h
rename to Modules/Core/include/mitkEventMapperAddOn.h
diff --git a/Modules/Core/Interactions/mitkEventRecorder.h b/Modules/Core/include/mitkEventRecorder.h
similarity index 100%
rename from Modules/Core/Interactions/mitkEventRecorder.h
rename to Modules/Core/include/mitkEventRecorder.h
diff --git a/Modules/Core/Interactions/mitkEventStateMachine.h b/Modules/Core/include/mitkEventStateMachine.h
similarity index 100%
rename from Modules/Core/Interactions/mitkEventStateMachine.h
rename to Modules/Core/include/mitkEventStateMachine.h
diff --git a/Modules/Core/Common/mitkException.h b/Modules/Core/include/mitkException.h
similarity index 100%
rename from Modules/Core/Common/mitkException.h
rename to Modules/Core/include/mitkException.h
diff --git a/Modules/Core/Common/mitkExceptionMacro.h b/Modules/Core/include/mitkExceptionMacro.h
similarity index 100%
rename from Modules/Core/Common/mitkExceptionMacro.h
rename to Modules/Core/include/mitkExceptionMacro.h
diff --git a/Modules/Core/Algorithms/mitkExtractSliceFilter.h b/Modules/Core/include/mitkExtractSliceFilter.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkExtractSliceFilter.h
rename to Modules/Core/include/mitkExtractSliceFilter.h
diff --git a/Modules/Core/IO/mitkFileReader.h b/Modules/Core/include/mitkFileReader.h
similarity index 100%
rename from Modules/Core/IO/mitkFileReader.h
rename to Modules/Core/include/mitkFileReader.h
diff --git a/Modules/Core/IO/mitkFileReaderRegistry.h b/Modules/Core/include/mitkFileReaderRegistry.h
similarity index 100%
rename from Modules/Core/IO/mitkFileReaderRegistry.h
rename to Modules/Core/include/mitkFileReaderRegistry.h
diff --git a/Modules/Core/IO/mitkFileReaderSelector.h b/Modules/Core/include/mitkFileReaderSelector.h
similarity index 100%
rename from Modules/Core/IO/mitkFileReaderSelector.h
rename to Modules/Core/include/mitkFileReaderSelector.h
diff --git a/Modules/Core/IO/mitkFileWriter.h b/Modules/Core/include/mitkFileWriter.h
similarity index 100%
rename from Modules/Core/IO/mitkFileWriter.h
rename to Modules/Core/include/mitkFileWriter.h
diff --git a/Modules/Core/IO/mitkFileWriterRegistry.h b/Modules/Core/include/mitkFileWriterRegistry.h
similarity index 100%
rename from Modules/Core/IO/mitkFileWriterRegistry.h
rename to Modules/Core/include/mitkFileWriterRegistry.h
diff --git a/Modules/Core/IO/mitkFileWriterSelector.h b/Modules/Core/include/mitkFileWriterSelector.h
similarity index 100%
rename from Modules/Core/IO/mitkFileWriterSelector.h
rename to Modules/Core/include/mitkFileWriterSelector.h
diff --git a/Modules/Core/IO/mitkFileWriterWithInformation.h b/Modules/Core/include/mitkFileWriterWithInformation.h
similarity index 100%
rename from Modules/Core/IO/mitkFileWriterWithInformation.h
rename to Modules/Core/include/mitkFileWriterWithInformation.h
diff --git a/Modules/Core/DataManagement/mitkFloatPropertyExtension.h b/Modules/Core/include/mitkFloatPropertyExtension.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkFloatPropertyExtension.h
rename to Modules/Core/include/mitkFloatPropertyExtension.h
diff --git a/Modules/Core/Controllers/mitkFocusManager.h b/Modules/Core/include/mitkFocusManager.h
similarity index 100%
rename from Modules/Core/Controllers/mitkFocusManager.h
rename to Modules/Core/include/mitkFocusManager.h
diff --git a/Modules/Core/DataManagement/mitkGenericLookupTable.h b/Modules/Core/include/mitkGenericLookupTable.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkGenericLookupTable.h
rename to Modules/Core/include/mitkGenericLookupTable.h
diff --git a/Modules/Core/DataManagement/mitkGenericProperty.h b/Modules/Core/include/mitkGenericProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkGenericProperty.h
rename to Modules/Core/include/mitkGenericProperty.h
diff --git a/Modules/Core/DataManagement/mitkGeometry3D.h b/Modules/Core/include/mitkGeometry3D.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkGeometry3D.h
rename to Modules/Core/include/mitkGeometry3D.h
diff --git a/Modules/Core/DataManagement/mitkGeometryData.h b/Modules/Core/include/mitkGeometryData.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkGeometryData.h
rename to Modules/Core/include/mitkGeometryData.h
diff --git a/Modules/Core/DataManagement/mitkGeometryTransformHolder.h b/Modules/Core/include/mitkGeometryTransformHolder.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkGeometryTransformHolder.h
rename to Modules/Core/include/mitkGeometryTransformHolder.h
diff --git a/Modules/Core/Common/mitkGetClassHierarchy.h b/Modules/Core/include/mitkGetClassHierarchy.h
similarity index 100%
rename from Modules/Core/Common/mitkGetClassHierarchy.h
rename to Modules/Core/include/mitkGetClassHierarchy.h
diff --git a/Modules/Core/Interactions/mitkGlobalInteraction.h b/Modules/Core/include/mitkGlobalInteraction.h
similarity index 100%
rename from Modules/Core/Interactions/mitkGlobalInteraction.h
rename to Modules/Core/include/mitkGlobalInteraction.h
diff --git a/Modules/Core/Rendering/mitkGradientBackground.h b/Modules/Core/include/mitkGradientBackground.h
similarity index 100%
rename from Modules/Core/Rendering/mitkGradientBackground.h
rename to Modules/Core/include/mitkGradientBackground.h
diff --git a/Modules/Core/DataManagement/mitkGroupTagProperty.h b/Modules/Core/include/mitkGroupTagProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkGroupTagProperty.h
rename to Modules/Core/include/mitkGroupTagProperty.h
diff --git a/Modules/Core/Algorithms/mitkHistogramGenerator.h b/Modules/Core/include/mitkHistogramGenerator.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkHistogramGenerator.h
rename to Modules/Core/include/mitkHistogramGenerator.h
diff --git a/Modules/Core/Interfaces/mitkIDataNodeReader.h b/Modules/Core/include/mitkIDataNodeReader.h
similarity index 100%
rename from Modules/Core/Interfaces/mitkIDataNodeReader.h
rename to Modules/Core/include/mitkIDataNodeReader.h
diff --git a/Modules/Core/IO/mitkIFileIO.h b/Modules/Core/include/mitkIFileIO.h
similarity index 100%
rename from Modules/Core/IO/mitkIFileIO.h
rename to Modules/Core/include/mitkIFileIO.h
diff --git a/Modules/Core/Interfaces/mitkIFileReader.h b/Modules/Core/include/mitkIFileReader.h
similarity index 100%
rename from Modules/Core/Interfaces/mitkIFileReader.h
rename to Modules/Core/include/mitkIFileReader.h
diff --git a/Modules/Core/Interfaces/mitkIFileWriter.h b/Modules/Core/include/mitkIFileWriter.h
similarity index 100%
rename from Modules/Core/Interfaces/mitkIFileWriter.h
rename to Modules/Core/include/mitkIFileWriter.h
diff --git a/Modules/Core/Interfaces/mitkIMimeTypeProvider.h b/Modules/Core/include/mitkIMimeTypeProvider.h
similarity index 100%
rename from Modules/Core/Interfaces/mitkIMimeTypeProvider.h
rename to Modules/Core/include/mitkIMimeTypeProvider.h
diff --git a/Modules/Core/IO/mitkIOAdapter.h b/Modules/Core/include/mitkIOAdapter.h
similarity index 100%
rename from Modules/Core/IO/mitkIOAdapter.h
rename to Modules/Core/include/mitkIOAdapter.h
diff --git a/Modules/Core/IO/mitkIOConstants.h b/Modules/Core/include/mitkIOConstants.h
similarity index 100%
rename from Modules/Core/IO/mitkIOConstants.h
rename to Modules/Core/include/mitkIOConstants.h
diff --git a/Modules/Core/IO/mitkIOMimeTypes.h b/Modules/Core/include/mitkIOMimeTypes.h
similarity index 100%
rename from Modules/Core/IO/mitkIOMimeTypes.h
rename to Modules/Core/include/mitkIOMimeTypes.h
diff --git a/Modules/Core/IO/mitkIOUtil.h b/Modules/Core/include/mitkIOUtil.h
similarity index 100%
rename from Modules/Core/IO/mitkIOUtil.h
rename to Modules/Core/include/mitkIOUtil.h
diff --git a/Modules/Core/Interfaces/mitkIPersistenceService.h b/Modules/Core/include/mitkIPersistenceService.h
similarity index 100%
rename from Modules/Core/Interfaces/mitkIPersistenceService.h
rename to Modules/Core/include/mitkIPersistenceService.h
diff --git a/Modules/Core/Interfaces/mitkIPropertyAliases.h b/Modules/Core/include/mitkIPropertyAliases.h
similarity index 100%
rename from Modules/Core/Interfaces/mitkIPropertyAliases.h
rename to Modules/Core/include/mitkIPropertyAliases.h
diff --git a/Modules/Core/Interfaces/mitkIPropertyDescriptions.h b/Modules/Core/include/mitkIPropertyDescriptions.h
similarity index 100%
rename from Modules/Core/Interfaces/mitkIPropertyDescriptions.h
rename to Modules/Core/include/mitkIPropertyDescriptions.h
diff --git a/Modules/Core/Interfaces/mitkIPropertyExtensions.h b/Modules/Core/include/mitkIPropertyExtensions.h
similarity index 100%
rename from Modules/Core/Interfaces/mitkIPropertyExtensions.h
rename to Modules/Core/include/mitkIPropertyExtensions.h
diff --git a/Modules/Core/Interfaces/mitkIPropertyFilters.h b/Modules/Core/include/mitkIPropertyFilters.h
similarity index 100%
rename from Modules/Core/Interfaces/mitkIPropertyFilters.h
rename to Modules/Core/include/mitkIPropertyFilters.h
diff --git a/Modules/Core/Interfaces/mitkIShaderRepository.h b/Modules/Core/include/mitkIShaderRepository.h
similarity index 100%
rename from Modules/Core/Interfaces/mitkIShaderRepository.h
rename to Modules/Core/include/mitkIShaderRepository.h
diff --git a/Modules/Core/DataManagement/mitkITKImageImport.h b/Modules/Core/include/mitkITKImageImport.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkITKImageImport.h
rename to Modules/Core/include/mitkITKImageImport.h
diff --git a/Modules/Core/DataManagement/mitkITKImageImport.txx b/Modules/Core/include/mitkITKImageImport.txx
similarity index 100%
rename from Modules/Core/DataManagement/mitkITKImageImport.txx
rename to Modules/Core/include/mitkITKImageImport.txx
diff --git a/Modules/Core/DataManagement/mitkImage.h b/Modules/Core/include/mitkImage.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImage.h
rename to Modules/Core/include/mitkImage.h
diff --git a/Modules/Core/DataManagement/mitkImageAccessByItk.h b/Modules/Core/include/mitkImageAccessByItk.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageAccessByItk.h
rename to Modules/Core/include/mitkImageAccessByItk.h
diff --git a/Modules/Core/DataManagement/mitkImageAccessorBase.h b/Modules/Core/include/mitkImageAccessorBase.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageAccessorBase.h
rename to Modules/Core/include/mitkImageAccessorBase.h
diff --git a/Modules/Core/DataManagement/mitkImageCast.h b/Modules/Core/include/mitkImageCast.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageCast.h
rename to Modules/Core/include/mitkImageCast.h
diff --git a/Modules/Core/DataManagement/mitkImageCast.txx b/Modules/Core/include/mitkImageCast.txx
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageCast.txx
rename to Modules/Core/include/mitkImageCast.txx
diff --git a/Modules/Core/DataManagement/mitkImageCaster.h b/Modules/Core/include/mitkImageCaster.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageCaster.h
rename to Modules/Core/include/mitkImageCaster.h
diff --git a/Modules/Core/Algorithms/mitkImageChannelSelector.h b/Modules/Core/include/mitkImageChannelSelector.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkImageChannelSelector.h
rename to Modules/Core/include/mitkImageChannelSelector.h
diff --git a/Modules/Core/DataManagement/mitkImageDataItem.h b/Modules/Core/include/mitkImageDataItem.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageDataItem.h
rename to Modules/Core/include/mitkImageDataItem.h
diff --git a/Modules/Core/DataManagement/mitkImageDescriptor.h b/Modules/Core/include/mitkImageDescriptor.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageDescriptor.h
rename to Modules/Core/include/mitkImageDescriptor.h
diff --git a/Modules/Core/IO/mitkImageGenerator.h b/Modules/Core/include/mitkImageGenerator.h
similarity index 100%
rename from Modules/Core/IO/mitkImageGenerator.h
rename to Modules/Core/include/mitkImageGenerator.h
diff --git a/Modules/Core/DataManagement/mitkImagePixelAccessor.h b/Modules/Core/include/mitkImagePixelAccessor.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImagePixelAccessor.h
rename to Modules/Core/include/mitkImagePixelAccessor.h
diff --git a/Modules/Core/DataManagement/mitkImagePixelReadAccessor.h b/Modules/Core/include/mitkImagePixelReadAccessor.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImagePixelReadAccessor.h
rename to Modules/Core/include/mitkImagePixelReadAccessor.h
diff --git a/Modules/Core/DataManagement/mitkImagePixelWriteAccessor.h b/Modules/Core/include/mitkImagePixelWriteAccessor.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImagePixelWriteAccessor.h
rename to Modules/Core/include/mitkImagePixelWriteAccessor.h
diff --git a/Modules/Core/DataManagement/mitkImageReadAccessor.h b/Modules/Core/include/mitkImageReadAccessor.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageReadAccessor.h
rename to Modules/Core/include/mitkImageReadAccessor.h
diff --git a/Modules/Core/Algorithms/mitkImageSliceSelector.h b/Modules/Core/include/mitkImageSliceSelector.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkImageSliceSelector.h
rename to Modules/Core/include/mitkImageSliceSelector.h
diff --git a/Modules/Core/Algorithms/mitkImageSource.h b/Modules/Core/include/mitkImageSource.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkImageSource.h
rename to Modules/Core/include/mitkImageSource.h
diff --git a/Modules/Core/DataManagement/mitkImageStatisticsHolder.h b/Modules/Core/include/mitkImageStatisticsHolder.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageStatisticsHolder.h
rename to Modules/Core/include/mitkImageStatisticsHolder.h
diff --git a/Modules/Core/Algorithms/mitkImageTimeSelector.h b/Modules/Core/include/mitkImageTimeSelector.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkImageTimeSelector.h
rename to Modules/Core/include/mitkImageTimeSelector.h
diff --git a/Modules/Core/Algorithms/mitkImageToImageFilter.h b/Modules/Core/include/mitkImageToImageFilter.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkImageToImageFilter.h
rename to Modules/Core/include/mitkImageToImageFilter.h
diff --git a/Modules/Core/DataManagement/mitkImageToItk.h b/Modules/Core/include/mitkImageToItk.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageToItk.h
rename to Modules/Core/include/mitkImageToItk.h
diff --git a/Modules/Core/DataManagement/mitkImageToItk.txx b/Modules/Core/include/mitkImageToItk.txx
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageToItk.txx
rename to Modules/Core/include/mitkImageToItk.txx
diff --git a/Modules/Core/Algorithms/mitkImageToSurfaceFilter.h b/Modules/Core/include/mitkImageToSurfaceFilter.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkImageToSurfaceFilter.h
rename to Modules/Core/include/mitkImageToSurfaceFilter.h
diff --git a/Modules/Core/DataManagement/mitkImageVtkAccessor.h b/Modules/Core/include/mitkImageVtkAccessor.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageVtkAccessor.h
rename to Modules/Core/include/mitkImageVtkAccessor.h
diff --git a/Modules/Core/Rendering/mitkImageVtkMapper2D.h b/Modules/Core/include/mitkImageVtkMapper2D.h
similarity index 100%
rename from Modules/Core/Rendering/mitkImageVtkMapper2D.h
rename to Modules/Core/include/mitkImageVtkMapper2D.h
diff --git a/Modules/Core/DataManagement/mitkImageVtkReadAccessor.h b/Modules/Core/include/mitkImageVtkReadAccessor.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageVtkReadAccessor.h
rename to Modules/Core/include/mitkImageVtkReadAccessor.h
diff --git a/Modules/Core/DataManagement/mitkImageVtkWriteAccessor.h b/Modules/Core/include/mitkImageVtkWriteAccessor.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageVtkWriteAccessor.h
rename to Modules/Core/include/mitkImageVtkWriteAccessor.h
diff --git a/Modules/Core/DataManagement/mitkImageWriteAccessor.h b/Modules/Core/include/mitkImageWriteAccessor.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageWriteAccessor.h
rename to Modules/Core/include/mitkImageWriteAccessor.h
diff --git a/Modules/Core/Algorithms/mitkInstantiateAccessFunctions.h b/Modules/Core/include/mitkInstantiateAccessFunctions.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkInstantiateAccessFunctions.h
rename to Modules/Core/include/mitkInstantiateAccessFunctions.h
diff --git a/Modules/Core/DataManagement/mitkIntPropertyExtension.h b/Modules/Core/include/mitkIntPropertyExtension.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkIntPropertyExtension.h
rename to Modules/Core/include/mitkIntPropertyExtension.h
diff --git a/Modules/Core/Interactions/mitkInteractionConst.h b/Modules/Core/include/mitkInteractionConst.h
similarity index 100%
rename from Modules/Core/Interactions/mitkInteractionConst.h
rename to Modules/Core/include/mitkInteractionConst.h
diff --git a/Modules/Core/Interactions/mitkInteractionEvent.h b/Modules/Core/include/mitkInteractionEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkInteractionEvent.h
rename to Modules/Core/include/mitkInteractionEvent.h
diff --git a/Modules/Core/Interactions/mitkInteractionEventConst.h b/Modules/Core/include/mitkInteractionEventConst.h
similarity index 100%
rename from Modules/Core/Interactions/mitkInteractionEventConst.h
rename to Modules/Core/include/mitkInteractionEventConst.h
diff --git a/Modules/Core/Interactions/mitkInteractionEventHandler.h b/Modules/Core/include/mitkInteractionEventHandler.h
similarity index 100%
rename from Modules/Core/Interactions/mitkInteractionEventHandler.h
rename to Modules/Core/include/mitkInteractionEventHandler.h
diff --git a/Modules/Core/Interfaces/mitkInteractionEventObserver.h b/Modules/Core/include/mitkInteractionEventObserver.h
similarity index 100%
rename from Modules/Core/Interfaces/mitkInteractionEventObserver.h
rename to Modules/Core/include/mitkInteractionEventObserver.h
diff --git a/Modules/Core/Interactions/mitkInteractionKeyEvent.h b/Modules/Core/include/mitkInteractionKeyEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkInteractionKeyEvent.h
rename to Modules/Core/include/mitkInteractionKeyEvent.h
diff --git a/Modules/Core/Interactions/mitkInteractionPositionEvent.h b/Modules/Core/include/mitkInteractionPositionEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkInteractionPositionEvent.h
rename to Modules/Core/include/mitkInteractionPositionEvent.h
diff --git a/Modules/Core/Interactions/mitkInteractor.h b/Modules/Core/include/mitkInteractor.h
similarity index 100%
rename from Modules/Core/Interactions/mitkInteractor.h
rename to Modules/Core/include/mitkInteractor.h
diff --git a/Modules/Core/Interactions/mitkInternalEvent.h b/Modules/Core/include/mitkInternalEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkInternalEvent.h
rename to Modules/Core/include/mitkInternalEvent.h
diff --git a/Modules/Core/IO/mitkItkLoggingAdapter.h b/Modules/Core/include/mitkItkLoggingAdapter.h
similarity index 100%
rename from Modules/Core/IO/mitkItkLoggingAdapter.h
rename to Modules/Core/include/mitkItkLoggingAdapter.h
diff --git a/Modules/Core/DataManagement/mitkItkMatrixHack.h b/Modules/Core/include/mitkItkMatrixHack.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkItkMatrixHack.h
rename to Modules/Core/include/mitkItkMatrixHack.h
diff --git a/Modules/Core/Interactions/mitkKeyEvent.h b/Modules/Core/include/mitkKeyEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkKeyEvent.h
rename to Modules/Core/include/mitkKeyEvent.h
diff --git a/Modules/Core/DataManagement/mitkLandmarkProjector.h b/Modules/Core/include/mitkLandmarkProjector.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkLandmarkProjector.h
rename to Modules/Core/include/mitkLandmarkProjector.h
diff --git a/Modules/Core/DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.h b/Modules/Core/include/mitkLandmarkProjectorBasedCurvedGeometry.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.h
rename to Modules/Core/include/mitkLandmarkProjectorBasedCurvedGeometry.h
diff --git a/Modules/Core/DataManagement/mitkLevelWindow.h b/Modules/Core/include/mitkLevelWindow.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkLevelWindow.h
rename to Modules/Core/include/mitkLevelWindow.h
diff --git a/Modules/Core/DataManagement/mitkLevelWindowManager.h b/Modules/Core/include/mitkLevelWindowManager.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkLevelWindowManager.h
rename to Modules/Core/include/mitkLevelWindowManager.h
diff --git a/Modules/Core/DataManagement/mitkLevelWindowPreset.h b/Modules/Core/include/mitkLevelWindowPreset.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkLevelWindowPreset.h
rename to Modules/Core/include/mitkLevelWindowPreset.h
diff --git a/Modules/Core/DataManagement/mitkLevelWindowProperty.h b/Modules/Core/include/mitkLevelWindowProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkLevelWindowProperty.h
rename to Modules/Core/include/mitkLevelWindowProperty.h
diff --git a/Modules/Core/Controllers/mitkLimitedLinearUndo.h b/Modules/Core/include/mitkLimitedLinearUndo.h
similarity index 100%
rename from Modules/Core/Controllers/mitkLimitedLinearUndo.h
rename to Modules/Core/include/mitkLimitedLinearUndo.h
diff --git a/Modules/Core/DataManagement/mitkLine.h b/Modules/Core/include/mitkLine.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkLine.h
rename to Modules/Core/include/mitkLine.h
diff --git a/Modules/Core/Rendering/mitkLocalStorageHandler.h b/Modules/Core/include/mitkLocalStorageHandler.h
similarity index 100%
rename from Modules/Core/Rendering/mitkLocalStorageHandler.h
rename to Modules/Core/include/mitkLocalStorageHandler.h
diff --git a/Modules/Core/IO/mitkLocaleSwitch.h b/Modules/Core/include/mitkLocaleSwitch.h
similarity index 100%
rename from Modules/Core/IO/mitkLocaleSwitch.h
rename to Modules/Core/include/mitkLocaleSwitch.h
diff --git a/Modules/Core/IO/mitkLog.h b/Modules/Core/include/mitkLog.h
similarity index 100%
rename from Modules/Core/IO/mitkLog.h
rename to Modules/Core/include/mitkLog.h
diff --git a/Modules/Core/IO/mitkLogMacros.h b/Modules/Core/include/mitkLogMacros.h
similarity index 100%
rename from Modules/Core/IO/mitkLogMacros.h
rename to Modules/Core/include/mitkLogMacros.h
diff --git a/Modules/Core/DataManagement/mitkLookupTable.h b/Modules/Core/include/mitkLookupTable.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkLookupTable.h
rename to Modules/Core/include/mitkLookupTable.h
diff --git a/Modules/Core/DataManagement/mitkLookupTableProperty.h b/Modules/Core/include/mitkLookupTableProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkLookupTableProperty.h
rename to Modules/Core/include/mitkLookupTableProperty.h
diff --git a/Modules/Core/DataManagement/mitkLookupTables.h b/Modules/Core/include/mitkLookupTables.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkLookupTables.h
rename to Modules/Core/include/mitkLookupTables.h
diff --git a/Modules/Core/Rendering/mitkManufacturerLogo.h b/Modules/Core/include/mitkManufacturerLogo.h
similarity index 100%
rename from Modules/Core/Rendering/mitkManufacturerLogo.h
rename to Modules/Core/include/mitkManufacturerLogo.h
diff --git a/Modules/Core/Rendering/mitkMapper.h b/Modules/Core/include/mitkMapper.h
similarity index 100%
rename from Modules/Core/Rendering/mitkMapper.h
rename to Modules/Core/include/mitkMapper.h
diff --git a/Modules/Core/DataManagement/mitkMaterial.h b/Modules/Core/include/mitkMaterial.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkMaterial.h
rename to Modules/Core/include/mitkMaterial.h
diff --git a/Modules/Core/DataManagement/mitkMatrix.h b/Modules/Core/include/mitkMatrix.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkMatrix.h
rename to Modules/Core/include/mitkMatrix.h
diff --git a/Modules/Core/DataManagement/mitkMatrixConvert.h b/Modules/Core/include/mitkMatrixConvert.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkMatrixConvert.h
rename to Modules/Core/include/mitkMatrixConvert.h
diff --git a/Modules/Core/DataManagement/mitkMemoryUtilities.h b/Modules/Core/include/mitkMemoryUtilities.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkMemoryUtilities.h
rename to Modules/Core/include/mitkMemoryUtilities.h
diff --git a/Modules/Core/Interactions/mitkMessage.h b/Modules/Core/include/mitkMessage.h
similarity index 100%
rename from Modules/Core/Interactions/mitkMessage.h
rename to Modules/Core/include/mitkMessage.h
diff --git a/Modules/Core/IO/mitkMimeType.h b/Modules/Core/include/mitkMimeType.h
similarity index 100%
rename from Modules/Core/IO/mitkMimeType.h
rename to Modules/Core/include/mitkMimeType.h
diff --git a/Modules/Core/DataManagement/mitkModalityProperty.h b/Modules/Core/include/mitkModalityProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkModalityProperty.h
rename to Modules/Core/include/mitkModalityProperty.h
diff --git a/Modules/Core/DataManagement/mitkModeOperation.h b/Modules/Core/include/mitkModeOperation.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkModeOperation.h
rename to Modules/Core/include/mitkModeOperation.h
diff --git a/Modules/Core/DataManagement/mitkModifiedLock.h b/Modules/Core/include/mitkModifiedLock.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkModifiedLock.h
rename to Modules/Core/include/mitkModifiedLock.h
diff --git a/Modules/Core/Interactions/mitkMouseDoubleClickEvent.h b/Modules/Core/include/mitkMouseDoubleClickEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkMouseDoubleClickEvent.h
rename to Modules/Core/include/mitkMouseDoubleClickEvent.h
diff --git a/Modules/Core/Interactions/mitkMouseModeSwitcher.h b/Modules/Core/include/mitkMouseModeSwitcher.h
similarity index 100%
rename from Modules/Core/Interactions/mitkMouseModeSwitcher.h
rename to Modules/Core/include/mitkMouseModeSwitcher.h
diff --git a/Modules/Core/Interactions/mitkMouseMoveEvent.h b/Modules/Core/include/mitkMouseMoveEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkMouseMoveEvent.h
rename to Modules/Core/include/mitkMouseMoveEvent.h
diff --git a/Modules/Core/Interactions/mitkMouseMovePointSetInteractor.h b/Modules/Core/include/mitkMouseMovePointSetInteractor.h
similarity index 100%
rename from Modules/Core/Interactions/mitkMouseMovePointSetInteractor.h
rename to Modules/Core/include/mitkMouseMovePointSetInteractor.h
diff --git a/Modules/Core/Interactions/mitkMousePressEvent.h b/Modules/Core/include/mitkMousePressEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkMousePressEvent.h
rename to Modules/Core/include/mitkMousePressEvent.h
diff --git a/Modules/Core/Interactions/mitkMouseReleaseEvent.h b/Modules/Core/include/mitkMouseReleaseEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkMouseReleaseEvent.h
rename to Modules/Core/include/mitkMouseReleaseEvent.h
diff --git a/Modules/Core/Interactions/mitkMouseWheelEvent.h b/Modules/Core/include/mitkMouseWheelEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkMouseWheelEvent.h
rename to Modules/Core/include/mitkMouseWheelEvent.h
diff --git a/Modules/Core/Interactions/mitkMoveBaseDataInteractor.h b/Modules/Core/include/mitkMoveBaseDataInteractor.h
similarity index 100%
rename from Modules/Core/Interactions/mitkMoveBaseDataInteractor.h
rename to Modules/Core/include/mitkMoveBaseDataInteractor.h
diff --git a/Modules/Core/Interactions/mitkMoveSurfaceInteractor.h b/Modules/Core/include/mitkMoveSurfaceInteractor.h
similarity index 100%
rename from Modules/Core/Interactions/mitkMoveSurfaceInteractor.h
rename to Modules/Core/include/mitkMoveSurfaceInteractor.h
diff --git a/Modules/Core/Algorithms/mitkMultiComponentImageDataComparisonFilter.h b/Modules/Core/include/mitkMultiComponentImageDataComparisonFilter.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkMultiComponentImageDataComparisonFilter.h
rename to Modules/Core/include/mitkMultiComponentImageDataComparisonFilter.h
diff --git a/Modules/Core/Interactions/mitkNodeDepententPointSetInteractor.h b/Modules/Core/include/mitkNodeDepententPointSetInteractor.h
similarity index 100%
rename from Modules/Core/Interactions/mitkNodeDepententPointSetInteractor.h
rename to Modules/Core/include/mitkNodeDepententPointSetInteractor.h
diff --git a/Modules/Core/DataManagement/mitkNodePredicateAnd.h b/Modules/Core/include/mitkNodePredicateAnd.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateAnd.h
rename to Modules/Core/include/mitkNodePredicateAnd.h
diff --git a/Modules/Core/DataManagement/mitkNodePredicateBase.h b/Modules/Core/include/mitkNodePredicateBase.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateBase.h
rename to Modules/Core/include/mitkNodePredicateBase.h
diff --git a/Modules/Core/DataManagement/mitkNodePredicateCompositeBase.h b/Modules/Core/include/mitkNodePredicateCompositeBase.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateCompositeBase.h
rename to Modules/Core/include/mitkNodePredicateCompositeBase.h
diff --git a/Modules/Core/DataManagement/mitkNodePredicateData.h b/Modules/Core/include/mitkNodePredicateData.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateData.h
rename to Modules/Core/include/mitkNodePredicateData.h
diff --git a/Modules/Core/DataManagement/mitkNodePredicateDataType.h b/Modules/Core/include/mitkNodePredicateDataType.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateDataType.h
rename to Modules/Core/include/mitkNodePredicateDataType.h
diff --git a/Modules/Core/DataManagement/mitkNodePredicateDimension.h b/Modules/Core/include/mitkNodePredicateDimension.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateDimension.h
rename to Modules/Core/include/mitkNodePredicateDimension.h
diff --git a/Modules/Core/DataManagement/mitkNodePredicateFirstLevel.h b/Modules/Core/include/mitkNodePredicateFirstLevel.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateFirstLevel.h
rename to Modules/Core/include/mitkNodePredicateFirstLevel.h
diff --git a/Modules/Core/DataManagement/mitkNodePredicateNot.h b/Modules/Core/include/mitkNodePredicateNot.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateNot.h
rename to Modules/Core/include/mitkNodePredicateNot.h
diff --git a/Modules/Core/DataManagement/mitkNodePredicateOr.h b/Modules/Core/include/mitkNodePredicateOr.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateOr.h
rename to Modules/Core/include/mitkNodePredicateOr.h
diff --git a/Modules/Core/DataManagement/mitkNodePredicateProperty.h b/Modules/Core/include/mitkNodePredicateProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateProperty.h
rename to Modules/Core/include/mitkNodePredicateProperty.h
diff --git a/Modules/Core/DataManagement/mitkNodePredicateSource.h b/Modules/Core/include/mitkNodePredicateSource.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateSource.h
rename to Modules/Core/include/mitkNodePredicateSource.h
diff --git a/Modules/Core/DataManagement/mitkNumericConstants.h b/Modules/Core/include/mitkNumericConstants.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkNumericConstants.h
rename to Modules/Core/include/mitkNumericConstants.h
diff --git a/Modules/Core/DataManagement/mitkNumericTypes.h b/Modules/Core/include/mitkNumericTypes.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkNumericTypes.h
rename to Modules/Core/include/mitkNumericTypes.h
diff --git a/Modules/Core/IO/mitkOperation.h b/Modules/Core/include/mitkOperation.h
similarity index 100%
rename from Modules/Core/IO/mitkOperation.h
rename to Modules/Core/include/mitkOperation.h
diff --git a/Modules/Core/IO/mitkOperationActor.h b/Modules/Core/include/mitkOperationActor.h
similarity index 100%
rename from Modules/Core/IO/mitkOperationActor.h
rename to Modules/Core/include/mitkOperationActor.h
diff --git a/Modules/Core/Controllers/mitkOperationEvent.h b/Modules/Core/include/mitkOperationEvent.h
similarity index 100%
rename from Modules/Core/Controllers/mitkOperationEvent.h
rename to Modules/Core/include/mitkOperationEvent.h
diff --git a/Modules/Core/Rendering/mitkOverlay.h b/Modules/Core/include/mitkOverlay.h
similarity index 100%
rename from Modules/Core/Rendering/mitkOverlay.h
rename to Modules/Core/include/mitkOverlay.h
diff --git a/Modules/Core/Rendering/mitkOverlayManager.h b/Modules/Core/include/mitkOverlayManager.h
similarity index 100%
rename from Modules/Core/Rendering/mitkOverlayManager.h
rename to Modules/Core/include/mitkOverlayManager.h
diff --git a/Modules/Core/Algorithms/mitkPPArgCount.h b/Modules/Core/include/mitkPPArgCount.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPArgCount.h
rename to Modules/Core/include/mitkPPArgCount.h
diff --git a/Modules/Core/Algorithms/mitkPPArithmeticDec.h b/Modules/Core/include/mitkPPArithmeticDec.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPArithmeticDec.h
rename to Modules/Core/include/mitkPPArithmeticDec.h
diff --git a/Modules/Core/Algorithms/mitkPPCat.h b/Modules/Core/include/mitkPPCat.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPCat.h
rename to Modules/Core/include/mitkPPCat.h
diff --git a/Modules/Core/Algorithms/mitkPPConfig.h b/Modules/Core/include/mitkPPConfig.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPConfig.h
rename to Modules/Core/include/mitkPPConfig.h
diff --git a/Modules/Core/Algorithms/mitkPPControlExprIIf.h b/Modules/Core/include/mitkPPControlExprIIf.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPControlExprIIf.h
rename to Modules/Core/include/mitkPPControlExprIIf.h
diff --git a/Modules/Core/Algorithms/mitkPPControlIIf.h b/Modules/Core/include/mitkPPControlIIf.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPControlIIf.h
rename to Modules/Core/include/mitkPPControlIIf.h
diff --git a/Modules/Core/Algorithms/mitkPPControlIf.h b/Modules/Core/include/mitkPPControlIf.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPControlIf.h
rename to Modules/Core/include/mitkPPControlIf.h
diff --git a/Modules/Core/Algorithms/mitkPPDebugError.h b/Modules/Core/include/mitkPPDebugError.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPDebugError.h
rename to Modules/Core/include/mitkPPDebugError.h
diff --git a/Modules/Core/Algorithms/mitkPPDetailAutoRec.h b/Modules/Core/include/mitkPPDetailAutoRec.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPDetailAutoRec.h
rename to Modules/Core/include/mitkPPDetailAutoRec.h
diff --git a/Modules/Core/Algorithms/mitkPPDetailDMCAutoRec.h b/Modules/Core/include/mitkPPDetailDMCAutoRec.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPDetailDMCAutoRec.h
rename to Modules/Core/include/mitkPPDetailDMCAutoRec.h
diff --git a/Modules/Core/Algorithms/mitkPPExpand.h b/Modules/Core/include/mitkPPExpand.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPExpand.h
rename to Modules/Core/include/mitkPPExpand.h
diff --git a/Modules/Core/Algorithms/mitkPPFacilitiesEmpty.h b/Modules/Core/include/mitkPPFacilitiesEmpty.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPFacilitiesEmpty.h
rename to Modules/Core/include/mitkPPFacilitiesEmpty.h
diff --git a/Modules/Core/Algorithms/mitkPPFacilitiesExpand.h b/Modules/Core/include/mitkPPFacilitiesExpand.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPFacilitiesExpand.h
rename to Modules/Core/include/mitkPPFacilitiesExpand.h
diff --git a/Modules/Core/Algorithms/mitkPPLogicalBool.h b/Modules/Core/include/mitkPPLogicalBool.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPLogicalBool.h
rename to Modules/Core/include/mitkPPLogicalBool.h
diff --git a/Modules/Core/Algorithms/mitkPPRepetitionDetailDMCFor.h b/Modules/Core/include/mitkPPRepetitionDetailDMCFor.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPRepetitionDetailDMCFor.h
rename to Modules/Core/include/mitkPPRepetitionDetailDMCFor.h
diff --git a/Modules/Core/Algorithms/mitkPPRepetitionDetailEDGFor.h b/Modules/Core/include/mitkPPRepetitionDetailEDGFor.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPRepetitionDetailEDGFor.h
rename to Modules/Core/include/mitkPPRepetitionDetailEDGFor.h
diff --git a/Modules/Core/Algorithms/mitkPPRepetitionDetailFor.h b/Modules/Core/include/mitkPPRepetitionDetailFor.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPRepetitionDetailFor.h
rename to Modules/Core/include/mitkPPRepetitionDetailFor.h
diff --git a/Modules/Core/Algorithms/mitkPPRepetitionDetailMSVCFor.h b/Modules/Core/include/mitkPPRepetitionDetailMSVCFor.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPRepetitionDetailMSVCFor.h
rename to Modules/Core/include/mitkPPRepetitionDetailMSVCFor.h
diff --git a/Modules/Core/Algorithms/mitkPPRepetitionFor.h b/Modules/Core/include/mitkPPRepetitionFor.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPRepetitionFor.h
rename to Modules/Core/include/mitkPPRepetitionFor.h
diff --git a/Modules/Core/Algorithms/mitkPPSeq.h b/Modules/Core/include/mitkPPSeq.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPSeq.h
rename to Modules/Core/include/mitkPPSeq.h
diff --git a/Modules/Core/Algorithms/mitkPPSeqElem.h b/Modules/Core/include/mitkPPSeqElem.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPSeqElem.h
rename to Modules/Core/include/mitkPPSeqElem.h
diff --git a/Modules/Core/Algorithms/mitkPPSeqEnum.h b/Modules/Core/include/mitkPPSeqEnum.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPSeqEnum.h
rename to Modules/Core/include/mitkPPSeqEnum.h
diff --git a/Modules/Core/Algorithms/mitkPPSeqForEach.h b/Modules/Core/include/mitkPPSeqForEach.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPSeqForEach.h
rename to Modules/Core/include/mitkPPSeqForEach.h
diff --git a/Modules/Core/Algorithms/mitkPPSeqForEachProduct.h b/Modules/Core/include/mitkPPSeqForEachProduct.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPSeqForEachProduct.h
rename to Modules/Core/include/mitkPPSeqForEachProduct.h
diff --git a/Modules/Core/Algorithms/mitkPPSeqSize.h b/Modules/Core/include/mitkPPSeqSize.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPSeqSize.h
rename to Modules/Core/include/mitkPPSeqSize.h
diff --git a/Modules/Core/Algorithms/mitkPPSeqToTuple.h b/Modules/Core/include/mitkPPSeqToTuple.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPSeqToTuple.h
rename to Modules/Core/include/mitkPPSeqToTuple.h
diff --git a/Modules/Core/Algorithms/mitkPPStringize.h b/Modules/Core/include/mitkPPStringize.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPStringize.h
rename to Modules/Core/include/mitkPPStringize.h
diff --git a/Modules/Core/Algorithms/mitkPPTupleEat.h b/Modules/Core/include/mitkPPTupleEat.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPTupleEat.h
rename to Modules/Core/include/mitkPPTupleEat.h
diff --git a/Modules/Core/Algorithms/mitkPPTupleElem.h b/Modules/Core/include/mitkPPTupleElem.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPTupleElem.h
rename to Modules/Core/include/mitkPPTupleElem.h
diff --git a/Modules/Core/Algorithms/mitkPPTupleRem.h b/Modules/Core/include/mitkPPTupleRem.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPPTupleRem.h
rename to Modules/Core/include/mitkPPTupleRem.h
diff --git a/Modules/Core/IO/mitkPixelType.h b/Modules/Core/include/mitkPixelType.h
similarity index 100%
rename from Modules/Core/IO/mitkPixelType.h
rename to Modules/Core/include/mitkPixelType.h
diff --git a/Modules/Core/Algorithms/mitkPixelTypeList.h b/Modules/Core/include/mitkPixelTypeList.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPixelTypeList.h
rename to Modules/Core/include/mitkPixelTypeList.h
diff --git a/Modules/Core/IO/mitkPixelTypeMultiplex.h b/Modules/Core/include/mitkPixelTypeMultiplex.h
similarity index 100%
rename from Modules/Core/IO/mitkPixelTypeMultiplex.h
rename to Modules/Core/include/mitkPixelTypeMultiplex.h
diff --git a/Modules/Core/IO/mitkPixelTypeTraits.h b/Modules/Core/include/mitkPixelTypeTraits.h
similarity index 100%
rename from Modules/Core/IO/mitkPixelTypeTraits.h
rename to Modules/Core/include/mitkPixelTypeTraits.h
diff --git a/Modules/Core/Algorithms/mitkPlaneClipping.h b/Modules/Core/include/mitkPlaneClipping.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPlaneClipping.h
rename to Modules/Core/include/mitkPlaneClipping.h
diff --git a/Modules/Core/DataManagement/mitkPlaneGeometry.h b/Modules/Core/include/mitkPlaneGeometry.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPlaneGeometry.h
rename to Modules/Core/include/mitkPlaneGeometry.h
diff --git a/Modules/Core/DataManagement/mitkPlaneGeometryData.h b/Modules/Core/include/mitkPlaneGeometryData.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPlaneGeometryData.h
rename to Modules/Core/include/mitkPlaneGeometryData.h
diff --git a/Modules/Core/Rendering/mitkPlaneGeometryDataMapper2D.h b/Modules/Core/include/mitkPlaneGeometryDataMapper2D.h
similarity index 100%
rename from Modules/Core/Rendering/mitkPlaneGeometryDataMapper2D.h
rename to Modules/Core/include/mitkPlaneGeometryDataMapper2D.h
diff --git a/Modules/Core/Algorithms/mitkPlaneGeometryDataToSurfaceFilter.h b/Modules/Core/include/mitkPlaneGeometryDataToSurfaceFilter.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPlaneGeometryDataToSurfaceFilter.h
rename to Modules/Core/include/mitkPlaneGeometryDataToSurfaceFilter.h
diff --git a/Modules/Core/Rendering/mitkPlaneGeometryDataVtkMapper3D.h b/Modules/Core/include/mitkPlaneGeometryDataVtkMapper3D.h
similarity index 100%
rename from Modules/Core/Rendering/mitkPlaneGeometryDataVtkMapper3D.h
rename to Modules/Core/include/mitkPlaneGeometryDataVtkMapper3D.h
diff --git a/Modules/Core/DataManagement/mitkPlaneOperation.h b/Modules/Core/include/mitkPlaneOperation.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPlaneOperation.h
rename to Modules/Core/include/mitkPlaneOperation.h
diff --git a/Modules/Core/DataManagement/mitkPlaneOrientationProperty.h b/Modules/Core/include/mitkPlaneOrientationProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPlaneOrientationProperty.h
rename to Modules/Core/include/mitkPlaneOrientationProperty.h
diff --git a/Modules/Core/Controllers/mitkPlanePositionManager.h b/Modules/Core/include/mitkPlanePositionManager.h
similarity index 100%
rename from Modules/Core/Controllers/mitkPlanePositionManager.h
rename to Modules/Core/include/mitkPlanePositionManager.h
diff --git a/Modules/Core/DataManagement/mitkPoint.h b/Modules/Core/include/mitkPoint.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPoint.h
rename to Modules/Core/include/mitkPoint.h
diff --git a/Modules/Core/DataManagement/mitkPointOperation.h b/Modules/Core/include/mitkPointOperation.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPointOperation.h
rename to Modules/Core/include/mitkPointOperation.h
diff --git a/Modules/Core/DataManagement/mitkPointSet.h b/Modules/Core/include/mitkPointSet.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPointSet.h
rename to Modules/Core/include/mitkPointSet.h
diff --git a/Modules/Core/Interactions/mitkPointSetDataInteractor.h b/Modules/Core/include/mitkPointSetDataInteractor.h
similarity index 100%
rename from Modules/Core/Interactions/mitkPointSetDataInteractor.h
rename to Modules/Core/include/mitkPointSetDataInteractor.h
diff --git a/Modules/Core/Interactions/mitkPointSetInteractor.h b/Modules/Core/include/mitkPointSetInteractor.h
similarity index 100%
rename from Modules/Core/Interactions/mitkPointSetInteractor.h
rename to Modules/Core/include/mitkPointSetInteractor.h
diff --git a/Modules/Core/DataManagement/mitkPointSetShapeProperty.h b/Modules/Core/include/mitkPointSetShapeProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPointSetShapeProperty.h
rename to Modules/Core/include/mitkPointSetShapeProperty.h
diff --git a/Modules/Core/Algorithms/mitkPointSetSource.h b/Modules/Core/include/mitkPointSetSource.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPointSetSource.h
rename to Modules/Core/include/mitkPointSetSource.h
diff --git a/Modules/Core/Algorithms/mitkPointSetToPointSetFilter.h b/Modules/Core/include/mitkPointSetToPointSetFilter.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkPointSetToPointSetFilter.h
rename to Modules/Core/include/mitkPointSetToPointSetFilter.h
diff --git a/Modules/Core/Rendering/mitkPointSetVtkMapper2D.h b/Modules/Core/include/mitkPointSetVtkMapper2D.h
similarity index 100%
rename from Modules/Core/Rendering/mitkPointSetVtkMapper2D.h
rename to Modules/Core/include/mitkPointSetVtkMapper2D.h
diff --git a/Modules/Core/Rendering/mitkPointSetVtkMapper3D.h b/Modules/Core/include/mitkPointSetVtkMapper3D.h
similarity index 100%
rename from Modules/Core/Rendering/mitkPointSetVtkMapper3D.h
rename to Modules/Core/include/mitkPointSetVtkMapper3D.h
diff --git a/Modules/Core/Interactions/mitkPositionEvent.h b/Modules/Core/include/mitkPositionEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkPositionEvent.h
rename to Modules/Core/include/mitkPositionEvent.h
diff --git a/Modules/Core/Interactions/mitkPositionTracker.h b/Modules/Core/include/mitkPositionTracker.h
similarity index 100%
rename from Modules/Core/Interactions/mitkPositionTracker.h
rename to Modules/Core/include/mitkPositionTracker.h
diff --git a/Modules/Core/Controllers/mitkProgressBar.h b/Modules/Core/include/mitkProgressBar.h
similarity index 100%
rename from Modules/Core/Controllers/mitkProgressBar.h
rename to Modules/Core/include/mitkProgressBar.h
diff --git a/Modules/Core/Controllers/mitkProgressBarImplementation.h b/Modules/Core/include/mitkProgressBarImplementation.h
similarity index 100%
rename from Modules/Core/Controllers/mitkProgressBarImplementation.h
rename to Modules/Core/include/mitkProgressBarImplementation.h
diff --git a/Modules/Core/DataManagement/mitkProperties.h b/Modules/Core/include/mitkProperties.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkProperties.h
rename to Modules/Core/include/mitkProperties.h
diff --git a/Modules/Core/DataManagement/mitkPropertyAliases.h b/Modules/Core/include/mitkPropertyAliases.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyAliases.h
rename to Modules/Core/include/mitkPropertyAliases.h
diff --git a/Modules/Core/DataManagement/mitkPropertyDescriptions.h b/Modules/Core/include/mitkPropertyDescriptions.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyDescriptions.h
rename to Modules/Core/include/mitkPropertyDescriptions.h
diff --git a/Modules/Core/DataManagement/mitkPropertyExtension.h b/Modules/Core/include/mitkPropertyExtension.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyExtension.h
rename to Modules/Core/include/mitkPropertyExtension.h
diff --git a/Modules/Core/DataManagement/mitkPropertyExtensions.h b/Modules/Core/include/mitkPropertyExtensions.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyExtensions.h
rename to Modules/Core/include/mitkPropertyExtensions.h
diff --git a/Modules/Core/DataManagement/mitkPropertyFilter.h b/Modules/Core/include/mitkPropertyFilter.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyFilter.h
rename to Modules/Core/include/mitkPropertyFilter.h
diff --git a/Modules/Core/DataManagement/mitkPropertyFilters.h b/Modules/Core/include/mitkPropertyFilters.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyFilters.h
rename to Modules/Core/include/mitkPropertyFilters.h
diff --git a/Modules/Core/DataManagement/mitkPropertyList.h b/Modules/Core/include/mitkPropertyList.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyList.h
rename to Modules/Core/include/mitkPropertyList.h
diff --git a/Modules/Core/DataManagement/mitkPropertyListReplacedObserver.h b/Modules/Core/include/mitkPropertyListReplacedObserver.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyListReplacedObserver.h
rename to Modules/Core/include/mitkPropertyListReplacedObserver.h
diff --git a/Modules/Core/DataManagement/mitkPropertyObserver.h b/Modules/Core/include/mitkPropertyObserver.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyObserver.h
rename to Modules/Core/include/mitkPropertyObserver.h
diff --git a/Modules/Core/DataManagement/mitkProportionalTimeGeometry.h b/Modules/Core/include/mitkProportionalTimeGeometry.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkProportionalTimeGeometry.h
rename to Modules/Core/include/mitkProportionalTimeGeometry.h
diff --git a/Modules/Core/DataManagement/mitkQuaternion.h b/Modules/Core/include/mitkQuaternion.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkQuaternion.h
rename to Modules/Core/include/mitkQuaternion.h
diff --git a/Modules/Core/Algorithms/mitkRGBToRGBACastImageFilter.h b/Modules/Core/include/mitkRGBToRGBACastImageFilter.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkRGBToRGBACastImageFilter.h
rename to Modules/Core/include/mitkRGBToRGBACastImageFilter.h
diff --git a/Modules/Core/Controllers/mitkReferenceCountWatcher.h b/Modules/Core/include/mitkReferenceCountWatcher.h
similarity index 100%
rename from Modules/Core/Controllers/mitkReferenceCountWatcher.h
rename to Modules/Core/include/mitkReferenceCountWatcher.h
diff --git a/Modules/Core/Rendering/mitkRenderWindow.h b/Modules/Core/include/mitkRenderWindow.h
similarity index 100%
rename from Modules/Core/Rendering/mitkRenderWindow.h
rename to Modules/Core/include/mitkRenderWindow.h
diff --git a/Modules/Core/Rendering/mitkRenderWindowBase.h b/Modules/Core/include/mitkRenderWindowBase.h
similarity index 100%
rename from Modules/Core/Rendering/mitkRenderWindowBase.h
rename to Modules/Core/include/mitkRenderWindowBase.h
diff --git a/Modules/Core/Rendering/mitkRenderWindowFrame.h b/Modules/Core/include/mitkRenderWindowFrame.h
similarity index 100%
rename from Modules/Core/Rendering/mitkRenderWindowFrame.h
rename to Modules/Core/include/mitkRenderWindowFrame.h
diff --git a/Modules/Core/Controllers/mitkRenderingManager.h b/Modules/Core/include/mitkRenderingManager.h
similarity index 100%
rename from Modules/Core/Controllers/mitkRenderingManager.h
rename to Modules/Core/include/mitkRenderingManager.h
diff --git a/Modules/Core/Controllers/mitkRenderingManagerFactory.h b/Modules/Core/include/mitkRenderingManagerFactory.h
similarity index 100%
rename from Modules/Core/Controllers/mitkRenderingManagerFactory.h
rename to Modules/Core/include/mitkRenderingManagerFactory.h
diff --git a/Modules/Core/DataManagement/mitkRenderingModeProperty.h b/Modules/Core/include/mitkRenderingModeProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkRenderingModeProperty.h
rename to Modules/Core/include/mitkRenderingModeProperty.h
diff --git a/Modules/Core/DataManagement/mitkResliceMethodProperty.h b/Modules/Core/include/mitkResliceMethodProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkResliceMethodProperty.h
rename to Modules/Core/include/mitkResliceMethodProperty.h
diff --git a/Modules/Core/DataManagement/mitkRestorePlanePositionOperation.h b/Modules/Core/include/mitkRestorePlanePositionOperation.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkRestorePlanePositionOperation.h
rename to Modules/Core/include/mitkRestorePlanePositionOperation.h
diff --git a/Modules/Core/DataManagement/mitkRotationOperation.h b/Modules/Core/include/mitkRotationOperation.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkRotationOperation.h
rename to Modules/Core/include/mitkRotationOperation.h
diff --git a/Modules/Core/Common/mitkServiceInterface.h b/Modules/Core/include/mitkServiceInterface.h
similarity index 100%
rename from Modules/Core/Common/mitkServiceInterface.h
rename to Modules/Core/include/mitkServiceInterface.h
diff --git a/Modules/Core/DataManagement/mitkShaderProperty.h b/Modules/Core/include/mitkShaderProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkShaderProperty.h
rename to Modules/Core/include/mitkShaderProperty.h
diff --git a/Modules/Core/Interactions/mitkSinglePointDataInteractor.h b/Modules/Core/include/mitkSinglePointDataInteractor.h
similarity index 100%
rename from Modules/Core/Interactions/mitkSinglePointDataInteractor.h
rename to Modules/Core/include/mitkSinglePointDataInteractor.h
diff --git a/Modules/Core/Controllers/mitkSliceNavigationController.h b/Modules/Core/include/mitkSliceNavigationController.h
similarity index 100%
rename from Modules/Core/Controllers/mitkSliceNavigationController.h
rename to Modules/Core/include/mitkSliceNavigationController.h
diff --git a/Modules/Core/DataManagement/mitkSlicedData.h b/Modules/Core/include/mitkSlicedData.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkSlicedData.h
rename to Modules/Core/include/mitkSlicedData.h
diff --git a/Modules/Core/DataManagement/mitkSlicedGeometry3D.h b/Modules/Core/include/mitkSlicedGeometry3D.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkSlicedGeometry3D.h
rename to Modules/Core/include/mitkSlicedGeometry3D.h
diff --git a/Modules/Core/Controllers/mitkSlicesCoordinator.h b/Modules/Core/include/mitkSlicesCoordinator.h
similarity index 100%
rename from Modules/Core/Controllers/mitkSlicesCoordinator.h
rename to Modules/Core/include/mitkSlicesCoordinator.h
diff --git a/Modules/Core/Controllers/mitkSlicesRotator.h b/Modules/Core/include/mitkSlicesRotator.h
similarity index 100%
rename from Modules/Core/Controllers/mitkSlicesRotator.h
rename to Modules/Core/include/mitkSlicesRotator.h
diff --git a/Modules/Core/Controllers/mitkSlicesSwiveller.h b/Modules/Core/include/mitkSlicesSwiveller.h
similarity index 100%
rename from Modules/Core/Controllers/mitkSlicesSwiveller.h
rename to Modules/Core/include/mitkSlicesSwiveller.h
diff --git a/Modules/Core/DataManagement/mitkSmartPointerProperty.h b/Modules/Core/include/mitkSmartPointerProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkSmartPointerProperty.h
rename to Modules/Core/include/mitkSmartPointerProperty.h
diff --git a/Modules/Core/DataManagement/mitkStandaloneDataStorage.h b/Modules/Core/include/mitkStandaloneDataStorage.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkStandaloneDataStorage.h
rename to Modules/Core/include/mitkStandaloneDataStorage.h
diff --git a/Modules/Core/IO/mitkStandardFileLocations.h b/Modules/Core/include/mitkStandardFileLocations.h
similarity index 100%
rename from Modules/Core/IO/mitkStandardFileLocations.h
rename to Modules/Core/include/mitkStandardFileLocations.h
diff --git a/Modules/Core/Interactions/mitkState.h b/Modules/Core/include/mitkState.h
similarity index 100%
rename from Modules/Core/Interactions/mitkState.h
rename to Modules/Core/include/mitkState.h
diff --git a/Modules/Core/Interactions/mitkStateEvent.h b/Modules/Core/include/mitkStateEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkStateEvent.h
rename to Modules/Core/include/mitkStateEvent.h
diff --git a/Modules/Core/Interactions/mitkStateMachine.h b/Modules/Core/include/mitkStateMachine.h
similarity index 100%
rename from Modules/Core/Interactions/mitkStateMachine.h
rename to Modules/Core/include/mitkStateMachine.h
diff --git a/Modules/Core/Interactions/mitkStateMachineAction.h b/Modules/Core/include/mitkStateMachineAction.h
similarity index 100%
rename from Modules/Core/Interactions/mitkStateMachineAction.h
rename to Modules/Core/include/mitkStateMachineAction.h
diff --git a/Modules/Core/Interactions/mitkStateMachineCondition.h b/Modules/Core/include/mitkStateMachineCondition.h
similarity index 100%
rename from Modules/Core/Interactions/mitkStateMachineCondition.h
rename to Modules/Core/include/mitkStateMachineCondition.h
diff --git a/Modules/Core/Interactions/mitkStateMachineContainer.h b/Modules/Core/include/mitkStateMachineContainer.h
similarity index 100%
rename from Modules/Core/Interactions/mitkStateMachineContainer.h
rename to Modules/Core/include/mitkStateMachineContainer.h
diff --git a/Modules/Core/Interactions/mitkStateMachineFactory.h b/Modules/Core/include/mitkStateMachineFactory.h
similarity index 100%
rename from Modules/Core/Interactions/mitkStateMachineFactory.h
rename to Modules/Core/include/mitkStateMachineFactory.h
diff --git a/Modules/Core/Interactions/mitkStateMachineState.h b/Modules/Core/include/mitkStateMachineState.h
similarity index 100%
rename from Modules/Core/Interactions/mitkStateMachineState.h
rename to Modules/Core/include/mitkStateMachineState.h
diff --git a/Modules/Core/Interactions/mitkStateMachineTransition.h b/Modules/Core/include/mitkStateMachineTransition.h
similarity index 100%
rename from Modules/Core/Interactions/mitkStateMachineTransition.h
rename to Modules/Core/include/mitkStateMachineTransition.h
diff --git a/Modules/Core/DataManagement/mitkStateTransitionOperation.h b/Modules/Core/include/mitkStateTransitionOperation.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkStateTransitionOperation.h
rename to Modules/Core/include/mitkStateTransitionOperation.h
diff --git a/Modules/Core/Controllers/mitkStatusBar.h b/Modules/Core/include/mitkStatusBar.h
similarity index 100%
rename from Modules/Core/Controllers/mitkStatusBar.h
rename to Modules/Core/include/mitkStatusBar.h
diff --git a/Modules/Core/Controllers/mitkStatusBarImplementation.h b/Modules/Core/include/mitkStatusBarImplementation.h
similarity index 100%
rename from Modules/Core/Controllers/mitkStatusBarImplementation.h
rename to Modules/Core/include/mitkStatusBarImplementation.h
diff --git a/Modules/Core/Controllers/mitkStepper.h b/Modules/Core/include/mitkStepper.h
similarity index 100%
rename from Modules/Core/Controllers/mitkStepper.h
rename to Modules/Core/include/mitkStepper.h
diff --git a/Modules/Core/DataManagement/mitkStringProperty.h b/Modules/Core/include/mitkStringProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkStringProperty.h
rename to Modules/Core/include/mitkStringProperty.h
diff --git a/Modules/Core/Algorithms/mitkSubImageSelector.h b/Modules/Core/include/mitkSubImageSelector.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkSubImageSelector.h
rename to Modules/Core/include/mitkSubImageSelector.h
diff --git a/Modules/Core/DataManagement/mitkSurface.h b/Modules/Core/include/mitkSurface.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkSurface.h
rename to Modules/Core/include/mitkSurface.h
diff --git a/Modules/Core/DataManagement/mitkSurfaceOperation.h b/Modules/Core/include/mitkSurfaceOperation.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkSurfaceOperation.h
rename to Modules/Core/include/mitkSurfaceOperation.h
diff --git a/Modules/Core/Algorithms/mitkSurfaceSource.h b/Modules/Core/include/mitkSurfaceSource.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkSurfaceSource.h
rename to Modules/Core/include/mitkSurfaceSource.h
diff --git a/Modules/Core/Algorithms/mitkSurfaceToImageFilter.h b/Modules/Core/include/mitkSurfaceToImageFilter.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkSurfaceToImageFilter.h
rename to Modules/Core/include/mitkSurfaceToImageFilter.h
diff --git a/Modules/Core/Algorithms/mitkSurfaceToSurfaceFilter.h b/Modules/Core/include/mitkSurfaceToSurfaceFilter.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkSurfaceToSurfaceFilter.h
rename to Modules/Core/include/mitkSurfaceToSurfaceFilter.h
diff --git a/Modules/Core/Rendering/mitkSurfaceVtkMapper2D.h b/Modules/Core/include/mitkSurfaceVtkMapper2D.h
similarity index 100%
rename from Modules/Core/Rendering/mitkSurfaceVtkMapper2D.h
rename to Modules/Core/include/mitkSurfaceVtkMapper2D.h
diff --git a/Modules/Core/Rendering/mitkSurfaceVtkMapper3D.h b/Modules/Core/include/mitkSurfaceVtkMapper3D.h
similarity index 100%
rename from Modules/Core/Rendering/mitkSurfaceVtkMapper3D.h
rename to Modules/Core/include/mitkSurfaceVtkMapper3D.h
diff --git a/Modules/Core/Controllers/mitkTestManager.h b/Modules/Core/include/mitkTestManager.h
similarity index 100%
rename from Modules/Core/Controllers/mitkTestManager.h
rename to Modules/Core/include/mitkTestManager.h
diff --git a/Modules/Core/DataManagement/mitkThinPlateSplineCurvedGeometry.h b/Modules/Core/include/mitkThinPlateSplineCurvedGeometry.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkThinPlateSplineCurvedGeometry.h
rename to Modules/Core/include/mitkThinPlateSplineCurvedGeometry.h
diff --git a/Modules/Core/DataManagement/mitkTimeGeometry.h b/Modules/Core/include/mitkTimeGeometry.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkTimeGeometry.h
rename to Modules/Core/include/mitkTimeGeometry.h
diff --git a/Modules/Core/Algorithms/mitkTimeHelper.h b/Modules/Core/include/mitkTimeHelper.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkTimeHelper.h
rename to Modules/Core/include/mitkTimeHelper.h
diff --git a/Modules/Core/DataManagement/mitkTimeSlicedGeometry.h b/Modules/Core/include/mitkTimeSlicedGeometry.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkTimeSlicedGeometry.h
rename to Modules/Core/include/mitkTimeSlicedGeometry.h
diff --git a/Modules/Core/DataManagement/mitkTransferFunction.h b/Modules/Core/include/mitkTransferFunction.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkTransferFunction.h
rename to Modules/Core/include/mitkTransferFunction.h
diff --git a/Modules/Core/DataManagement/mitkTransferFunctionInitializer.h b/Modules/Core/include/mitkTransferFunctionInitializer.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkTransferFunctionInitializer.h
rename to Modules/Core/include/mitkTransferFunctionInitializer.h
diff --git a/Modules/Core/DataManagement/mitkTransferFunctionProperty.h b/Modules/Core/include/mitkTransferFunctionProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkTransferFunctionProperty.h
rename to Modules/Core/include/mitkTransferFunctionProperty.h
diff --git a/Modules/Core/Interactions/mitkTransition.h b/Modules/Core/include/mitkTransition.h
similarity index 100%
rename from Modules/Core/Interactions/mitkTransition.h
rename to Modules/Core/include/mitkTransition.h
diff --git a/Modules/Core/Algorithms/mitkUIDGenerator.h b/Modules/Core/include/mitkUIDGenerator.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkUIDGenerator.h
rename to Modules/Core/include/mitkUIDGenerator.h
diff --git a/Modules/Core/Controllers/mitkUndoController.h b/Modules/Core/include/mitkUndoController.h
similarity index 100%
rename from Modules/Core/Controllers/mitkUndoController.h
rename to Modules/Core/include/mitkUndoController.h
diff --git a/Modules/Core/Controllers/mitkUndoModel.h b/Modules/Core/include/mitkUndoModel.h
similarity index 100%
rename from Modules/Core/Controllers/mitkUndoModel.h
rename to Modules/Core/include/mitkUndoModel.h
diff --git a/Modules/Core/DataManagement/mitkVector.h b/Modules/Core/include/mitkVector.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkVector.h
rename to Modules/Core/include/mitkVector.h
diff --git a/Modules/Core/DataManagement/mitkVectorDeprecated.h b/Modules/Core/include/mitkVectorDeprecated.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkVectorDeprecated.h
rename to Modules/Core/include/mitkVectorDeprecated.h
diff --git a/Modules/Core/Controllers/mitkVerboseLimitedLinearUndo.h b/Modules/Core/include/mitkVerboseLimitedLinearUndo.h
similarity index 100%
rename from Modules/Core/Controllers/mitkVerboseLimitedLinearUndo.h
rename to Modules/Core/include/mitkVerboseLimitedLinearUndo.h
diff --git a/Modules/Core/Algorithms/mitkVolumeCalculator.h b/Modules/Core/include/mitkVolumeCalculator.h
similarity index 100%
rename from Modules/Core/Algorithms/mitkVolumeCalculator.h
rename to Modules/Core/include/mitkVolumeCalculator.h
diff --git a/Modules/Core/Rendering/mitkVolumeDataVtkMapper3D.h b/Modules/Core/include/mitkVolumeDataVtkMapper3D.h
similarity index 100%
rename from Modules/Core/Rendering/mitkVolumeDataVtkMapper3D.h
rename to Modules/Core/include/mitkVolumeDataVtkMapper3D.h
diff --git a/Modules/Core/Interactions/mitkVtkEventAdapter.h b/Modules/Core/include/mitkVtkEventAdapter.h
similarity index 100%
rename from Modules/Core/Interactions/mitkVtkEventAdapter.h
rename to Modules/Core/include/mitkVtkEventAdapter.h
diff --git a/Modules/Core/Rendering/mitkVtkEventProvider.h b/Modules/Core/include/mitkVtkEventProvider.h
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkEventProvider.h
rename to Modules/Core/include/mitkVtkEventProvider.h
diff --git a/Modules/Core/Controllers/mitkVtkInteractorCameraController.h b/Modules/Core/include/mitkVtkInteractorCameraController.h
similarity index 100%
rename from Modules/Core/Controllers/mitkVtkInteractorCameraController.h
rename to Modules/Core/include/mitkVtkInteractorCameraController.h
diff --git a/Modules/Core/Interactions/mitkVtkInteractorStyle.h b/Modules/Core/include/mitkVtkInteractorStyle.h
similarity index 100%
rename from Modules/Core/Interactions/mitkVtkInteractorStyle.h
rename to Modules/Core/include/mitkVtkInteractorStyle.h
diff --git a/Modules/Core/DataManagement/mitkVtkInterpolationProperty.h b/Modules/Core/include/mitkVtkInterpolationProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkVtkInterpolationProperty.h
rename to Modules/Core/include/mitkVtkInterpolationProperty.h
diff --git a/Modules/Core/Controllers/mitkVtkLayerController.h b/Modules/Core/include/mitkVtkLayerController.h
similarity index 100%
rename from Modules/Core/Controllers/mitkVtkLayerController.h
rename to Modules/Core/include/mitkVtkLayerController.h
diff --git a/Modules/Core/IO/mitkVtkLoggingAdapter.h b/Modules/Core/include/mitkVtkLoggingAdapter.h
similarity index 100%
rename from Modules/Core/IO/mitkVtkLoggingAdapter.h
rename to Modules/Core/include/mitkVtkLoggingAdapter.h
diff --git a/Modules/Core/Rendering/mitkVtkMapper.h b/Modules/Core/include/mitkVtkMapper.h
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkMapper.h
rename to Modules/Core/include/mitkVtkMapper.h
diff --git a/Modules/Core/Rendering/mitkVtkMapper2D.h b/Modules/Core/include/mitkVtkMapper2D.h
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkMapper2D.h
rename to Modules/Core/include/mitkVtkMapper2D.h
diff --git a/Modules/Core/Rendering/mitkVtkMapper3D.h b/Modules/Core/include/mitkVtkMapper3D.h
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkMapper3D.h
rename to Modules/Core/include/mitkVtkMapper3D.h
diff --git a/Modules/Core/Rendering/mitkVtkOverlay.h b/Modules/Core/include/mitkVtkOverlay.h
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkOverlay.h
rename to Modules/Core/include/mitkVtkOverlay.h
diff --git a/Modules/Core/Rendering/mitkVtkOverlay2D.h b/Modules/Core/include/mitkVtkOverlay2D.h
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkOverlay2D.h
rename to Modules/Core/include/mitkVtkOverlay2D.h
diff --git a/Modules/Core/Rendering/mitkVtkOverlay3D.h b/Modules/Core/include/mitkVtkOverlay3D.h
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkOverlay3D.h
rename to Modules/Core/include/mitkVtkOverlay3D.h
diff --git a/Modules/Core/Rendering/mitkVtkPropRenderer.h b/Modules/Core/include/mitkVtkPropRenderer.h
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkPropRenderer.h
rename to Modules/Core/include/mitkVtkPropRenderer.h
diff --git a/Modules/Core/DataManagement/mitkVtkRepresentationProperty.h b/Modules/Core/include/mitkVtkRepresentationProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkVtkRepresentationProperty.h
rename to Modules/Core/include/mitkVtkRepresentationProperty.h
diff --git a/Modules/Core/DataManagement/mitkVtkResliceInterpolationProperty.h b/Modules/Core/include/mitkVtkResliceInterpolationProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkVtkResliceInterpolationProperty.h
rename to Modules/Core/include/mitkVtkResliceInterpolationProperty.h
diff --git a/Modules/Core/DataManagement/mitkVtkScalarModeProperty.h b/Modules/Core/include/mitkVtkScalarModeProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkVtkScalarModeProperty.h
rename to Modules/Core/include/mitkVtkScalarModeProperty.h
diff --git a/Modules/Core/DataManagement/mitkVtkVolumeRenderingProperty.h b/Modules/Core/include/mitkVtkVolumeRenderingProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkVtkVolumeRenderingProperty.h
rename to Modules/Core/include/mitkVtkVolumeRenderingProperty.h
diff --git a/Modules/Core/Rendering/mitkVtkWidgetRendering.h b/Modules/Core/include/mitkVtkWidgetRendering.h
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkWidgetRendering.h
rename to Modules/Core/include/mitkVtkWidgetRendering.h
diff --git a/Modules/Core/DataManagement/mitkWeakPointer.h b/Modules/Core/include/mitkWeakPointer.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkWeakPointer.h
rename to Modules/Core/include/mitkWeakPointer.h
diff --git a/Modules/Core/DataManagement/mitkWeakPointerProperty.h b/Modules/Core/include/mitkWeakPointerProperty.h
similarity index 100%
rename from Modules/Core/DataManagement/mitkWeakPointerProperty.h
rename to Modules/Core/include/mitkWeakPointerProperty.h
diff --git a/Modules/Core/Interactions/mitkWheelEvent.h b/Modules/Core/include/mitkWheelEvent.h
similarity index 100%
rename from Modules/Core/Interactions/mitkWheelEvent.h
rename to Modules/Core/include/mitkWheelEvent.h
diff --git a/Modules/Core/Interactions/mitkXML2EventParser.h b/Modules/Core/include/mitkXML2EventParser.h
similarity index 100%
rename from Modules/Core/Interactions/mitkXML2EventParser.h
rename to Modules/Core/include/mitkXML2EventParser.h
diff --git a/Modules/Core/Rendering/vtkMitkLevelWindowFilter.h b/Modules/Core/include/vtkMitkLevelWindowFilter.h
similarity index 100%
rename from Modules/Core/Rendering/vtkMitkLevelWindowFilter.h
rename to Modules/Core/include/vtkMitkLevelWindowFilter.h
diff --git a/Modules/Core/Rendering/vtkMitkRectangleProp.h b/Modules/Core/include/vtkMitkRectangleProp.h
similarity index 100%
rename from Modules/Core/Rendering/vtkMitkRectangleProp.h
rename to Modules/Core/include/vtkMitkRectangleProp.h
diff --git a/Modules/Core/Rendering/vtkMitkRenderProp.h b/Modules/Core/include/vtkMitkRenderProp.h
similarity index 100%
rename from Modules/Core/Rendering/vtkMitkRenderProp.h
rename to Modules/Core/include/vtkMitkRenderProp.h
diff --git a/Modules/Core/Rendering/vtkMitkThickSlicesFilter.h b/Modules/Core/include/vtkMitkThickSlicesFilter.h
similarity index 100%
rename from Modules/Core/Rendering/vtkMitkThickSlicesFilter.h
rename to Modules/Core/include/vtkMitkThickSlicesFilter.h
diff --git a/Modules/Core/Rendering/vtkNeverTranslucentTexture.h b/Modules/Core/include/vtkNeverTranslucentTexture.h
similarity index 100%
rename from Modules/Core/Rendering/vtkNeverTranslucentTexture.h
rename to Modules/Core/include/vtkNeverTranslucentTexture.h
diff --git a/Modules/Core/Resources/Interactions/DisplayConfig.xml b/Modules/Core/resources/Interactions/DisplayConfig.xml
similarity index 100%
rename from Modules/Core/Resources/Interactions/DisplayConfig.xml
rename to Modules/Core/resources/Interactions/DisplayConfig.xml
diff --git a/Modules/Core/Resources/Interactions/DisplayConfigMITK.xml b/Modules/Core/resources/Interactions/DisplayConfigMITK.xml
similarity index 100%
rename from Modules/Core/Resources/Interactions/DisplayConfigMITK.xml
rename to Modules/Core/resources/Interactions/DisplayConfigMITK.xml
diff --git a/Modules/Core/Resources/Interactions/DisplayConfigPACS.xml b/Modules/Core/resources/Interactions/DisplayConfigPACS.xml
similarity index 100%
rename from Modules/Core/Resources/Interactions/DisplayConfigPACS.xml
rename to Modules/Core/resources/Interactions/DisplayConfigPACS.xml
diff --git a/Modules/Core/Resources/Interactions/DisplayConfigPACSLevelWindow.xml b/Modules/Core/resources/Interactions/DisplayConfigPACSLevelWindow.xml
similarity index 100%
rename from Modules/Core/Resources/Interactions/DisplayConfigPACSLevelWindow.xml
rename to Modules/Core/resources/Interactions/DisplayConfigPACSLevelWindow.xml
diff --git a/Modules/Core/Resources/Interactions/DisplayConfigPACSPan.xml b/Modules/Core/resources/Interactions/DisplayConfigPACSPan.xml
similarity index 100%
rename from Modules/Core/Resources/Interactions/DisplayConfigPACSPan.xml
rename to Modules/Core/resources/Interactions/DisplayConfigPACSPan.xml
diff --git a/Modules/Core/Resources/Interactions/DisplayConfigPACSScroll.xml b/Modules/Core/resources/Interactions/DisplayConfigPACSScroll.xml
similarity index 100%
rename from Modules/Core/Resources/Interactions/DisplayConfigPACSScroll.xml
rename to Modules/Core/resources/Interactions/DisplayConfigPACSScroll.xml
diff --git a/Modules/Core/Resources/Interactions/DisplayConfigPACSZoom.xml b/Modules/Core/resources/Interactions/DisplayConfigPACSZoom.xml
similarity index 100%
rename from Modules/Core/Resources/Interactions/DisplayConfigPACSZoom.xml
rename to Modules/Core/resources/Interactions/DisplayConfigPACSZoom.xml
diff --git a/Modules/Core/Resources/Interactions/DisplayInteraction.xml b/Modules/Core/resources/Interactions/DisplayInteraction.xml
similarity index 100%
rename from Modules/Core/Resources/Interactions/DisplayInteraction.xml
rename to Modules/Core/resources/Interactions/DisplayInteraction.xml
diff --git a/Modules/Core/Resources/Interactions/Legacy/DisplayConfigMITKTools.xml b/Modules/Core/resources/Interactions/Legacy/DisplayConfigMITKTools.xml
similarity index 100%
rename from Modules/Core/Resources/Interactions/Legacy/DisplayConfigMITKTools.xml
rename to Modules/Core/resources/Interactions/Legacy/DisplayConfigMITKTools.xml
diff --git a/Modules/Core/Resources/Interactions/Legacy/StateMachine.xml b/Modules/Core/resources/Interactions/Legacy/StateMachine.xml
similarity index 100%
rename from Modules/Core/Resources/Interactions/Legacy/StateMachine.xml
rename to Modules/Core/resources/Interactions/Legacy/StateMachine.xml
diff --git a/Modules/Core/Resources/Interactions/PointSet.xml b/Modules/Core/resources/Interactions/PointSet.xml
similarity index 100%
rename from Modules/Core/Resources/Interactions/PointSet.xml
rename to Modules/Core/resources/Interactions/PointSet.xml
diff --git a/Modules/Core/Resources/Interactions/PointSetConfig.xml b/Modules/Core/resources/Interactions/PointSetConfig.xml
similarity index 100%
rename from Modules/Core/Resources/Interactions/PointSetConfig.xml
rename to Modules/Core/resources/Interactions/PointSetConfig.xml
diff --git a/Modules/Core/Resources/Interactions/globalConfig.xml b/Modules/Core/resources/Interactions/globalConfig.xml
similarity index 100%
rename from Modules/Core/Resources/Interactions/globalConfig.xml
rename to Modules/Core/resources/Interactions/globalConfig.xml
diff --git a/Modules/Core/Resources/mitkLevelWindowPresets.xml b/Modules/Core/resources/mitkLevelWindowPresets.xml
similarity index 100%
rename from Modules/Core/Resources/mitkLevelWindowPresets.xml
rename to Modules/Core/resources/mitkLevelWindowPresets.xml
diff --git a/Modules/Core/Algorithms/mitkBaseDataSource.cpp b/Modules/Core/src/Algorithms/mitkBaseDataSource.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkBaseDataSource.cpp
rename to Modules/Core/src/Algorithms/mitkBaseDataSource.cpp
diff --git a/Modules/Core/Algorithms/mitkClippedSurfaceBoundsCalculator.cpp b/Modules/Core/src/Algorithms/mitkClippedSurfaceBoundsCalculator.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkClippedSurfaceBoundsCalculator.cpp
rename to Modules/Core/src/Algorithms/mitkClippedSurfaceBoundsCalculator.cpp
diff --git a/Modules/Core/Algorithms/mitkCompareImageDataFilter.cpp b/Modules/Core/src/Algorithms/mitkCompareImageDataFilter.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkCompareImageDataFilter.cpp
rename to Modules/Core/src/Algorithms/mitkCompareImageDataFilter.cpp
diff --git a/Modules/Core/Algorithms/mitkConvert2Dto3DImageFilter.cpp b/Modules/Core/src/Algorithms/mitkConvert2Dto3DImageFilter.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkConvert2Dto3DImageFilter.cpp
rename to Modules/Core/src/Algorithms/mitkConvert2Dto3DImageFilter.cpp
diff --git a/Modules/Core/Algorithms/mitkDataNodeSource.cpp b/Modules/Core/src/Algorithms/mitkDataNodeSource.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkDataNodeSource.cpp
rename to Modules/Core/src/Algorithms/mitkDataNodeSource.cpp
diff --git a/Modules/Core/Algorithms/mitkExtractSliceFilter.cpp b/Modules/Core/src/Algorithms/mitkExtractSliceFilter.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkExtractSliceFilter.cpp
rename to Modules/Core/src/Algorithms/mitkExtractSliceFilter.cpp
diff --git a/Modules/Core/Algorithms/mitkHistogramGenerator.cpp b/Modules/Core/src/Algorithms/mitkHistogramGenerator.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkHistogramGenerator.cpp
rename to Modules/Core/src/Algorithms/mitkHistogramGenerator.cpp
diff --git a/Modules/Core/Algorithms/mitkImageChannelSelector.cpp b/Modules/Core/src/Algorithms/mitkImageChannelSelector.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkImageChannelSelector.cpp
rename to Modules/Core/src/Algorithms/mitkImageChannelSelector.cpp
diff --git a/Modules/Core/Algorithms/mitkImageSliceSelector.cpp b/Modules/Core/src/Algorithms/mitkImageSliceSelector.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkImageSliceSelector.cpp
rename to Modules/Core/src/Algorithms/mitkImageSliceSelector.cpp
diff --git a/Modules/Core/Algorithms/mitkImageSource.cpp b/Modules/Core/src/Algorithms/mitkImageSource.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkImageSource.cpp
rename to Modules/Core/src/Algorithms/mitkImageSource.cpp
diff --git a/Modules/Core/Algorithms/mitkImageTimeSelector.cpp b/Modules/Core/src/Algorithms/mitkImageTimeSelector.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkImageTimeSelector.cpp
rename to Modules/Core/src/Algorithms/mitkImageTimeSelector.cpp
diff --git a/Modules/Core/Algorithms/mitkImageToImageFilter.cpp b/Modules/Core/src/Algorithms/mitkImageToImageFilter.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkImageToImageFilter.cpp
rename to Modules/Core/src/Algorithms/mitkImageToImageFilter.cpp
diff --git a/Modules/Core/Algorithms/mitkImageToSurfaceFilter.cpp b/Modules/Core/src/Algorithms/mitkImageToSurfaceFilter.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkImageToSurfaceFilter.cpp
rename to Modules/Core/src/Algorithms/mitkImageToSurfaceFilter.cpp
diff --git a/Modules/Core/Algorithms/mitkMultiComponentImageDataComparisonFilter.cpp b/Modules/Core/src/Algorithms/mitkMultiComponentImageDataComparisonFilter.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkMultiComponentImageDataComparisonFilter.cpp
rename to Modules/Core/src/Algorithms/mitkMultiComponentImageDataComparisonFilter.cpp
diff --git a/Modules/Core/Algorithms/mitkPlaneGeometryDataToSurfaceFilter.cpp b/Modules/Core/src/Algorithms/mitkPlaneGeometryDataToSurfaceFilter.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkPlaneGeometryDataToSurfaceFilter.cpp
rename to Modules/Core/src/Algorithms/mitkPlaneGeometryDataToSurfaceFilter.cpp
diff --git a/Modules/Core/Algorithms/mitkPointSetSource.cpp b/Modules/Core/src/Algorithms/mitkPointSetSource.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkPointSetSource.cpp
rename to Modules/Core/src/Algorithms/mitkPointSetSource.cpp
diff --git a/Modules/Core/Algorithms/mitkPointSetToPointSetFilter.cpp b/Modules/Core/src/Algorithms/mitkPointSetToPointSetFilter.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkPointSetToPointSetFilter.cpp
rename to Modules/Core/src/Algorithms/mitkPointSetToPointSetFilter.cpp
diff --git a/Modules/Core/Algorithms/mitkRGBToRGBACastImageFilter.cpp b/Modules/Core/src/Algorithms/mitkRGBToRGBACastImageFilter.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkRGBToRGBACastImageFilter.cpp
rename to Modules/Core/src/Algorithms/mitkRGBToRGBACastImageFilter.cpp
diff --git a/Modules/Core/Algorithms/mitkSubImageSelector.cpp b/Modules/Core/src/Algorithms/mitkSubImageSelector.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkSubImageSelector.cpp
rename to Modules/Core/src/Algorithms/mitkSubImageSelector.cpp
diff --git a/Modules/Core/Algorithms/mitkSurfaceSource.cpp b/Modules/Core/src/Algorithms/mitkSurfaceSource.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkSurfaceSource.cpp
rename to Modules/Core/src/Algorithms/mitkSurfaceSource.cpp
diff --git a/Modules/Core/Algorithms/mitkSurfaceToImageFilter.cpp b/Modules/Core/src/Algorithms/mitkSurfaceToImageFilter.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkSurfaceToImageFilter.cpp
rename to Modules/Core/src/Algorithms/mitkSurfaceToImageFilter.cpp
diff --git a/Modules/Core/Algorithms/mitkSurfaceToSurfaceFilter.cpp b/Modules/Core/src/Algorithms/mitkSurfaceToSurfaceFilter.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkSurfaceToSurfaceFilter.cpp
rename to Modules/Core/src/Algorithms/mitkSurfaceToSurfaceFilter.cpp
diff --git a/Modules/Core/Algorithms/mitkUIDGenerator.cpp b/Modules/Core/src/Algorithms/mitkUIDGenerator.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkUIDGenerator.cpp
rename to Modules/Core/src/Algorithms/mitkUIDGenerator.cpp
diff --git a/Modules/Core/Algorithms/mitkVolumeCalculator.cpp b/Modules/Core/src/Algorithms/mitkVolumeCalculator.cpp
similarity index 100%
rename from Modules/Core/Algorithms/mitkVolumeCalculator.cpp
rename to Modules/Core/src/Algorithms/mitkVolumeCalculator.cpp
diff --git a/Modules/Core/Controllers/mitkBaseController.cpp b/Modules/Core/src/Controllers/mitkBaseController.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkBaseController.cpp
rename to Modules/Core/src/Controllers/mitkBaseController.cpp
diff --git a/Modules/Core/Controllers/mitkCallbackFromGUIThread.cpp b/Modules/Core/src/Controllers/mitkCallbackFromGUIThread.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkCallbackFromGUIThread.cpp
rename to Modules/Core/src/Controllers/mitkCallbackFromGUIThread.cpp
diff --git a/Modules/Core/Controllers/mitkCameraController.cpp b/Modules/Core/src/Controllers/mitkCameraController.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkCameraController.cpp
rename to Modules/Core/src/Controllers/mitkCameraController.cpp
diff --git a/Modules/Core/Controllers/mitkCameraRotationController.cpp b/Modules/Core/src/Controllers/mitkCameraRotationController.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkCameraRotationController.cpp
rename to Modules/Core/src/Controllers/mitkCameraRotationController.cpp
diff --git a/Modules/Core/Controllers/mitkFocusManager.cpp b/Modules/Core/src/Controllers/mitkFocusManager.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkFocusManager.cpp
rename to Modules/Core/src/Controllers/mitkFocusManager.cpp
diff --git a/Modules/Core/Controllers/mitkLimitedLinearUndo.cpp b/Modules/Core/src/Controllers/mitkLimitedLinearUndo.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkLimitedLinearUndo.cpp
rename to Modules/Core/src/Controllers/mitkLimitedLinearUndo.cpp
diff --git a/Modules/Core/Controllers/mitkOperationEvent.cpp b/Modules/Core/src/Controllers/mitkOperationEvent.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkOperationEvent.cpp
rename to Modules/Core/src/Controllers/mitkOperationEvent.cpp
diff --git a/Modules/Core/Controllers/mitkPlanePositionManager.cpp b/Modules/Core/src/Controllers/mitkPlanePositionManager.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkPlanePositionManager.cpp
rename to Modules/Core/src/Controllers/mitkPlanePositionManager.cpp
diff --git a/Modules/Core/Controllers/mitkProgressBar.cpp b/Modules/Core/src/Controllers/mitkProgressBar.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkProgressBar.cpp
rename to Modules/Core/src/Controllers/mitkProgressBar.cpp
diff --git a/Modules/Core/Controllers/mitkRenderingManager.cpp b/Modules/Core/src/Controllers/mitkRenderingManager.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkRenderingManager.cpp
rename to Modules/Core/src/Controllers/mitkRenderingManager.cpp
diff --git a/Modules/Core/Controllers/mitkSliceNavigationController.cpp b/Modules/Core/src/Controllers/mitkSliceNavigationController.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkSliceNavigationController.cpp
rename to Modules/Core/src/Controllers/mitkSliceNavigationController.cpp
diff --git a/Modules/Core/Controllers/mitkSlicesCoordinator.cpp b/Modules/Core/src/Controllers/mitkSlicesCoordinator.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkSlicesCoordinator.cpp
rename to Modules/Core/src/Controllers/mitkSlicesCoordinator.cpp
diff --git a/Modules/Core/Controllers/mitkSlicesRotator.cpp b/Modules/Core/src/Controllers/mitkSlicesRotator.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkSlicesRotator.cpp
rename to Modules/Core/src/Controllers/mitkSlicesRotator.cpp
diff --git a/Modules/Core/Controllers/mitkSlicesSwiveller.cpp b/Modules/Core/src/Controllers/mitkSlicesSwiveller.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkSlicesSwiveller.cpp
rename to Modules/Core/src/Controllers/mitkSlicesSwiveller.cpp
diff --git a/Modules/Core/Controllers/mitkStatusBar.cpp b/Modules/Core/src/Controllers/mitkStatusBar.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkStatusBar.cpp
rename to Modules/Core/src/Controllers/mitkStatusBar.cpp
diff --git a/Modules/Core/Controllers/mitkStepper.cpp b/Modules/Core/src/Controllers/mitkStepper.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkStepper.cpp
rename to Modules/Core/src/Controllers/mitkStepper.cpp
diff --git a/Modules/Core/Controllers/mitkTestManager.cpp b/Modules/Core/src/Controllers/mitkTestManager.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkTestManager.cpp
rename to Modules/Core/src/Controllers/mitkTestManager.cpp
diff --git a/Modules/Core/Controllers/mitkUndoController.cpp b/Modules/Core/src/Controllers/mitkUndoController.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkUndoController.cpp
rename to Modules/Core/src/Controllers/mitkUndoController.cpp
diff --git a/Modules/Core/Controllers/mitkVerboseLimitedLinearUndo.cpp b/Modules/Core/src/Controllers/mitkVerboseLimitedLinearUndo.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkVerboseLimitedLinearUndo.cpp
rename to Modules/Core/src/Controllers/mitkVerboseLimitedLinearUndo.cpp
diff --git a/Modules/Core/Controllers/mitkVtkInteractorCameraController.cpp b/Modules/Core/src/Controllers/mitkVtkInteractorCameraController.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkVtkInteractorCameraController.cpp
rename to Modules/Core/src/Controllers/mitkVtkInteractorCameraController.cpp
diff --git a/Modules/Core/Controllers/mitkVtkLayerController.cpp b/Modules/Core/src/Controllers/mitkVtkLayerController.cpp
similarity index 100%
rename from Modules/Core/Controllers/mitkVtkLayerController.cpp
rename to Modules/Core/src/Controllers/mitkVtkLayerController.cpp
diff --git a/Modules/Core/Controllers/rotate_cursor.xpm b/Modules/Core/src/Controllers/rotate_cursor.xpm
similarity index 100%
rename from Modules/Core/Controllers/rotate_cursor.xpm
rename to Modules/Core/src/Controllers/rotate_cursor.xpm
diff --git a/Modules/Core/DataManagement/mitkAbstractTransformGeometry.cpp b/Modules/Core/src/DataManagement/mitkAbstractTransformGeometry.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkAbstractTransformGeometry.cpp
rename to Modules/Core/src/DataManagement/mitkAbstractTransformGeometry.cpp
diff --git a/Modules/Core/DataManagement/mitkAnnotationProperty.cpp b/Modules/Core/src/DataManagement/mitkAnnotationProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkAnnotationProperty.cpp
rename to Modules/Core/src/DataManagement/mitkAnnotationProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkApplicationCursor.cpp b/Modules/Core/src/DataManagement/mitkApplicationCursor.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkApplicationCursor.cpp
rename to Modules/Core/src/DataManagement/mitkApplicationCursor.cpp
diff --git a/Modules/Core/DataManagement/mitkApplyTransformMatrixOperation.cpp b/Modules/Core/src/DataManagement/mitkApplyTransformMatrixOperation.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkApplyTransformMatrixOperation.cpp
rename to Modules/Core/src/DataManagement/mitkApplyTransformMatrixOperation.cpp
diff --git a/Modules/Core/DataManagement/mitkBaseData.cpp b/Modules/Core/src/DataManagement/mitkBaseData.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkBaseData.cpp
rename to Modules/Core/src/DataManagement/mitkBaseData.cpp
diff --git a/Modules/Core/DataManagement/mitkBaseGeometry.cpp b/Modules/Core/src/DataManagement/mitkBaseGeometry.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkBaseGeometry.cpp
rename to Modules/Core/src/DataManagement/mitkBaseGeometry.cpp
diff --git a/Modules/Core/DataManagement/mitkBaseProperty.cpp b/Modules/Core/src/DataManagement/mitkBaseProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkBaseProperty.cpp
rename to Modules/Core/src/DataManagement/mitkBaseProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkChannelDescriptor.cpp b/Modules/Core/src/DataManagement/mitkChannelDescriptor.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkChannelDescriptor.cpp
rename to Modules/Core/src/DataManagement/mitkChannelDescriptor.cpp
diff --git a/Modules/Core/DataManagement/mitkClippingProperty.cpp b/Modules/Core/src/DataManagement/mitkClippingProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkClippingProperty.cpp
rename to Modules/Core/src/DataManagement/mitkClippingProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkColorProperty.cpp b/Modules/Core/src/DataManagement/mitkColorProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkColorProperty.cpp
rename to Modules/Core/src/DataManagement/mitkColorProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkDataNode.cpp b/Modules/Core/src/DataManagement/mitkDataNode.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkDataNode.cpp
rename to Modules/Core/src/DataManagement/mitkDataNode.cpp
diff --git a/Modules/Core/DataManagement/mitkDataStorage.cpp b/Modules/Core/src/DataManagement/mitkDataStorage.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkDataStorage.cpp
rename to Modules/Core/src/DataManagement/mitkDataStorage.cpp
diff --git a/Modules/Core/DataManagement/mitkDisplayGeometry.cpp b/Modules/Core/src/DataManagement/mitkDisplayGeometry.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkDisplayGeometry.cpp
rename to Modules/Core/src/DataManagement/mitkDisplayGeometry.cpp
diff --git a/Modules/Core/DataManagement/mitkEnumerationProperty.cpp b/Modules/Core/src/DataManagement/mitkEnumerationProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkEnumerationProperty.cpp
rename to Modules/Core/src/DataManagement/mitkEnumerationProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkFloatPropertyExtension.cpp b/Modules/Core/src/DataManagement/mitkFloatPropertyExtension.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkFloatPropertyExtension.cpp
rename to Modules/Core/src/DataManagement/mitkFloatPropertyExtension.cpp
diff --git a/Modules/Core/DataManagement/mitkGeometry3D.cpp b/Modules/Core/src/DataManagement/mitkGeometry3D.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkGeometry3D.cpp
rename to Modules/Core/src/DataManagement/mitkGeometry3D.cpp
diff --git a/Modules/Core/DataManagement/mitkGeometryData.cpp b/Modules/Core/src/DataManagement/mitkGeometryData.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkGeometryData.cpp
rename to Modules/Core/src/DataManagement/mitkGeometryData.cpp
diff --git a/Modules/Core/DataManagement/mitkGeometryTransformHolder.cpp b/Modules/Core/src/DataManagement/mitkGeometryTransformHolder.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkGeometryTransformHolder.cpp
rename to Modules/Core/src/DataManagement/mitkGeometryTransformHolder.cpp
diff --git a/Modules/Core/DataManagement/mitkGroupTagProperty.cpp b/Modules/Core/src/DataManagement/mitkGroupTagProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkGroupTagProperty.cpp
rename to Modules/Core/src/DataManagement/mitkGroupTagProperty.cpp
diff --git a/Modules/Core/Interfaces/mitkIPersistenceService.cpp b/Modules/Core/src/DataManagement/mitkIPersistenceService.cpp
similarity index 100%
rename from Modules/Core/Interfaces/mitkIPersistenceService.cpp
rename to Modules/Core/src/DataManagement/mitkIPersistenceService.cpp
diff --git a/Modules/Core/Interfaces/mitkIPropertyAliases.cpp b/Modules/Core/src/DataManagement/mitkIPropertyAliases.cpp
similarity index 100%
rename from Modules/Core/Interfaces/mitkIPropertyAliases.cpp
rename to Modules/Core/src/DataManagement/mitkIPropertyAliases.cpp
diff --git a/Modules/Core/Interfaces/mitkIPropertyDescriptions.cpp b/Modules/Core/src/DataManagement/mitkIPropertyDescriptions.cpp
similarity index 100%
rename from Modules/Core/Interfaces/mitkIPropertyDescriptions.cpp
rename to Modules/Core/src/DataManagement/mitkIPropertyDescriptions.cpp
diff --git a/Modules/Core/Interfaces/mitkIPropertyExtensions.cpp b/Modules/Core/src/DataManagement/mitkIPropertyExtensions.cpp
similarity index 100%
rename from Modules/Core/Interfaces/mitkIPropertyExtensions.cpp
rename to Modules/Core/src/DataManagement/mitkIPropertyExtensions.cpp
diff --git a/Modules/Core/Interfaces/mitkIPropertyFilters.cpp b/Modules/Core/src/DataManagement/mitkIPropertyFilters.cpp
similarity index 100%
rename from Modules/Core/Interfaces/mitkIPropertyFilters.cpp
rename to Modules/Core/src/DataManagement/mitkIPropertyFilters.cpp
diff --git a/Modules/Core/DataManagement/mitkImage.cpp b/Modules/Core/src/DataManagement/mitkImage.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImage.cpp
rename to Modules/Core/src/DataManagement/mitkImage.cpp
diff --git a/Modules/Core/DataManagement/mitkImageAccessorBase.cpp b/Modules/Core/src/DataManagement/mitkImageAccessorBase.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageAccessorBase.cpp
rename to Modules/Core/src/DataManagement/mitkImageAccessorBase.cpp
diff --git a/Modules/Core/DataManagement/mitkImageCastPart1.cpp b/Modules/Core/src/DataManagement/mitkImageCastPart1.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageCastPart1.cpp
rename to Modules/Core/src/DataManagement/mitkImageCastPart1.cpp
diff --git a/Modules/Core/DataManagement/mitkImageCastPart2.cpp b/Modules/Core/src/DataManagement/mitkImageCastPart2.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageCastPart2.cpp
rename to Modules/Core/src/DataManagement/mitkImageCastPart2.cpp
diff --git a/Modules/Core/DataManagement/mitkImageCastPart3.cpp b/Modules/Core/src/DataManagement/mitkImageCastPart3.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageCastPart3.cpp
rename to Modules/Core/src/DataManagement/mitkImageCastPart3.cpp
diff --git a/Modules/Core/DataManagement/mitkImageCastPart4.cpp b/Modules/Core/src/DataManagement/mitkImageCastPart4.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageCastPart4.cpp
rename to Modules/Core/src/DataManagement/mitkImageCastPart4.cpp
diff --git a/Modules/Core/DataManagement/mitkImageCaster.cpp b/Modules/Core/src/DataManagement/mitkImageCaster.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageCaster.cpp
rename to Modules/Core/src/DataManagement/mitkImageCaster.cpp
diff --git a/Modules/Core/DataManagement/mitkImageDataItem.cpp b/Modules/Core/src/DataManagement/mitkImageDataItem.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageDataItem.cpp
rename to Modules/Core/src/DataManagement/mitkImageDataItem.cpp
diff --git a/Modules/Core/DataManagement/mitkImageDescriptor.cpp b/Modules/Core/src/DataManagement/mitkImageDescriptor.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageDescriptor.cpp
rename to Modules/Core/src/DataManagement/mitkImageDescriptor.cpp
diff --git a/Modules/Core/DataManagement/mitkImageReadAccessor.cpp b/Modules/Core/src/DataManagement/mitkImageReadAccessor.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageReadAccessor.cpp
rename to Modules/Core/src/DataManagement/mitkImageReadAccessor.cpp
diff --git a/Modules/Core/DataManagement/mitkImageStatisticsHolder.cpp b/Modules/Core/src/DataManagement/mitkImageStatisticsHolder.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageStatisticsHolder.cpp
rename to Modules/Core/src/DataManagement/mitkImageStatisticsHolder.cpp
diff --git a/Modules/Core/DataManagement/mitkImageVtkAccessor.cpp b/Modules/Core/src/DataManagement/mitkImageVtkAccessor.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageVtkAccessor.cpp
rename to Modules/Core/src/DataManagement/mitkImageVtkAccessor.cpp
diff --git a/Modules/Core/DataManagement/mitkImageVtkReadAccessor.cpp b/Modules/Core/src/DataManagement/mitkImageVtkReadAccessor.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageVtkReadAccessor.cpp
rename to Modules/Core/src/DataManagement/mitkImageVtkReadAccessor.cpp
diff --git a/Modules/Core/DataManagement/mitkImageVtkWriteAccessor.cpp b/Modules/Core/src/DataManagement/mitkImageVtkWriteAccessor.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageVtkWriteAccessor.cpp
rename to Modules/Core/src/DataManagement/mitkImageVtkWriteAccessor.cpp
diff --git a/Modules/Core/DataManagement/mitkImageWriteAccessor.cpp b/Modules/Core/src/DataManagement/mitkImageWriteAccessor.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkImageWriteAccessor.cpp
rename to Modules/Core/src/DataManagement/mitkImageWriteAccessor.cpp
diff --git a/Modules/Core/DataManagement/mitkIntPropertyExtension.cpp b/Modules/Core/src/DataManagement/mitkIntPropertyExtension.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkIntPropertyExtension.cpp
rename to Modules/Core/src/DataManagement/mitkIntPropertyExtension.cpp
diff --git a/Modules/Core/DataManagement/mitkLandmarkProjector.cpp b/Modules/Core/src/DataManagement/mitkLandmarkProjector.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkLandmarkProjector.cpp
rename to Modules/Core/src/DataManagement/mitkLandmarkProjector.cpp
diff --git a/Modules/Core/DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp b/Modules/Core/src/DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp
rename to Modules/Core/src/DataManagement/mitkLandmarkProjectorBasedCurvedGeometry.cpp
diff --git a/Modules/Core/DataManagement/mitkLevelWindow.cpp b/Modules/Core/src/DataManagement/mitkLevelWindow.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkLevelWindow.cpp
rename to Modules/Core/src/DataManagement/mitkLevelWindow.cpp
diff --git a/Modules/Core/DataManagement/mitkLevelWindowManager.cpp b/Modules/Core/src/DataManagement/mitkLevelWindowManager.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkLevelWindowManager.cpp
rename to Modules/Core/src/DataManagement/mitkLevelWindowManager.cpp
diff --git a/Modules/Core/DataManagement/mitkLevelWindowPreset.cpp b/Modules/Core/src/DataManagement/mitkLevelWindowPreset.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkLevelWindowPreset.cpp
rename to Modules/Core/src/DataManagement/mitkLevelWindowPreset.cpp
diff --git a/Modules/Core/DataManagement/mitkLevelWindowProperty.cpp b/Modules/Core/src/DataManagement/mitkLevelWindowProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkLevelWindowProperty.cpp
rename to Modules/Core/src/DataManagement/mitkLevelWindowProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkLine.cpp b/Modules/Core/src/DataManagement/mitkLine.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkLine.cpp
rename to Modules/Core/src/DataManagement/mitkLine.cpp
diff --git a/Modules/Core/DataManagement/mitkLookupTable.cpp b/Modules/Core/src/DataManagement/mitkLookupTable.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkLookupTable.cpp
rename to Modules/Core/src/DataManagement/mitkLookupTable.cpp
diff --git a/Modules/Core/DataManagement/mitkLookupTableProperty.cpp b/Modules/Core/src/DataManagement/mitkLookupTableProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkLookupTableProperty.cpp
rename to Modules/Core/src/DataManagement/mitkLookupTableProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkLookupTables.cpp b/Modules/Core/src/DataManagement/mitkLookupTables.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkLookupTables.cpp
rename to Modules/Core/src/DataManagement/mitkLookupTables.cpp
diff --git a/Modules/Core/DataManagement/mitkMaterial.cpp b/Modules/Core/src/DataManagement/mitkMaterial.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkMaterial.cpp
rename to Modules/Core/src/DataManagement/mitkMaterial.cpp
diff --git a/Modules/Core/DataManagement/mitkMemoryUtilities.cpp b/Modules/Core/src/DataManagement/mitkMemoryUtilities.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkMemoryUtilities.cpp
rename to Modules/Core/src/DataManagement/mitkMemoryUtilities.cpp
diff --git a/Modules/Core/DataManagement/mitkModalityProperty.cpp b/Modules/Core/src/DataManagement/mitkModalityProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkModalityProperty.cpp
rename to Modules/Core/src/DataManagement/mitkModalityProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkModeOperation.cpp b/Modules/Core/src/DataManagement/mitkModeOperation.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkModeOperation.cpp
rename to Modules/Core/src/DataManagement/mitkModeOperation.cpp
diff --git a/Modules/Core/DataManagement/mitkModifiedLock.cpp b/Modules/Core/src/DataManagement/mitkModifiedLock.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkModifiedLock.cpp
rename to Modules/Core/src/DataManagement/mitkModifiedLock.cpp
diff --git a/Modules/Core/DataManagement/mitkNodePredicateAnd.cpp b/Modules/Core/src/DataManagement/mitkNodePredicateAnd.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateAnd.cpp
rename to Modules/Core/src/DataManagement/mitkNodePredicateAnd.cpp
diff --git a/Modules/Core/DataManagement/mitkNodePredicateBase.cpp b/Modules/Core/src/DataManagement/mitkNodePredicateBase.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateBase.cpp
rename to Modules/Core/src/DataManagement/mitkNodePredicateBase.cpp
diff --git a/Modules/Core/DataManagement/mitkNodePredicateCompositeBase.cpp b/Modules/Core/src/DataManagement/mitkNodePredicateCompositeBase.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateCompositeBase.cpp
rename to Modules/Core/src/DataManagement/mitkNodePredicateCompositeBase.cpp
diff --git a/Modules/Core/DataManagement/mitkNodePredicateData.cpp b/Modules/Core/src/DataManagement/mitkNodePredicateData.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateData.cpp
rename to Modules/Core/src/DataManagement/mitkNodePredicateData.cpp
diff --git a/Modules/Core/DataManagement/mitkNodePredicateDataType.cpp b/Modules/Core/src/DataManagement/mitkNodePredicateDataType.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateDataType.cpp
rename to Modules/Core/src/DataManagement/mitkNodePredicateDataType.cpp
diff --git a/Modules/Core/DataManagement/mitkNodePredicateDimension.cpp b/Modules/Core/src/DataManagement/mitkNodePredicateDimension.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateDimension.cpp
rename to Modules/Core/src/DataManagement/mitkNodePredicateDimension.cpp
diff --git a/Modules/Core/DataManagement/mitkNodePredicateFirstLevel.cpp b/Modules/Core/src/DataManagement/mitkNodePredicateFirstLevel.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateFirstLevel.cpp
rename to Modules/Core/src/DataManagement/mitkNodePredicateFirstLevel.cpp
diff --git a/Modules/Core/DataManagement/mitkNodePredicateNot.cpp b/Modules/Core/src/DataManagement/mitkNodePredicateNot.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateNot.cpp
rename to Modules/Core/src/DataManagement/mitkNodePredicateNot.cpp
diff --git a/Modules/Core/DataManagement/mitkNodePredicateOr.cpp b/Modules/Core/src/DataManagement/mitkNodePredicateOr.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateOr.cpp
rename to Modules/Core/src/DataManagement/mitkNodePredicateOr.cpp
diff --git a/Modules/Core/DataManagement/mitkNodePredicateProperty.cpp b/Modules/Core/src/DataManagement/mitkNodePredicateProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateProperty.cpp
rename to Modules/Core/src/DataManagement/mitkNodePredicateProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkNodePredicateSource.cpp b/Modules/Core/src/DataManagement/mitkNodePredicateSource.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkNodePredicateSource.cpp
rename to Modules/Core/src/DataManagement/mitkNodePredicateSource.cpp
diff --git a/Modules/Core/DataManagement/mitkNumericConstants.cpp b/Modules/Core/src/DataManagement/mitkNumericConstants.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkNumericConstants.cpp
rename to Modules/Core/src/DataManagement/mitkNumericConstants.cpp
diff --git a/Modules/Core/DataManagement/mitkPlaneGeometry.cpp b/Modules/Core/src/DataManagement/mitkPlaneGeometry.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPlaneGeometry.cpp
rename to Modules/Core/src/DataManagement/mitkPlaneGeometry.cpp
diff --git a/Modules/Core/DataManagement/mitkPlaneGeometryData.cpp b/Modules/Core/src/DataManagement/mitkPlaneGeometryData.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPlaneGeometryData.cpp
rename to Modules/Core/src/DataManagement/mitkPlaneGeometryData.cpp
diff --git a/Modules/Core/DataManagement/mitkPlaneOperation.cpp b/Modules/Core/src/DataManagement/mitkPlaneOperation.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPlaneOperation.cpp
rename to Modules/Core/src/DataManagement/mitkPlaneOperation.cpp
diff --git a/Modules/Core/DataManagement/mitkPlaneOrientationProperty.cpp b/Modules/Core/src/DataManagement/mitkPlaneOrientationProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPlaneOrientationProperty.cpp
rename to Modules/Core/src/DataManagement/mitkPlaneOrientationProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkPointOperation.cpp b/Modules/Core/src/DataManagement/mitkPointOperation.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPointOperation.cpp
rename to Modules/Core/src/DataManagement/mitkPointOperation.cpp
diff --git a/Modules/Core/DataManagement/mitkPointSet.cpp b/Modules/Core/src/DataManagement/mitkPointSet.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPointSet.cpp
rename to Modules/Core/src/DataManagement/mitkPointSet.cpp
diff --git a/Modules/Core/DataManagement/mitkPointSetShapeProperty.cpp b/Modules/Core/src/DataManagement/mitkPointSetShapeProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPointSetShapeProperty.cpp
rename to Modules/Core/src/DataManagement/mitkPointSetShapeProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkProperties.cpp b/Modules/Core/src/DataManagement/mitkProperties.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkProperties.cpp
rename to Modules/Core/src/DataManagement/mitkProperties.cpp
diff --git a/Modules/Core/DataManagement/mitkPropertyAliases.cpp b/Modules/Core/src/DataManagement/mitkPropertyAliases.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyAliases.cpp
rename to Modules/Core/src/DataManagement/mitkPropertyAliases.cpp
diff --git a/Modules/Core/DataManagement/mitkPropertyDescriptions.cpp b/Modules/Core/src/DataManagement/mitkPropertyDescriptions.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyDescriptions.cpp
rename to Modules/Core/src/DataManagement/mitkPropertyDescriptions.cpp
diff --git a/Modules/Core/DataManagement/mitkPropertyExtension.cpp b/Modules/Core/src/DataManagement/mitkPropertyExtension.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyExtension.cpp
rename to Modules/Core/src/DataManagement/mitkPropertyExtension.cpp
diff --git a/Modules/Core/DataManagement/mitkPropertyExtensions.cpp b/Modules/Core/src/DataManagement/mitkPropertyExtensions.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyExtensions.cpp
rename to Modules/Core/src/DataManagement/mitkPropertyExtensions.cpp
diff --git a/Modules/Core/DataManagement/mitkPropertyFilter.cpp b/Modules/Core/src/DataManagement/mitkPropertyFilter.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyFilter.cpp
rename to Modules/Core/src/DataManagement/mitkPropertyFilter.cpp
diff --git a/Modules/Core/DataManagement/mitkPropertyFilters.cpp b/Modules/Core/src/DataManagement/mitkPropertyFilters.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyFilters.cpp
rename to Modules/Core/src/DataManagement/mitkPropertyFilters.cpp
diff --git a/Modules/Core/DataManagement/mitkPropertyList.cpp b/Modules/Core/src/DataManagement/mitkPropertyList.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyList.cpp
rename to Modules/Core/src/DataManagement/mitkPropertyList.cpp
diff --git a/Modules/Core/DataManagement/mitkPropertyListReplacedObserver.cpp b/Modules/Core/src/DataManagement/mitkPropertyListReplacedObserver.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyListReplacedObserver.cpp
rename to Modules/Core/src/DataManagement/mitkPropertyListReplacedObserver.cpp
diff --git a/Modules/Core/DataManagement/mitkPropertyObserver.cpp b/Modules/Core/src/DataManagement/mitkPropertyObserver.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkPropertyObserver.cpp
rename to Modules/Core/src/DataManagement/mitkPropertyObserver.cpp
diff --git a/Modules/Core/DataManagement/mitkProportionalTimeGeometry.cpp b/Modules/Core/src/DataManagement/mitkProportionalTimeGeometry.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkProportionalTimeGeometry.cpp
rename to Modules/Core/src/DataManagement/mitkProportionalTimeGeometry.cpp
diff --git a/Modules/Core/DataManagement/mitkRenderingModeProperty.cpp b/Modules/Core/src/DataManagement/mitkRenderingModeProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkRenderingModeProperty.cpp
rename to Modules/Core/src/DataManagement/mitkRenderingModeProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkResliceMethodProperty.cpp b/Modules/Core/src/DataManagement/mitkResliceMethodProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkResliceMethodProperty.cpp
rename to Modules/Core/src/DataManagement/mitkResliceMethodProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkRestorePlanePositionOperation.cpp b/Modules/Core/src/DataManagement/mitkRestorePlanePositionOperation.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkRestorePlanePositionOperation.cpp
rename to Modules/Core/src/DataManagement/mitkRestorePlanePositionOperation.cpp
diff --git a/Modules/Core/DataManagement/mitkRotationOperation.cpp b/Modules/Core/src/DataManagement/mitkRotationOperation.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkRotationOperation.cpp
rename to Modules/Core/src/DataManagement/mitkRotationOperation.cpp
diff --git a/Modules/Core/DataManagement/mitkShaderProperty.cpp b/Modules/Core/src/DataManagement/mitkShaderProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkShaderProperty.cpp
rename to Modules/Core/src/DataManagement/mitkShaderProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkSlicedData.cpp b/Modules/Core/src/DataManagement/mitkSlicedData.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkSlicedData.cpp
rename to Modules/Core/src/DataManagement/mitkSlicedData.cpp
diff --git a/Modules/Core/DataManagement/mitkSlicedGeometry3D.cpp b/Modules/Core/src/DataManagement/mitkSlicedGeometry3D.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkSlicedGeometry3D.cpp
rename to Modules/Core/src/DataManagement/mitkSlicedGeometry3D.cpp
diff --git a/Modules/Core/DataManagement/mitkSmartPointerProperty.cpp b/Modules/Core/src/DataManagement/mitkSmartPointerProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkSmartPointerProperty.cpp
rename to Modules/Core/src/DataManagement/mitkSmartPointerProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkStandaloneDataStorage.cpp b/Modules/Core/src/DataManagement/mitkStandaloneDataStorage.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkStandaloneDataStorage.cpp
rename to Modules/Core/src/DataManagement/mitkStandaloneDataStorage.cpp
diff --git a/Modules/Core/DataManagement/mitkStateTransitionOperation.cpp b/Modules/Core/src/DataManagement/mitkStateTransitionOperation.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkStateTransitionOperation.cpp
rename to Modules/Core/src/DataManagement/mitkStateTransitionOperation.cpp
diff --git a/Modules/Core/DataManagement/mitkStringProperty.cpp b/Modules/Core/src/DataManagement/mitkStringProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkStringProperty.cpp
rename to Modules/Core/src/DataManagement/mitkStringProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkSurface.cpp b/Modules/Core/src/DataManagement/mitkSurface.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkSurface.cpp
rename to Modules/Core/src/DataManagement/mitkSurface.cpp
diff --git a/Modules/Core/DataManagement/mitkSurfaceOperation.cpp b/Modules/Core/src/DataManagement/mitkSurfaceOperation.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkSurfaceOperation.cpp
rename to Modules/Core/src/DataManagement/mitkSurfaceOperation.cpp
diff --git a/Modules/Core/DataManagement/mitkThinPlateSplineCurvedGeometry.cpp b/Modules/Core/src/DataManagement/mitkThinPlateSplineCurvedGeometry.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkThinPlateSplineCurvedGeometry.cpp
rename to Modules/Core/src/DataManagement/mitkThinPlateSplineCurvedGeometry.cpp
diff --git a/Modules/Core/DataManagement/mitkTimeGeometry.cpp b/Modules/Core/src/DataManagement/mitkTimeGeometry.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkTimeGeometry.cpp
rename to Modules/Core/src/DataManagement/mitkTimeGeometry.cpp
diff --git a/Modules/Core/DataManagement/mitkTransferFunction.cpp b/Modules/Core/src/DataManagement/mitkTransferFunction.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkTransferFunction.cpp
rename to Modules/Core/src/DataManagement/mitkTransferFunction.cpp
diff --git a/Modules/Core/DataManagement/mitkTransferFunctionInitializer.cpp b/Modules/Core/src/DataManagement/mitkTransferFunctionInitializer.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkTransferFunctionInitializer.cpp
rename to Modules/Core/src/DataManagement/mitkTransferFunctionInitializer.cpp
diff --git a/Modules/Core/DataManagement/mitkTransferFunctionProperty.cpp b/Modules/Core/src/DataManagement/mitkTransferFunctionProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkTransferFunctionProperty.cpp
rename to Modules/Core/src/DataManagement/mitkTransferFunctionProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkVector.cpp b/Modules/Core/src/DataManagement/mitkVector.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkVector.cpp
rename to Modules/Core/src/DataManagement/mitkVector.cpp
diff --git a/Modules/Core/DataManagement/mitkVtkInterpolationProperty.cpp b/Modules/Core/src/DataManagement/mitkVtkInterpolationProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkVtkInterpolationProperty.cpp
rename to Modules/Core/src/DataManagement/mitkVtkInterpolationProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkVtkRepresentationProperty.cpp b/Modules/Core/src/DataManagement/mitkVtkRepresentationProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkVtkRepresentationProperty.cpp
rename to Modules/Core/src/DataManagement/mitkVtkRepresentationProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkVtkResliceInterpolationProperty.cpp b/Modules/Core/src/DataManagement/mitkVtkResliceInterpolationProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkVtkResliceInterpolationProperty.cpp
rename to Modules/Core/src/DataManagement/mitkVtkResliceInterpolationProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkVtkScalarModeProperty.cpp b/Modules/Core/src/DataManagement/mitkVtkScalarModeProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkVtkScalarModeProperty.cpp
rename to Modules/Core/src/DataManagement/mitkVtkScalarModeProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkVtkVolumeRenderingProperty.cpp b/Modules/Core/src/DataManagement/mitkVtkVolumeRenderingProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkVtkVolumeRenderingProperty.cpp
rename to Modules/Core/src/DataManagement/mitkVtkVolumeRenderingProperty.cpp
diff --git a/Modules/Core/DataManagement/mitkWeakPointerProperty.cpp b/Modules/Core/src/DataManagement/mitkWeakPointerProperty.cpp
similarity index 100%
rename from Modules/Core/DataManagement/mitkWeakPointerProperty.cpp
rename to Modules/Core/src/DataManagement/mitkWeakPointerProperty.cpp
diff --git a/Modules/Core/IO/mitkAbstractFileIO.cpp b/Modules/Core/src/IO/mitkAbstractFileIO.cpp
similarity index 100%
rename from Modules/Core/IO/mitkAbstractFileIO.cpp
rename to Modules/Core/src/IO/mitkAbstractFileIO.cpp
diff --git a/Modules/Core/IO/mitkAbstractFileReader.cpp b/Modules/Core/src/IO/mitkAbstractFileReader.cpp
similarity index 100%
rename from Modules/Core/IO/mitkAbstractFileReader.cpp
rename to Modules/Core/src/IO/mitkAbstractFileReader.cpp
diff --git a/Modules/Core/IO/mitkAbstractFileWriter.cpp b/Modules/Core/src/IO/mitkAbstractFileWriter.cpp
similarity index 100%
rename from Modules/Core/IO/mitkAbstractFileWriter.cpp
rename to Modules/Core/src/IO/mitkAbstractFileWriter.cpp
diff --git a/Modules/Core/IO/mitkCustomMimeType.cpp b/Modules/Core/src/IO/mitkCustomMimeType.cpp
similarity index 100%
rename from Modules/Core/IO/mitkCustomMimeType.cpp
rename to Modules/Core/src/IO/mitkCustomMimeType.cpp
diff --git a/Modules/Core/IO/mitkDicomSR_GantryTiltInformation.cpp b/Modules/Core/src/IO/mitkDicomSR_GantryTiltInformation.cpp
similarity index 100%
rename from Modules/Core/IO/mitkDicomSR_GantryTiltInformation.cpp
rename to Modules/Core/src/IO/mitkDicomSR_GantryTiltInformation.cpp
diff --git a/Modules/Core/IO/mitkDicomSR_ImageBlockDescriptor.cpp b/Modules/Core/src/IO/mitkDicomSR_ImageBlockDescriptor.cpp
similarity index 100%
rename from Modules/Core/IO/mitkDicomSR_ImageBlockDescriptor.cpp
rename to Modules/Core/src/IO/mitkDicomSR_ImageBlockDescriptor.cpp
diff --git a/Modules/Core/IO/mitkDicomSR_LoadDICOMRGBPixel.cpp b/Modules/Core/src/IO/mitkDicomSR_LoadDICOMRGBPixel.cpp
similarity index 100%
rename from Modules/Core/IO/mitkDicomSR_LoadDICOMRGBPixel.cpp
rename to Modules/Core/src/IO/mitkDicomSR_LoadDICOMRGBPixel.cpp
diff --git a/Modules/Core/IO/mitkDicomSR_LoadDICOMRGBPixel4D.cpp b/Modules/Core/src/IO/mitkDicomSR_LoadDICOMRGBPixel4D.cpp
similarity index 100%
rename from Modules/Core/IO/mitkDicomSR_LoadDICOMRGBPixel4D.cpp
rename to Modules/Core/src/IO/mitkDicomSR_LoadDICOMRGBPixel4D.cpp
diff --git a/Modules/Core/IO/mitkDicomSR_LoadDICOMScalar.cpp b/Modules/Core/src/IO/mitkDicomSR_LoadDICOMScalar.cpp
similarity index 100%
rename from Modules/Core/IO/mitkDicomSR_LoadDICOMScalar.cpp
rename to Modules/Core/src/IO/mitkDicomSR_LoadDICOMScalar.cpp
diff --git a/Modules/Core/IO/mitkDicomSR_LoadDICOMScalar4D.cpp b/Modules/Core/src/IO/mitkDicomSR_LoadDICOMScalar4D.cpp
similarity index 100%
rename from Modules/Core/IO/mitkDicomSR_LoadDICOMScalar4D.cpp
rename to Modules/Core/src/IO/mitkDicomSR_LoadDICOMScalar4D.cpp
diff --git a/Modules/Core/IO/mitkDicomSR_SliceGroupingResult.cpp b/Modules/Core/src/IO/mitkDicomSR_SliceGroupingResult.cpp
similarity index 100%
rename from Modules/Core/IO/mitkDicomSR_SliceGroupingResult.cpp
rename to Modules/Core/src/IO/mitkDicomSR_SliceGroupingResult.cpp
diff --git a/Modules/Core/IO/mitkDicomSeriesReader.cpp b/Modules/Core/src/IO/mitkDicomSeriesReader.cpp
similarity index 100%
rename from Modules/Core/IO/mitkDicomSeriesReader.cpp
rename to Modules/Core/src/IO/mitkDicomSeriesReader.cpp
diff --git a/Modules/Core/Internal/mitkDicomSeriesReaderService.cpp b/Modules/Core/src/IO/mitkDicomSeriesReaderService.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkDicomSeriesReaderService.cpp
rename to Modules/Core/src/IO/mitkDicomSeriesReaderService.cpp
diff --git a/Modules/Core/Internal/mitkDicomSeriesReaderService.h b/Modules/Core/src/IO/mitkDicomSeriesReaderService.h
similarity index 100%
rename from Modules/Core/Internal/mitkDicomSeriesReaderService.h
rename to Modules/Core/src/IO/mitkDicomSeriesReaderService.h
diff --git a/Modules/Core/IO/mitkFileReader.cpp b/Modules/Core/src/IO/mitkFileReader.cpp
similarity index 100%
rename from Modules/Core/IO/mitkFileReader.cpp
rename to Modules/Core/src/IO/mitkFileReader.cpp
diff --git a/Modules/Core/IO/mitkFileReaderRegistry.cpp b/Modules/Core/src/IO/mitkFileReaderRegistry.cpp
similarity index 100%
rename from Modules/Core/IO/mitkFileReaderRegistry.cpp
rename to Modules/Core/src/IO/mitkFileReaderRegistry.cpp
diff --git a/Modules/Core/IO/mitkFileReaderSelector.cpp b/Modules/Core/src/IO/mitkFileReaderSelector.cpp
similarity index 100%
rename from Modules/Core/IO/mitkFileReaderSelector.cpp
rename to Modules/Core/src/IO/mitkFileReaderSelector.cpp
diff --git a/Modules/Core/Internal/mitkFileReaderWriterBase.cpp b/Modules/Core/src/IO/mitkFileReaderWriterBase.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkFileReaderWriterBase.cpp
rename to Modules/Core/src/IO/mitkFileReaderWriterBase.cpp
diff --git a/Modules/Core/Internal/mitkFileReaderWriterBase.h b/Modules/Core/src/IO/mitkFileReaderWriterBase.h
similarity index 100%
rename from Modules/Core/Internal/mitkFileReaderWriterBase.h
rename to Modules/Core/src/IO/mitkFileReaderWriterBase.h
diff --git a/Modules/Core/IO/mitkFileWriter.cpp b/Modules/Core/src/IO/mitkFileWriter.cpp
similarity index 100%
rename from Modules/Core/IO/mitkFileWriter.cpp
rename to Modules/Core/src/IO/mitkFileWriter.cpp
diff --git a/Modules/Core/IO/mitkFileWriterRegistry.cpp b/Modules/Core/src/IO/mitkFileWriterRegistry.cpp
similarity index 100%
rename from Modules/Core/IO/mitkFileWriterRegistry.cpp
rename to Modules/Core/src/IO/mitkFileWriterRegistry.cpp
diff --git a/Modules/Core/IO/mitkFileWriterSelector.cpp b/Modules/Core/src/IO/mitkFileWriterSelector.cpp
similarity index 100%
rename from Modules/Core/IO/mitkFileWriterSelector.cpp
rename to Modules/Core/src/IO/mitkFileWriterSelector.cpp
diff --git a/Modules/Core/IO/mitkIFileIO.cpp b/Modules/Core/src/IO/mitkIFileIO.cpp
similarity index 100%
rename from Modules/Core/IO/mitkIFileIO.cpp
rename to Modules/Core/src/IO/mitkIFileIO.cpp
diff --git a/Modules/Core/Interfaces/mitkIFileReader.cpp b/Modules/Core/src/IO/mitkIFileReader.cpp
similarity index 100%
rename from Modules/Core/Interfaces/mitkIFileReader.cpp
rename to Modules/Core/src/IO/mitkIFileReader.cpp
diff --git a/Modules/Core/Interfaces/mitkIFileWriter.cpp b/Modules/Core/src/IO/mitkIFileWriter.cpp
similarity index 100%
rename from Modules/Core/Interfaces/mitkIFileWriter.cpp
rename to Modules/Core/src/IO/mitkIFileWriter.cpp
diff --git a/Modules/Core/Interfaces/mitkIMimeTypeProvider.cpp b/Modules/Core/src/IO/mitkIMimeTypeProvider.cpp
similarity index 100%
rename from Modules/Core/Interfaces/mitkIMimeTypeProvider.cpp
rename to Modules/Core/src/IO/mitkIMimeTypeProvider.cpp
diff --git a/Modules/Core/IO/mitkIOConstants.cpp b/Modules/Core/src/IO/mitkIOConstants.cpp
similarity index 100%
rename from Modules/Core/IO/mitkIOConstants.cpp
rename to Modules/Core/src/IO/mitkIOConstants.cpp
diff --git a/Modules/Core/IO/mitkIOMimeTypes.cpp b/Modules/Core/src/IO/mitkIOMimeTypes.cpp
similarity index 100%
rename from Modules/Core/IO/mitkIOMimeTypes.cpp
rename to Modules/Core/src/IO/mitkIOMimeTypes.cpp
diff --git a/Modules/Core/IO/mitkIOUtil.cpp b/Modules/Core/src/IO/mitkIOUtil.cpp
similarity index 100%
rename from Modules/Core/IO/mitkIOUtil.cpp
rename to Modules/Core/src/IO/mitkIOUtil.cpp
diff --git a/Modules/Core/IO/mitkImageGenerator.cpp b/Modules/Core/src/IO/mitkImageGenerator.cpp
similarity index 100%
rename from Modules/Core/IO/mitkImageGenerator.cpp
rename to Modules/Core/src/IO/mitkImageGenerator.cpp
diff --git a/Modules/Core/Internal/mitkImageVtkLegacyIO.cpp b/Modules/Core/src/IO/mitkImageVtkLegacyIO.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkImageVtkLegacyIO.cpp
rename to Modules/Core/src/IO/mitkImageVtkLegacyIO.cpp
diff --git a/Modules/Core/Internal/mitkImageVtkLegacyIO.h b/Modules/Core/src/IO/mitkImageVtkLegacyIO.h
similarity index 100%
rename from Modules/Core/Internal/mitkImageVtkLegacyIO.h
rename to Modules/Core/src/IO/mitkImageVtkLegacyIO.h
diff --git a/Modules/Core/Internal/mitkImageVtkXmlIO.cpp b/Modules/Core/src/IO/mitkImageVtkXmlIO.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkImageVtkXmlIO.cpp
rename to Modules/Core/src/IO/mitkImageVtkXmlIO.cpp
diff --git a/Modules/Core/Internal/mitkImageVtkXmlIO.h b/Modules/Core/src/IO/mitkImageVtkXmlIO.h
similarity index 100%
rename from Modules/Core/Internal/mitkImageVtkXmlIO.h
rename to Modules/Core/src/IO/mitkImageVtkXmlIO.h
diff --git a/Modules/Core/Internal/mitkItkImageIO.cpp b/Modules/Core/src/IO/mitkItkImageIO.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkItkImageIO.cpp
rename to Modules/Core/src/IO/mitkItkImageIO.cpp
diff --git a/Modules/Core/Internal/mitkItkImageIO.h b/Modules/Core/src/IO/mitkItkImageIO.h
similarity index 100%
rename from Modules/Core/Internal/mitkItkImageIO.h
rename to Modules/Core/src/IO/mitkItkImageIO.h
diff --git a/Modules/Core/IO/mitkItkLoggingAdapter.cpp b/Modules/Core/src/IO/mitkItkLoggingAdapter.cpp
similarity index 100%
rename from Modules/Core/IO/mitkItkLoggingAdapter.cpp
rename to Modules/Core/src/IO/mitkItkLoggingAdapter.cpp
diff --git a/Modules/Core/Internal/mitkLegacyFileReaderService.cpp b/Modules/Core/src/IO/mitkLegacyFileReaderService.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkLegacyFileReaderService.cpp
rename to Modules/Core/src/IO/mitkLegacyFileReaderService.cpp
diff --git a/Modules/Core/Internal/mitkLegacyFileReaderService.h b/Modules/Core/src/IO/mitkLegacyFileReaderService.h
similarity index 100%
rename from Modules/Core/Internal/mitkLegacyFileReaderService.h
rename to Modules/Core/src/IO/mitkLegacyFileReaderService.h
diff --git a/Modules/Core/Internal/mitkLegacyFileWriterService.cpp b/Modules/Core/src/IO/mitkLegacyFileWriterService.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkLegacyFileWriterService.cpp
rename to Modules/Core/src/IO/mitkLegacyFileWriterService.cpp
diff --git a/Modules/Core/Internal/mitkLegacyFileWriterService.h b/Modules/Core/src/IO/mitkLegacyFileWriterService.h
similarity index 100%
rename from Modules/Core/Internal/mitkLegacyFileWriterService.h
rename to Modules/Core/src/IO/mitkLegacyFileWriterService.h
diff --git a/Modules/Core/IO/mitkLog.cpp b/Modules/Core/src/IO/mitkLog.cpp
similarity index 100%
rename from Modules/Core/IO/mitkLog.cpp
rename to Modules/Core/src/IO/mitkLog.cpp
diff --git a/Modules/Core/IO/mitkMimeType.cpp b/Modules/Core/src/IO/mitkMimeType.cpp
similarity index 100%
rename from Modules/Core/IO/mitkMimeType.cpp
rename to Modules/Core/src/IO/mitkMimeType.cpp
diff --git a/Modules/Core/Internal/mitkMimeTypeProvider.cpp b/Modules/Core/src/IO/mitkMimeTypeProvider.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkMimeTypeProvider.cpp
rename to Modules/Core/src/IO/mitkMimeTypeProvider.cpp
diff --git a/Modules/Core/Internal/mitkMimeTypeProvider.h b/Modules/Core/src/IO/mitkMimeTypeProvider.h
similarity index 100%
rename from Modules/Core/Internal/mitkMimeTypeProvider.h
rename to Modules/Core/src/IO/mitkMimeTypeProvider.h
diff --git a/Modules/Core/IO/mitkOperation.cpp b/Modules/Core/src/IO/mitkOperation.cpp
similarity index 100%
rename from Modules/Core/IO/mitkOperation.cpp
rename to Modules/Core/src/IO/mitkOperation.cpp
diff --git a/Modules/Core/IO/mitkPixelType.cpp b/Modules/Core/src/IO/mitkPixelType.cpp
similarity index 100%
rename from Modules/Core/IO/mitkPixelType.cpp
rename to Modules/Core/src/IO/mitkPixelType.cpp
diff --git a/Modules/Core/Internal/mitkPointSetReaderService.cpp b/Modules/Core/src/IO/mitkPointSetReaderService.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkPointSetReaderService.cpp
rename to Modules/Core/src/IO/mitkPointSetReaderService.cpp
diff --git a/Modules/Core/Internal/mitkPointSetReaderService.h b/Modules/Core/src/IO/mitkPointSetReaderService.h
similarity index 100%
rename from Modules/Core/Internal/mitkPointSetReaderService.h
rename to Modules/Core/src/IO/mitkPointSetReaderService.h
diff --git a/Modules/Core/Internal/mitkPointSetWriterService.cpp b/Modules/Core/src/IO/mitkPointSetWriterService.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkPointSetWriterService.cpp
rename to Modules/Core/src/IO/mitkPointSetWriterService.cpp
diff --git a/Modules/Core/Internal/mitkPointSetWriterService.h b/Modules/Core/src/IO/mitkPointSetWriterService.h
similarity index 100%
rename from Modules/Core/Internal/mitkPointSetWriterService.h
rename to Modules/Core/src/IO/mitkPointSetWriterService.h
diff --git a/Modules/Core/Internal/mitkRawImageFileReader.cpp b/Modules/Core/src/IO/mitkRawImageFileReader.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkRawImageFileReader.cpp
rename to Modules/Core/src/IO/mitkRawImageFileReader.cpp
diff --git a/Modules/Core/Internal/mitkRawImageFileReader.h b/Modules/Core/src/IO/mitkRawImageFileReader.h
similarity index 100%
rename from Modules/Core/Internal/mitkRawImageFileReader.h
rename to Modules/Core/src/IO/mitkRawImageFileReader.h
diff --git a/Modules/Core/IO/mitkStandardFileLocations.cpp b/Modules/Core/src/IO/mitkStandardFileLocations.cpp
similarity index 100%
rename from Modules/Core/IO/mitkStandardFileLocations.cpp
rename to Modules/Core/src/IO/mitkStandardFileLocations.cpp
diff --git a/Modules/Core/Internal/mitkSurfaceStlIO.cpp b/Modules/Core/src/IO/mitkSurfaceStlIO.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkSurfaceStlIO.cpp
rename to Modules/Core/src/IO/mitkSurfaceStlIO.cpp
diff --git a/Modules/Core/Internal/mitkSurfaceStlIO.h b/Modules/Core/src/IO/mitkSurfaceStlIO.h
similarity index 100%
rename from Modules/Core/Internal/mitkSurfaceStlIO.h
rename to Modules/Core/src/IO/mitkSurfaceStlIO.h
diff --git a/Modules/Core/Internal/mitkSurfaceVtkIO.cpp b/Modules/Core/src/IO/mitkSurfaceVtkIO.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkSurfaceVtkIO.cpp
rename to Modules/Core/src/IO/mitkSurfaceVtkIO.cpp
diff --git a/Modules/Core/Internal/mitkSurfaceVtkIO.h b/Modules/Core/src/IO/mitkSurfaceVtkIO.h
similarity index 100%
rename from Modules/Core/Internal/mitkSurfaceVtkIO.h
rename to Modules/Core/src/IO/mitkSurfaceVtkIO.h
diff --git a/Modules/Core/Internal/mitkSurfaceVtkLegacyIO.cpp b/Modules/Core/src/IO/mitkSurfaceVtkLegacyIO.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkSurfaceVtkLegacyIO.cpp
rename to Modules/Core/src/IO/mitkSurfaceVtkLegacyIO.cpp
diff --git a/Modules/Core/Internal/mitkSurfaceVtkLegacyIO.h b/Modules/Core/src/IO/mitkSurfaceVtkLegacyIO.h
similarity index 100%
rename from Modules/Core/Internal/mitkSurfaceVtkLegacyIO.h
rename to Modules/Core/src/IO/mitkSurfaceVtkLegacyIO.h
diff --git a/Modules/Core/Internal/mitkSurfaceVtkXmlIO.cpp b/Modules/Core/src/IO/mitkSurfaceVtkXmlIO.cpp
similarity index 100%
rename from Modules/Core/Internal/mitkSurfaceVtkXmlIO.cpp
rename to Modules/Core/src/IO/mitkSurfaceVtkXmlIO.cpp
diff --git a/Modules/Core/Internal/mitkSurfaceVtkXmlIO.h b/Modules/Core/src/IO/mitkSurfaceVtkXmlIO.h
similarity index 100%
rename from Modules/Core/Internal/mitkSurfaceVtkXmlIO.h
rename to Modules/Core/src/IO/mitkSurfaceVtkXmlIO.h
diff --git a/Modules/Core/IO/mitkVtkLoggingAdapter.cpp b/Modules/Core/src/IO/mitkVtkLoggingAdapter.cpp
similarity index 100%
rename from Modules/Core/IO/mitkVtkLoggingAdapter.cpp
rename to Modules/Core/src/IO/mitkVtkLoggingAdapter.cpp
diff --git a/Modules/Core/Interactions/mitkAction.cpp b/Modules/Core/src/Interactions/mitkAction.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkAction.cpp
rename to Modules/Core/src/Interactions/mitkAction.cpp
diff --git a/Modules/Core/Interactions/mitkAffineInteractor.cpp b/Modules/Core/src/Interactions/mitkAffineInteractor.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkAffineInteractor.cpp
rename to Modules/Core/src/Interactions/mitkAffineInteractor.cpp
diff --git a/Modules/Core/Interactions/mitkBindDispatcherInteractor.cpp b/Modules/Core/src/Interactions/mitkBindDispatcherInteractor.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkBindDispatcherInteractor.cpp
rename to Modules/Core/src/Interactions/mitkBindDispatcherInteractor.cpp
diff --git a/Modules/Core/Interactions/mitkCoordinateSupplier.cpp b/Modules/Core/src/Interactions/mitkCoordinateSupplier.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkCoordinateSupplier.cpp
rename to Modules/Core/src/Interactions/mitkCoordinateSupplier.cpp
diff --git a/Modules/Core/Interactions/mitkCrosshairPositionEvent.cpp b/Modules/Core/src/Interactions/mitkCrosshairPositionEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkCrosshairPositionEvent.cpp
rename to Modules/Core/src/Interactions/mitkCrosshairPositionEvent.cpp
diff --git a/Modules/Core/Interactions/mitkDataInteractor.cpp b/Modules/Core/src/Interactions/mitkDataInteractor.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkDataInteractor.cpp
rename to Modules/Core/src/Interactions/mitkDataInteractor.cpp
diff --git a/Modules/Core/Interactions/mitkDispatcher.cpp b/Modules/Core/src/Interactions/mitkDispatcher.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkDispatcher.cpp
rename to Modules/Core/src/Interactions/mitkDispatcher.cpp
diff --git a/Modules/Core/Interactions/mitkDisplayCoordinateOperation.cpp b/Modules/Core/src/Interactions/mitkDisplayCoordinateOperation.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkDisplayCoordinateOperation.cpp
rename to Modules/Core/src/Interactions/mitkDisplayCoordinateOperation.cpp
diff --git a/Modules/Core/Interactions/mitkDisplayInteractor.cpp b/Modules/Core/src/Interactions/mitkDisplayInteractor.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkDisplayInteractor.cpp
rename to Modules/Core/src/Interactions/mitkDisplayInteractor.cpp
diff --git a/Modules/Core/Interactions/mitkDisplayPositionEvent.cpp b/Modules/Core/src/Interactions/mitkDisplayPositionEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkDisplayPositionEvent.cpp
rename to Modules/Core/src/Interactions/mitkDisplayPositionEvent.cpp
diff --git a/Modules/Core/Interactions/mitkDisplayVectorInteractorLevelWindow.cpp b/Modules/Core/src/Interactions/mitkDisplayVectorInteractorLevelWindow.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkDisplayVectorInteractorLevelWindow.cpp
rename to Modules/Core/src/Interactions/mitkDisplayVectorInteractorLevelWindow.cpp
diff --git a/Modules/Core/Interactions/mitkDisplayVectorInteractorScroll.cpp b/Modules/Core/src/Interactions/mitkDisplayVectorInteractorScroll.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkDisplayVectorInteractorScroll.cpp
rename to Modules/Core/src/Interactions/mitkDisplayVectorInteractorScroll.cpp
diff --git a/Modules/Core/Interactions/mitkEvent.cpp b/Modules/Core/src/Interactions/mitkEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkEvent.cpp
rename to Modules/Core/src/Interactions/mitkEvent.cpp
diff --git a/Modules/Core/Interactions/mitkEventConfig.cpp b/Modules/Core/src/Interactions/mitkEventConfig.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkEventConfig.cpp
rename to Modules/Core/src/Interactions/mitkEventConfig.cpp
diff --git a/Modules/Core/Interactions/mitkEventDescription.cpp b/Modules/Core/src/Interactions/mitkEventDescription.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkEventDescription.cpp
rename to Modules/Core/src/Interactions/mitkEventDescription.cpp
diff --git a/Modules/Core/Interactions/mitkEventFactory.cpp b/Modules/Core/src/Interactions/mitkEventFactory.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkEventFactory.cpp
rename to Modules/Core/src/Interactions/mitkEventFactory.cpp
diff --git a/Modules/Core/Interactions/mitkEventMapper.cpp b/Modules/Core/src/Interactions/mitkEventMapper.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkEventMapper.cpp
rename to Modules/Core/src/Interactions/mitkEventMapper.cpp
diff --git a/Modules/Core/Interactions/mitkEventRecorder.cpp b/Modules/Core/src/Interactions/mitkEventRecorder.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkEventRecorder.cpp
rename to Modules/Core/src/Interactions/mitkEventRecorder.cpp
diff --git a/Modules/Core/Interactions/mitkEventStateMachine.cpp b/Modules/Core/src/Interactions/mitkEventStateMachine.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkEventStateMachine.cpp
rename to Modules/Core/src/Interactions/mitkEventStateMachine.cpp
diff --git a/Modules/Core/Interactions/mitkGlobalInteraction.cpp b/Modules/Core/src/Interactions/mitkGlobalInteraction.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkGlobalInteraction.cpp
rename to Modules/Core/src/Interactions/mitkGlobalInteraction.cpp
diff --git a/Modules/Core/Interactions/mitkInteractionEvent.cpp b/Modules/Core/src/Interactions/mitkInteractionEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkInteractionEvent.cpp
rename to Modules/Core/src/Interactions/mitkInteractionEvent.cpp
diff --git a/Modules/Core/Interactions/mitkInteractionEventConst.cpp b/Modules/Core/src/Interactions/mitkInteractionEventConst.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkInteractionEventConst.cpp
rename to Modules/Core/src/Interactions/mitkInteractionEventConst.cpp
diff --git a/Modules/Core/Interactions/mitkInteractionEventHandler.cpp b/Modules/Core/src/Interactions/mitkInteractionEventHandler.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkInteractionEventHandler.cpp
rename to Modules/Core/src/Interactions/mitkInteractionEventHandler.cpp
diff --git a/Modules/Core/Interfaces/mitkInteractionEventObserver.cpp b/Modules/Core/src/Interactions/mitkInteractionEventObserver.cpp
similarity index 100%
rename from Modules/Core/Interfaces/mitkInteractionEventObserver.cpp
rename to Modules/Core/src/Interactions/mitkInteractionEventObserver.cpp
diff --git a/Modules/Core/Interactions/mitkInteractionKeyEvent.cpp b/Modules/Core/src/Interactions/mitkInteractionKeyEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkInteractionKeyEvent.cpp
rename to Modules/Core/src/Interactions/mitkInteractionKeyEvent.cpp
diff --git a/Modules/Core/Interactions/mitkInteractionPositionEvent.cpp b/Modules/Core/src/Interactions/mitkInteractionPositionEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkInteractionPositionEvent.cpp
rename to Modules/Core/src/Interactions/mitkInteractionPositionEvent.cpp
diff --git a/Modules/Core/Interactions/mitkInteractor.cpp b/Modules/Core/src/Interactions/mitkInteractor.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkInteractor.cpp
rename to Modules/Core/src/Interactions/mitkInteractor.cpp
diff --git a/Modules/Core/Interactions/mitkInternalEvent.cpp b/Modules/Core/src/Interactions/mitkInternalEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkInternalEvent.cpp
rename to Modules/Core/src/Interactions/mitkInternalEvent.cpp
diff --git a/Modules/Core/Interactions/mitkKeyEvent.cpp b/Modules/Core/src/Interactions/mitkKeyEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkKeyEvent.cpp
rename to Modules/Core/src/Interactions/mitkKeyEvent.cpp
diff --git a/Modules/Core/Interactions/mitkMouseDoubleClickEvent.cpp b/Modules/Core/src/Interactions/mitkMouseDoubleClickEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkMouseDoubleClickEvent.cpp
rename to Modules/Core/src/Interactions/mitkMouseDoubleClickEvent.cpp
diff --git a/Modules/Core/Interactions/mitkMouseModeSwitcher.cpp b/Modules/Core/src/Interactions/mitkMouseModeSwitcher.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkMouseModeSwitcher.cpp
rename to Modules/Core/src/Interactions/mitkMouseModeSwitcher.cpp
diff --git a/Modules/Core/Interactions/mitkMouseMoveEvent.cpp b/Modules/Core/src/Interactions/mitkMouseMoveEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkMouseMoveEvent.cpp
rename to Modules/Core/src/Interactions/mitkMouseMoveEvent.cpp
diff --git a/Modules/Core/Interactions/mitkMouseMovePointSetInteractor.cpp b/Modules/Core/src/Interactions/mitkMouseMovePointSetInteractor.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkMouseMovePointSetInteractor.cpp
rename to Modules/Core/src/Interactions/mitkMouseMovePointSetInteractor.cpp
diff --git a/Modules/Core/Interactions/mitkMousePressEvent.cpp b/Modules/Core/src/Interactions/mitkMousePressEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkMousePressEvent.cpp
rename to Modules/Core/src/Interactions/mitkMousePressEvent.cpp
diff --git a/Modules/Core/Interactions/mitkMouseReleaseEvent.cpp b/Modules/Core/src/Interactions/mitkMouseReleaseEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkMouseReleaseEvent.cpp
rename to Modules/Core/src/Interactions/mitkMouseReleaseEvent.cpp
diff --git a/Modules/Core/Interactions/mitkMouseWheelEvent.cpp b/Modules/Core/src/Interactions/mitkMouseWheelEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkMouseWheelEvent.cpp
rename to Modules/Core/src/Interactions/mitkMouseWheelEvent.cpp
diff --git a/Modules/Core/Interactions/mitkMoveBaseDataInteractor.cpp b/Modules/Core/src/Interactions/mitkMoveBaseDataInteractor.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkMoveBaseDataInteractor.cpp
rename to Modules/Core/src/Interactions/mitkMoveBaseDataInteractor.cpp
diff --git a/Modules/Core/Interactions/mitkNodeDepententPointSetInteractor.cpp b/Modules/Core/src/Interactions/mitkNodeDepententPointSetInteractor.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkNodeDepententPointSetInteractor.cpp
rename to Modules/Core/src/Interactions/mitkNodeDepententPointSetInteractor.cpp
diff --git a/Modules/Core/Interactions/mitkPointSetDataInteractor.cpp b/Modules/Core/src/Interactions/mitkPointSetDataInteractor.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkPointSetDataInteractor.cpp
rename to Modules/Core/src/Interactions/mitkPointSetDataInteractor.cpp
diff --git a/Modules/Core/Interactions/mitkPointSetInteractor.cpp b/Modules/Core/src/Interactions/mitkPointSetInteractor.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkPointSetInteractor.cpp
rename to Modules/Core/src/Interactions/mitkPointSetInteractor.cpp
diff --git a/Modules/Core/Interactions/mitkPositionEvent.cpp b/Modules/Core/src/Interactions/mitkPositionEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkPositionEvent.cpp
rename to Modules/Core/src/Interactions/mitkPositionEvent.cpp
diff --git a/Modules/Core/Interactions/mitkPositionTracker.cpp b/Modules/Core/src/Interactions/mitkPositionTracker.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkPositionTracker.cpp
rename to Modules/Core/src/Interactions/mitkPositionTracker.cpp
diff --git a/Modules/Core/Interactions/mitkSinglePointDataInteractor.cpp b/Modules/Core/src/Interactions/mitkSinglePointDataInteractor.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkSinglePointDataInteractor.cpp
rename to Modules/Core/src/Interactions/mitkSinglePointDataInteractor.cpp
diff --git a/Modules/Core/Interactions/mitkState.cpp b/Modules/Core/src/Interactions/mitkState.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkState.cpp
rename to Modules/Core/src/Interactions/mitkState.cpp
diff --git a/Modules/Core/Interactions/mitkStateEvent.cpp b/Modules/Core/src/Interactions/mitkStateEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkStateEvent.cpp
rename to Modules/Core/src/Interactions/mitkStateEvent.cpp
diff --git a/Modules/Core/Interactions/mitkStateMachine.cpp b/Modules/Core/src/Interactions/mitkStateMachine.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkStateMachine.cpp
rename to Modules/Core/src/Interactions/mitkStateMachine.cpp
diff --git a/Modules/Core/Interactions/mitkStateMachineAction.cpp b/Modules/Core/src/Interactions/mitkStateMachineAction.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkStateMachineAction.cpp
rename to Modules/Core/src/Interactions/mitkStateMachineAction.cpp
diff --git a/Modules/Core/Interactions/mitkStateMachineCondition.cpp b/Modules/Core/src/Interactions/mitkStateMachineCondition.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkStateMachineCondition.cpp
rename to Modules/Core/src/Interactions/mitkStateMachineCondition.cpp
diff --git a/Modules/Core/Interactions/mitkStateMachineContainer.cpp b/Modules/Core/src/Interactions/mitkStateMachineContainer.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkStateMachineContainer.cpp
rename to Modules/Core/src/Interactions/mitkStateMachineContainer.cpp
diff --git a/Modules/Core/Interactions/mitkStateMachineFactory.cpp b/Modules/Core/src/Interactions/mitkStateMachineFactory.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkStateMachineFactory.cpp
rename to Modules/Core/src/Interactions/mitkStateMachineFactory.cpp
diff --git a/Modules/Core/Interactions/mitkStateMachineState.cpp b/Modules/Core/src/Interactions/mitkStateMachineState.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkStateMachineState.cpp
rename to Modules/Core/src/Interactions/mitkStateMachineState.cpp
diff --git a/Modules/Core/Interactions/mitkStateMachineTransition.cpp b/Modules/Core/src/Interactions/mitkStateMachineTransition.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkStateMachineTransition.cpp
rename to Modules/Core/src/Interactions/mitkStateMachineTransition.cpp
diff --git a/Modules/Core/Interactions/mitkTransition.cpp b/Modules/Core/src/Interactions/mitkTransition.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkTransition.cpp
rename to Modules/Core/src/Interactions/mitkTransition.cpp
diff --git a/Modules/Core/Interactions/mitkVtkEventAdapter.cpp b/Modules/Core/src/Interactions/mitkVtkEventAdapter.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkVtkEventAdapter.cpp
rename to Modules/Core/src/Interactions/mitkVtkEventAdapter.cpp
diff --git a/Modules/Core/Interactions/mitkVtkInteractorStyle.cxx b/Modules/Core/src/Interactions/mitkVtkInteractorStyle.cxx
similarity index 100%
rename from Modules/Core/Interactions/mitkVtkInteractorStyle.cxx
rename to Modules/Core/src/Interactions/mitkVtkInteractorStyle.cxx
diff --git a/Modules/Core/Interactions/mitkWheelEvent.cpp b/Modules/Core/src/Interactions/mitkWheelEvent.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkWheelEvent.cpp
rename to Modules/Core/src/Interactions/mitkWheelEvent.cpp
diff --git a/Modules/Core/Interactions/mitkXML2EventParser.cpp b/Modules/Core/src/Interactions/mitkXML2EventParser.cpp
similarity index 100%
rename from Modules/Core/Interactions/mitkXML2EventParser.cpp
rename to Modules/Core/src/Interactions/mitkXML2EventParser.cpp
diff --git a/Modules/Core/Rendering/mitkAbstractOverlayLayouter.cpp b/Modules/Core/src/Rendering/mitkAbstractOverlayLayouter.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkAbstractOverlayLayouter.cpp
rename to Modules/Core/src/Rendering/mitkAbstractOverlayLayouter.cpp
diff --git a/Modules/Core/Rendering/mitkBaseRenderer.cpp b/Modules/Core/src/Rendering/mitkBaseRenderer.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkBaseRenderer.cpp
rename to Modules/Core/src/Rendering/mitkBaseRenderer.cpp
diff --git a/Modules/Core/Rendering/mitkGradientBackground.cpp b/Modules/Core/src/Rendering/mitkGradientBackground.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkGradientBackground.cpp
rename to Modules/Core/src/Rendering/mitkGradientBackground.cpp
diff --git a/Modules/Core/Interfaces/mitkIShaderRepository.cpp b/Modules/Core/src/Rendering/mitkIShaderRepository.cpp
similarity index 100%
rename from Modules/Core/Interfaces/mitkIShaderRepository.cpp
rename to Modules/Core/src/Rendering/mitkIShaderRepository.cpp
diff --git a/Modules/Core/Rendering/mitkImageVtkMapper2D.cpp b/Modules/Core/src/Rendering/mitkImageVtkMapper2D.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkImageVtkMapper2D.cpp
rename to Modules/Core/src/Rendering/mitkImageVtkMapper2D.cpp
diff --git a/Modules/Core/Rendering/mitkManufacturerLogo.cpp b/Modules/Core/src/Rendering/mitkManufacturerLogo.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkManufacturerLogo.cpp
rename to Modules/Core/src/Rendering/mitkManufacturerLogo.cpp
diff --git a/Modules/Core/Rendering/mitkMapper.cpp b/Modules/Core/src/Rendering/mitkMapper.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkMapper.cpp
rename to Modules/Core/src/Rendering/mitkMapper.cpp
diff --git a/Modules/Core/Rendering/mitkOverlay.cpp b/Modules/Core/src/Rendering/mitkOverlay.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkOverlay.cpp
rename to Modules/Core/src/Rendering/mitkOverlay.cpp
diff --git a/Modules/Core/Rendering/mitkOverlayManager.cpp b/Modules/Core/src/Rendering/mitkOverlayManager.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkOverlayManager.cpp
rename to Modules/Core/src/Rendering/mitkOverlayManager.cpp
diff --git a/Modules/Core/Rendering/mitkPlaneGeometryDataMapper2D.cpp b/Modules/Core/src/Rendering/mitkPlaneGeometryDataMapper2D.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkPlaneGeometryDataMapper2D.cpp
rename to Modules/Core/src/Rendering/mitkPlaneGeometryDataMapper2D.cpp
diff --git a/Modules/Core/Rendering/mitkPlaneGeometryDataVtkMapper3D.cpp b/Modules/Core/src/Rendering/mitkPlaneGeometryDataVtkMapper3D.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkPlaneGeometryDataVtkMapper3D.cpp
rename to Modules/Core/src/Rendering/mitkPlaneGeometryDataVtkMapper3D.cpp
diff --git a/Modules/Core/Rendering/mitkPointSetVtkMapper2D.cpp b/Modules/Core/src/Rendering/mitkPointSetVtkMapper2D.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkPointSetVtkMapper2D.cpp
rename to Modules/Core/src/Rendering/mitkPointSetVtkMapper2D.cpp
diff --git a/Modules/Core/Rendering/mitkPointSetVtkMapper3D.cpp b/Modules/Core/src/Rendering/mitkPointSetVtkMapper3D.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkPointSetVtkMapper3D.cpp
rename to Modules/Core/src/Rendering/mitkPointSetVtkMapper3D.cpp
diff --git a/Modules/Core/Rendering/mitkRenderWindow.cpp b/Modules/Core/src/Rendering/mitkRenderWindow.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkRenderWindow.cpp
rename to Modules/Core/src/Rendering/mitkRenderWindow.cpp
diff --git a/Modules/Core/Rendering/mitkRenderWindowBase.cpp b/Modules/Core/src/Rendering/mitkRenderWindowBase.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkRenderWindowBase.cpp
rename to Modules/Core/src/Rendering/mitkRenderWindowBase.cpp
diff --git a/Modules/Core/Rendering/mitkRenderWindowFrame.cpp b/Modules/Core/src/Rendering/mitkRenderWindowFrame.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkRenderWindowFrame.cpp
rename to Modules/Core/src/Rendering/mitkRenderWindowFrame.cpp
diff --git a/Modules/Core/Rendering/mitkSurfaceVtkMapper2D.cpp b/Modules/Core/src/Rendering/mitkSurfaceVtkMapper2D.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkSurfaceVtkMapper2D.cpp
rename to Modules/Core/src/Rendering/mitkSurfaceVtkMapper2D.cpp
diff --git a/Modules/Core/Rendering/mitkSurfaceVtkMapper3D.cpp b/Modules/Core/src/Rendering/mitkSurfaceVtkMapper3D.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkSurfaceVtkMapper3D.cpp
rename to Modules/Core/src/Rendering/mitkSurfaceVtkMapper3D.cpp
diff --git a/Modules/Core/Rendering/mitkVolumeDataVtkMapper3D.cpp b/Modules/Core/src/Rendering/mitkVolumeDataVtkMapper3D.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkVolumeDataVtkMapper3D.cpp
rename to Modules/Core/src/Rendering/mitkVolumeDataVtkMapper3D.cpp
diff --git a/Modules/Core/Rendering/mitkVtkEventProvider.cpp b/Modules/Core/src/Rendering/mitkVtkEventProvider.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkEventProvider.cpp
rename to Modules/Core/src/Rendering/mitkVtkEventProvider.cpp
diff --git a/Modules/Core/Rendering/mitkVtkMapper.cpp b/Modules/Core/src/Rendering/mitkVtkMapper.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkMapper.cpp
rename to Modules/Core/src/Rendering/mitkVtkMapper.cpp
diff --git a/Modules/Core/Rendering/mitkVtkOverlay.cpp b/Modules/Core/src/Rendering/mitkVtkOverlay.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkOverlay.cpp
rename to Modules/Core/src/Rendering/mitkVtkOverlay.cpp
diff --git a/Modules/Core/Rendering/mitkVtkOverlay2D.cpp b/Modules/Core/src/Rendering/mitkVtkOverlay2D.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkOverlay2D.cpp
rename to Modules/Core/src/Rendering/mitkVtkOverlay2D.cpp
diff --git a/Modules/Core/Rendering/mitkVtkOverlay3D.cpp b/Modules/Core/src/Rendering/mitkVtkOverlay3D.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkOverlay3D.cpp
rename to Modules/Core/src/Rendering/mitkVtkOverlay3D.cpp
diff --git a/Modules/Core/Rendering/mitkVtkPropRenderer.cpp b/Modules/Core/src/Rendering/mitkVtkPropRenderer.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkPropRenderer.cpp
rename to Modules/Core/src/Rendering/mitkVtkPropRenderer.cpp
diff --git a/Modules/Core/Rendering/mitkVtkWidgetRendering.cpp b/Modules/Core/src/Rendering/mitkVtkWidgetRendering.cpp
similarity index 100%
rename from Modules/Core/Rendering/mitkVtkWidgetRendering.cpp
rename to Modules/Core/src/Rendering/mitkVtkWidgetRendering.cpp
diff --git a/Modules/Core/Rendering/vtkMitkLevelWindowFilter.cpp b/Modules/Core/src/Rendering/vtkMitkLevelWindowFilter.cpp
similarity index 100%
rename from Modules/Core/Rendering/vtkMitkLevelWindowFilter.cpp
rename to Modules/Core/src/Rendering/vtkMitkLevelWindowFilter.cpp
diff --git a/Modules/Core/Rendering/vtkMitkRectangleProp.cpp b/Modules/Core/src/Rendering/vtkMitkRectangleProp.cpp
similarity index 100%
rename from Modules/Core/Rendering/vtkMitkRectangleProp.cpp
rename to Modules/Core/src/Rendering/vtkMitkRectangleProp.cpp
diff --git a/Modules/Core/Rendering/vtkMitkRenderProp.cpp b/Modules/Core/src/Rendering/vtkMitkRenderProp.cpp
similarity index 100%
rename from Modules/Core/Rendering/vtkMitkRenderProp.cpp
rename to Modules/Core/src/Rendering/vtkMitkRenderProp.cpp
diff --git a/Modules/Core/Rendering/vtkMitkThickSlicesFilter.cpp b/Modules/Core/src/Rendering/vtkMitkThickSlicesFilter.cpp
similarity index 100%
rename from Modules/Core/Rendering/vtkMitkThickSlicesFilter.cpp
rename to Modules/Core/src/Rendering/vtkMitkThickSlicesFilter.cpp
diff --git a/Modules/Core/Rendering/vtkNeverTranslucentTexture.cpp b/Modules/Core/src/Rendering/vtkNeverTranslucentTexture.cpp
similarity index 100%
rename from Modules/Core/Rendering/vtkNeverTranslucentTexture.cpp
rename to Modules/Core/src/Rendering/vtkNeverTranslucentTexture.cpp
diff --git a/Modules/Core/Internal/mitkCoreActivator.cpp b/Modules/Core/src/mitkCoreActivator.cpp
similarity index 97%
rename from Modules/Core/Internal/mitkCoreActivator.cpp
rename to Modules/Core/src/mitkCoreActivator.cpp
index d0f4246f17..73fc958e81 100644
--- a/Modules/Core/Internal/mitkCoreActivator.cpp
+++ b/Modules/Core/src/mitkCoreActivator.cpp
@@ -1,461 +1,468 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "mitkCoreActivator.h"
 
 // File IO
 #include <mitkIOUtil.h>
 #include <mitkIOMimeTypes.h>
 #include <mitkItkImageIO.h>
 #include <mitkMimeTypeProvider.h>
 #include <mitkPointSetReaderService.h>
 #include <mitkPointSetWriterService.h>
 #include <mitkRawImageFileReader.h>
 #include <mitkSurfaceStlIO.h>
 #include <mitkSurfaceVtkLegacyIO.h>
 #include <mitkSurfaceVtkXmlIO.h>
 #include <mitkImageVtkXmlIO.h>
 #include <mitkImageVtkLegacyIO.h>
 
 #include <mitkFileWriter.h>
 #include "mitkLegacyFileWriterService.h"
 #include "mitkDicomSeriesReaderService.h"
 
 #include <itkNiftiImageIO.h>
 #include <itkGDCMImageIO.h>
 
 // Micro Services
 #include <usGetModuleContext.h>
 #include <usModuleInitialization.h>
 #include <usModuleActivator.h>
 #include <usModuleContext.h>
 #include <usModuleSettings.h>
 #include <usModuleEvent.h>
 #include <usModule.h>
 #include <usModuleResource.h>
 #include <usModuleResourceStream.h>
 #include <usServiceTracker.h>
 
+// ITK "injects" static initialization code for IO factories
+// via the itkImageIOFactoryRegisterManager.h header (which
+// is generated in the application library build directory).
+// To ensure that the code is called *before* the CppMicroServices
+// static initialization code (which triggers the Activator::Start
+// method), we include the ITK header here.
+#include <itkImageIOFactoryRegisterManager.h>
 
 void HandleMicroServicesMessages(us::MsgType type, const char* msg)
 {
   switch (type)
   {
   case us::DebugMsg:
     MITK_DEBUG << msg;
     break;
   case us::InfoMsg:
     MITK_INFO << msg;
     break;
   case us::WarningMsg:
     MITK_WARN << msg;
     break;
   case us::ErrorMsg:
     MITK_ERROR << msg;
     break;
   }
 }
 
 void AddMitkAutoLoadPaths(const std::string& programPath)
 {
   us::ModuleSettings::AddAutoLoadPath(programPath);
 #ifdef __APPLE__
   // Walk up three directories since that is where the .dylib files are located
   // for build trees.
   std::string additionalPath = programPath;
   bool addPath = true;
   for(int i = 0; i < 3; ++i)
   {
     std::size_t index = additionalPath.find_last_of('/');
     if (index != std::string::npos)
     {
       additionalPath = additionalPath.substr(0, index);
     }
     else
     {
       addPath = false;
       break;
     }
   }
   if (addPath)
   {
     us::ModuleSettings::AddAutoLoadPath(additionalPath);
   }
 #endif
 }
 
 class ShaderRepositoryTracker : public us::ServiceTracker<mitk::IShaderRepository>
 {
 
 public:
 
   ShaderRepositoryTracker()
     : Superclass(us::GetModuleContext())
   {
   }
 
   virtual void Close()
   {
     us::GetModuleContext()->RemoveModuleListener(this, &ShaderRepositoryTracker::HandleModuleEvent);
     Superclass::Close();
   }
 
   virtual void Open()
   {
     us::GetModuleContext()->AddModuleListener(this, &ShaderRepositoryTracker::HandleModuleEvent);
     Superclass::Open();
   }
 
 private:
 
   typedef us::ServiceTracker<mitk::IShaderRepository> Superclass;
 
   TrackedType AddingService(const ServiceReferenceType &reference)
   {
     mitk::IShaderRepository* shaderRepo = Superclass::AddingService(reference);
     if (shaderRepo)
     {
       // Add all existing shaders from modules to the new shader repository.
       // If the shader repository is registered in a modules activator, the
       // GetLoadedModules() function call below will also return the module
       // which is currently registering the repository. The HandleModuleEvent
       // method contains code to avoid double registrations due to a fired
       // ModuleEvent::LOADED event after the activators Load() method finished.
       std::vector<us::Module*> modules = us::ModuleRegistry::GetLoadedModules();
       for (std::vector<us::Module*>::const_iterator iter = modules.begin(),
            endIter = modules.end(); iter != endIter; ++iter)
       {
         this->AddModuleShaderToRepository(*iter, shaderRepo);
       }
 
       m_ShaderRepositories.push_back(shaderRepo);
     }
     return shaderRepo;
   }
 
   void RemovedService(const ServiceReferenceType& /*reference*/, TrackedType tracked)
   {
     m_ShaderRepositories.erase(std::remove(m_ShaderRepositories.begin(), m_ShaderRepositories.end(), tracked),
                                m_ShaderRepositories.end());
   }
 
   void HandleModuleEvent(const us::ModuleEvent moduleEvent)
   {
     if (moduleEvent.GetType() == us::ModuleEvent::LOADED)
     {
       std::vector<mitk::IShaderRepository*> shaderRepos;
       for (std::map<mitk::IShaderRepository*, std::map<long, std::vector<int> > >::const_iterator shaderMapIter = m_ModuleIdToShaderIds.begin(),
            shaderMapEndIter = m_ModuleIdToShaderIds.end(); shaderMapIter != shaderMapEndIter; ++shaderMapIter)
       {
         if (shaderMapIter->second.find(moduleEvent.GetModule()->GetModuleId()) == shaderMapIter->second.end())
         {
           shaderRepos.push_back(shaderMapIter->first);
         }
       }
       AddModuleShadersToRepositories(moduleEvent.GetModule(), shaderRepos);
     }
     else if (moduleEvent.GetType() == us::ModuleEvent::UNLOADED)
     {
       RemoveModuleShadersFromRepositories(moduleEvent.GetModule(), m_ShaderRepositories);
     }
   }
 
   void AddModuleShadersToRepositories(us::Module* module, const std::vector<mitk::IShaderRepository*>& shaderRepos)
   {
     // search and load shader files
     std::vector<us::ModuleResource> shaderResources = module->FindResources("Shaders", "*.xml", true);
     for (std::vector<us::ModuleResource>::iterator i = shaderResources.begin();
          i != shaderResources.end(); ++i)
     {
       if (*i)
       {
         us::ModuleResourceStream rs(*i);
         for (std::vector<mitk::IShaderRepository*>::const_iterator shaderRepoIter = shaderRepos.begin(),
              shaderRepoEndIter = shaderRepos.end(); shaderRepoIter != shaderRepoEndIter; ++shaderRepoIter)
         {
           int id = (*shaderRepoIter)->LoadShader(rs, i->GetBaseName());
           if (id >= 0)
           {
             m_ModuleIdToShaderIds[*shaderRepoIter][module->GetModuleId()].push_back(id);
           }
         }
         rs.seekg(0, std::ios_base::beg);
       }
     }
   }
 
   void AddModuleShaderToRepository(us::Module* module, mitk::IShaderRepository* shaderRepo)
   {
     std::vector<mitk::IShaderRepository*> shaderRepos;
     shaderRepos.push_back(shaderRepo);
     this->AddModuleShadersToRepositories(module, shaderRepos);
   }
 
   void RemoveModuleShadersFromRepositories(us::Module* module,
                                            const std::vector<mitk::IShaderRepository*>& shaderRepos)
   {
     for (std::vector<mitk::IShaderRepository*>::const_iterator shaderRepoIter = shaderRepos.begin(),
          shaderRepoEndIter = shaderRepos.end(); shaderRepoIter != shaderRepoEndIter; ++shaderRepoIter)
     {
       std::map<long, std::vector<int> >& moduleIdToShaderIds = m_ModuleIdToShaderIds[*shaderRepoIter];
       std::map<long, std::vector<int> >::iterator shaderIdsIter =
         moduleIdToShaderIds.find(module->GetModuleId());
       if (shaderIdsIter != moduleIdToShaderIds.end())
       {
         for (std::vector<int>::iterator idIter = shaderIdsIter->second.begin();
              idIter != shaderIdsIter->second.end(); ++idIter)
         {
           (*shaderRepoIter)->UnloadShader(*idIter);
         }
         moduleIdToShaderIds.erase(shaderIdsIter);
       }
     }
   }
 
 private:
 
   // Maps to each shader repository a map containing module ids and related
   // shader registration ids
   std::map<mitk::IShaderRepository*, std::map<long, std::vector<int> > > m_ModuleIdToShaderIds;
   std::vector<mitk::IShaderRepository*> m_ShaderRepositories;
 };
 
 class FixedNiftiImageIO : public itk::NiftiImageIO
 {
 public:
 
   /** Standard class typedefs. */
   typedef FixedNiftiImageIO         Self;
   typedef itk::NiftiImageIO         Superclass;
   typedef itk::SmartPointer< Self > Pointer;
 
   /** Method for creation through the object factory. */
   itkNewMacro(Self)
 
   /** Run-time type information (and related methods). */
   itkTypeMacro(FixedNiftiImageIO, Superclass)
 
   virtual bool SupportsDimension(unsigned long dim)
   {
     return dim > 1 && dim < 5;
   }
 
 };
 
 void MitkCoreActivator::Load(us::ModuleContext* context)
 {
   // Handle messages from CppMicroServices
   us::installMsgHandler(HandleMicroServicesMessages);
 
   this->m_Context = context;
 
   // Add the current application directory to the auto-load paths.
   // This is useful for third-party executables.
   std::string programPath = mitk::IOUtil::GetProgramPath();
   if (programPath.empty())
   {
     MITK_WARN << "Could not get the program path.";
   }
   else
   {
     AddMitkAutoLoadPaths(programPath);
   }
 
   m_ShaderRepositoryTracker.reset(new ShaderRepositoryTracker);
 
   //m_RenderingManager = mitk::RenderingManager::New();
   //context->RegisterService<mitk::RenderingManager>(renderingManager.GetPointer());
   m_PlanePositionManager.reset(new mitk::PlanePositionManagerService);
   context->RegisterService<mitk::PlanePositionManagerService>(m_PlanePositionManager.get());
 
   m_PropertyAliases.reset(new mitk::PropertyAliases);
   context->RegisterService<mitk::IPropertyAliases>(m_PropertyAliases.get());
 
   m_PropertyDescriptions.reset(new mitk::PropertyDescriptions);
   context->RegisterService<mitk::IPropertyDescriptions>(m_PropertyDescriptions.get());
 
   m_PropertyExtensions.reset(new mitk::PropertyExtensions);
   context->RegisterService<mitk::IPropertyExtensions>(m_PropertyExtensions.get());
 
   m_PropertyFilters.reset(new mitk::PropertyFilters);
   context->RegisterService<mitk::IPropertyFilters>(m_PropertyFilters.get());
 
   m_MimeTypeProvider.reset(new mitk::MimeTypeProvider);
   m_MimeTypeProvider->Start();
   m_MimeTypeProviderReg = context->RegisterService<mitk::IMimeTypeProvider>(m_MimeTypeProvider.get());
 
   this->RegisterDefaultMimeTypes();
   this->RegisterItkReaderWriter();
   this->RegisterVtkReaderWriter();
 
   // Add custom Reader / Writer Services
   m_FileReaders.push_back(new mitk::PointSetReaderService());
   m_FileWriters.push_back(new mitk::PointSetWriterService());
   m_FileReaders.push_back(new mitk::DicomSeriesReaderService());
   m_FileReaders.push_back(new mitk::RawImageFileReaderService());
 
   m_ShaderRepositoryTracker->Open();
 
   /*
     There IS an option to exchange ALL vtkTexture instances against vtkNeverTranslucentTextureFactory.
     This code is left here as a reminder, just in case we might need to do that some time.
 
     vtkNeverTranslucentTextureFactory* textureFactory = vtkNeverTranslucentTextureFactory::New();
     vtkObjectFactory::RegisterFactory( textureFactory );
     textureFactory->Delete();
     */
 
   this->RegisterLegacyWriter();
 }
 
 void MitkCoreActivator::Unload(us::ModuleContext* )
 {
   for(std::vector<mitk::IFileReader*>::iterator iter = m_FileReaders.begin(),
       endIter = m_FileReaders.end(); iter != endIter; ++iter)
   {
     delete *iter;
   }
 
   for(std::vector<mitk::IFileWriter*>::iterator iter = m_FileWriters.begin(),
       endIter = m_FileWriters.end(); iter != endIter; ++iter)
   {
     delete *iter;
   }
 
   for(std::vector<mitk::AbstractFileIO*>::iterator iter = m_FileIOs.begin(),
       endIter = m_FileIOs.end(); iter != endIter; ++iter)
   {
     delete *iter;
   }
 
   for(std::vector<mitk::IFileWriter*>::iterator iter = m_LegacyWriters.begin(),
       endIter = m_LegacyWriters.end(); iter != endIter; ++iter)
   {
     delete *iter;
   }
 
   // The mitk::ModuleContext* argument of the Unload() method
   // will always be 0 for the Mitk library. It makes no sense
   // to use it at this stage anyway, since all libraries which
   // know about the module system have already been unloaded.
 
   // we need to close the internal service tracker of the
   // MimeTypeProvider class here. Otherwise it
   // would hold on to the ModuleContext longer than it is
   // actually valid.
   m_MimeTypeProviderReg.Unregister();
   m_MimeTypeProvider->Stop();
 
   for (std::vector<mitk::CustomMimeType*>::const_iterator mimeTypeIter = m_DefaultMimeTypes.begin(),
        iterEnd = m_DefaultMimeTypes.end(); mimeTypeIter != iterEnd; ++mimeTypeIter)
   {
     delete *mimeTypeIter;
   }
 
   m_ShaderRepositoryTracker->Close();
 }
 
 void MitkCoreActivator::RegisterDefaultMimeTypes()
 {
   // Register some default mime-types
 
   std::vector<mitk::CustomMimeType*> mimeTypes = mitk::IOMimeTypes::Get();
   for (std::vector<mitk::CustomMimeType*>::const_iterator mimeTypeIter = mimeTypes.begin(),
        iterEnd = mimeTypes.end(); mimeTypeIter != iterEnd; ++mimeTypeIter)
   {
     m_DefaultMimeTypes.push_back(*mimeTypeIter);
     m_Context->RegisterService(m_DefaultMimeTypes.back());
   }
 }
 
 void MitkCoreActivator::RegisterItkReaderWriter()
 {
   std::list<itk::LightObject::Pointer> allobjects =
     itk::ObjectFactoryBase::CreateAllInstance("itkImageIOBase");
 
   for (std::list<itk::LightObject::Pointer >::iterator i = allobjects.begin(),
        endIter = allobjects.end(); i != endIter; ++i)
   {
     itk::ImageIOBase* io = dynamic_cast<itk::ImageIOBase*>(i->GetPointer());
 
     // NiftiImageIO does not provide a correct "SupportsDimension()" methods
     // and the supported read/write extensions are not ordered correctly
     if (dynamic_cast<itk::NiftiImageIO*>(io)) continue;
 
     // Use a custom mime-type for GDCMImageIO below
     if (dynamic_cast<itk::GDCMImageIO*>(i->GetPointer()))
     {
       // MITK provides its own DICOM reader (which internally uses GDCMImageIO).
       continue;
     }
 
     if (io)
     {
       m_FileIOs.push_back(new mitk::ItkImageIO(io));
     }
     else
     {
       MITK_WARN << "Error ImageIO factory did not return an ImageIOBase: "
                 << ( *i )->GetNameOfClass();
     }
   }
 
   FixedNiftiImageIO::Pointer itkNiftiIO = FixedNiftiImageIO::New();
   mitk::ItkImageIO* niftiIO = new mitk::ItkImageIO(mitk::CustomMimeType(mitk::IOMimeTypes::NIFTI_MIMETYPE_NAME()),
                                                    itkNiftiIO.GetPointer(), 0);
   m_FileIOs.push_back(niftiIO);
 }
 
 void MitkCoreActivator::RegisterVtkReaderWriter()
 {
   m_FileIOs.push_back(new mitk::SurfaceVtkXmlIO());
   m_FileIOs.push_back(new mitk::SurfaceStlIO());
   m_FileIOs.push_back(new mitk::SurfaceVtkLegacyIO());
 
   m_FileIOs.push_back(new mitk::ImageVtkXmlIO());
   m_FileIOs.push_back(new mitk::ImageVtkLegacyIO());
 }
 
 void MitkCoreActivator::RegisterLegacyWriter()
 {
   std::list<itk::LightObject::Pointer> allobjects = itk::ObjectFactoryBase::CreateAllInstance("IOWriter");
 
   for( std::list<itk::LightObject::Pointer>::iterator i = allobjects.begin();
        i != allobjects.end(); ++i)
   {
     mitk::FileWriter::Pointer io = dynamic_cast<mitk::FileWriter*>(i->GetPointer());
     if(io)
     {
       std::string description = std::string("Legacy ") + io->GetNameOfClass() + " Writer";
       mitk::IFileWriter* writer = new mitk::LegacyFileWriterService(io, description);
       m_LegacyWriters.push_back(writer);
     }
     else
     {
       MITK_ERROR << "Error IOWriter override is not of type mitk::FileWriter: "
                  << (*i)->GetNameOfClass()
                  << std::endl;
     }
   }
 }
 
 US_EXPORT_MODULE_ACTIVATOR(MitkCoreActivator)
 
 // Call CppMicroservices initialization code at the end of the file.
 // This especially ensures that VTK object factories have already
 // been registered (VTK initialization code is injected by implicitly
 // include VTK header files at the top of this file).
 US_INITIALIZE_MODULE
diff --git a/Modules/Core/Internal/mitkCoreActivator.h b/Modules/Core/src/mitkCoreActivator.h
similarity index 100%
rename from Modules/Core/Internal/mitkCoreActivator.h
rename to Modules/Core/src/mitkCoreActivator.h
diff --git a/Modules/Core/Common/mitkCoreObjectFactory.cpp b/Modules/Core/src/mitkCoreObjectFactory.cpp
similarity index 100%
rename from Modules/Core/Common/mitkCoreObjectFactory.cpp
rename to Modules/Core/src/mitkCoreObjectFactory.cpp
diff --git a/Modules/Core/Common/mitkCoreObjectFactoryBase.cpp b/Modules/Core/src/mitkCoreObjectFactoryBase.cpp
similarity index 100%
rename from Modules/Core/Common/mitkCoreObjectFactoryBase.cpp
rename to Modules/Core/src/mitkCoreObjectFactoryBase.cpp
diff --git a/Modules/Core/Common/mitkCoreServices.cpp b/Modules/Core/src/mitkCoreServices.cpp
similarity index 100%
rename from Modules/Core/Common/mitkCoreServices.cpp
rename to Modules/Core/src/mitkCoreServices.cpp
diff --git a/Modules/Core/Common/mitkException.cpp b/Modules/Core/src/mitkException.cpp
similarity index 100%
rename from Modules/Core/Common/mitkException.cpp
rename to Modules/Core/src/mitkException.cpp
diff --git a/Modules/Core/Testing/CMakeLists.txt b/Modules/Core/tests/CMakeLists.txt
similarity index 99%
rename from Modules/Core/Testing/CMakeLists.txt
rename to Modules/Core/tests/CMakeLists.txt
index ae720deb0e..98e18399cb 100644
--- a/Modules/Core/Testing/CMakeLists.txt
+++ b/Modules/Core/tests/CMakeLists.txt
@@ -1,240 +1,240 @@
 # The core tests need relaxed compiler flags...
 # TODO fix core tests to compile without these additional no-error flags
 if(MSVC_VERSION)
   # disable deprecated warnings (they would lead to errors)
   mitkFunctionCheckCAndCXXCompilerFlags("/wd4996" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
 else()
   mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=deprecated" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
   mitkFunctionCheckCAndCXXCompilerFlags("-Wno-error=deprecated-declarations" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
 endif()
 
 MITK_CREATE_MODULE_TESTS(US_MODULE)
 mitk_use_modules(TARGET ${TESTDRIVER} PACKAGES ITK|ITKThresholding+ITKTestKernel VTK|vtkTestingRendering tinyxml)
 
 mitkAddCustomModuleTest(mitkVolumeCalculatorTest_Png2D-bw mitkVolumeCalculatorTest
                         ${MITK_DATA_DIR}/Png2D-bw.png
                         ${MITK_DATA_DIR}/Pic2DplusT.nrrd
 )
 
 mitkAddCustomModuleTest(mitkEventMapperTest_Test1And2 mitkEventMapperTest
                         ${MITK_DATA_DIR}/TestStateMachine1.xml
                         ${MITK_DATA_DIR}/TestStateMachine2.xml
 )
 
 mitkAddCustomModuleTest(mitkEventConfigTest_CreateObjectInDifferentWays mitkEventConfigTest
-                        ${MITK_SOURCE_DIR}/Core/Code/Testing/Resources/Interactions/StatemachineConfigTest.xml
+                        ${MITK_SOURCE_DIR}/Modules/Core/Testing/Resources/Interactions/StatemachineConfigTest.xml
 )
 
 mitkAddCustomModuleTest(mitkNodeDependentPointSetInteractorTest mitkNodeDependentPointSetInteractorTest
                         ${MITK_DATA_DIR}/Pic3D.nrrd
                         ${MITK_DATA_DIR}/BallBinary30x30x30.nrrd
 )
 
 mitkAddCustomModuleTest(mitkDataStorageTest_US4DCyl mitkDataStorageTest
                         ${MITK_DATA_DIR}/US4DCyl.nrrd
 )
 
 mitkAddCustomModuleTest(mitkStateMachineFactoryTest_TestStateMachine1_2 mitkStateMachineFactoryTest
                         ${MITK_DATA_DIR}/TestStateMachine1.xml
                         ${MITK_DATA_DIR}/TestStateMachine2.xml
 )
 
 mitkAddCustomModuleTest(mitkDicomSeriesReaderTest_CTImage mitkDicomSeriesReaderTest
                         ${MITK_DATA_DIR}/TinyCTAbdomen
                         ${MITK_DATA_DIR}/DICOMReader/Broken-Series
 )
 
 mitkAddCustomModuleTest(mitkPointSetReaderTest mitkPointSetReaderTest
                         ${MITK_DATA_DIR}/PointSetReaderTestData.mps
 )
 
 mitkAddCustomModuleTest(mitkImageTest_4DImageData mitkImageTest
                         ${MITK_DATA_DIR}/US4DCyl.nrrd
 )
 
 mitkAddCustomModuleTest(mitkImageTest_2D+tImageData mitkImageTest
                         ${MITK_DATA_DIR}/Pic2DplusT.nrrd
 )
 
 mitkAddCustomModuleTest(mitkImageTest_3DImageData mitkImageTest
                         ${MITK_DATA_DIR}/Pic3D.nrrd
 )
 
 mitkAddCustomModuleTest(mitkImageEqualTest mitkImageEqualTest)
 
 mitkAddCustomModuleTest(mitkImageTest_brainImage mitkImageTest
                         ${MITK_DATA_DIR}/brain.mhd
 )
 
 mitkAddCustomModuleTest(mitkImageTest_3DImageData mitkImageGeneratorTest
                         ${MITK_DATA_DIR}/Pic3D.nrrd
 )
 
 mitkAddCustomModuleTest(mitkLevelWindowManagerTest mitkLevelWindowManagerTest
                         ${MITK_DATA_DIR}/Pic3D.nrrd
 )
 
 mitkAddCustomModuleTest(mitkMultiComponentImageDataComparisonFilterTest mitkMultiComponentImageDataComparisonFilterTest
                         ${MITK_DATA_DIR}/NrrdWritingTestImage.jpg
 )
 
 mitkAddCustomModuleTest(mitkImageToItkTest mitkImageToItkTest
                         ${MITK_DATA_DIR}/Pic3D.nrrd
 )
 
 mitkAddCustomModuleTest(mitkImageSliceSelectorTest mitkImageSliceSelectorTest
                         ${MITK_DATA_DIR}/Pic2DplusT.nrrd
 )
 
 
 if(MITK_ENABLE_RENDERING_TESTING) ### since the rendering test's do not run in ubuntu, yet, we build them only for other systems or if the user explicitly sets the variable MITK_ENABLE_RENDERING_TESTING
 mitkAddCustomModuleTest(mitkImageVtkMapper2D_rgbaImage640x480 mitkImageVtkMapper2DTest
                         ${MITK_DATA_DIR}/RenderingTestData/rgbaImage.png #input image to load in data storage
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/rgbaImage640x480REF.png #corresponding reference screenshot
 )
 mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3d640x480 mitkImageVtkMapper2DTest #test for standard Pic3D axial slice
                         ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3d640x480REF.png #corresponding reference screenshot
 )
 mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3dColorBlue640x480 mitkImageVtkMapper2DColorTest #test for color property (=blue) Pic3D sagittal slice
                         ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dColorBlue640x480REF.png #corresponding reference screenshot
 )
 mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3dLevelWindow640x480 mitkImageVtkMapper2DLevelWindowTest #test for levelwindow property (=blood) #Pic3D sagittal slice
                         ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dLevelWindowBlood640x480REF.png #corresponding reference #screenshot
 )
 #mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3dOpacity640x480 mitkImageVtkMapper2DOpacityTest #test for opacity (=0.5) Pic3D coronal slice
 #                        ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage
 #                        -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dOpacity640x480REF.png corresponding reference screenshot
 #)
 mitkAddCustomModuleTest(mitkImageVtkMapper2D_pic3dSwivel640x480 mitkImageVtkMapper2DSwivelTest #test for a randomly chosen Pic3D swivelled slice
                         ${MITK_DATA_DIR}/Pic3D.nrrd #input image to load in data storage
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dSwivel640x480REF.png #corresponding reference screenshot
 )
 mitkAddCustomModuleTest(mitkPointSetVtkMapper2D_openMeAlone640x480 mitkPointSetVtkMapper2DTest
                         ${MITK_DATA_DIR}/RenderingTestData/openMeAlone.mps #input point set to load in data storage
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/openMeAlone640x480REF.png #corresponding reference screenshot
 )
 mitkAddCustomModuleTest(mitkPointSetVtkMapper2D_Pic3DPointSetForPic3D640x480 mitkPointSetVtkMapper2DImageTest
                         ${MITK_DATA_DIR}/Pic3D.nrrd ${MITK_DATA_DIR}/RenderingTestData/PointSetForPic3D.mps #input point set and image to load in data storage
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Pic3DPointSetForPic3D640x480REF.png #corresponding reference screenshot
 )
 mitkAddCustomModuleTest(mitkPointSetVtkMapper2D_openMeAloneGlyphType640x480 mitkPointSetVtkMapper2DGlyphTypeTest
                          ${MITK_DATA_DIR}/RenderingTestData/openMeAlone.mps #input point set to load in data storage
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/openMeAloneGlyphType640x480REF.png #corresponding reference screenshot
 )
 mitkAddCustomModuleTest(mitkPointSetVtkMapper2D_openMeAloneTransformed640x480 mitkPointSetVtkMapper2DTransformedPointsTest
                          ${MITK_DATA_DIR}/RenderingTestData/openMeAlone.mps #input point set to load in data storage
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/openMeAloneTransformedPoints640x480REF.png #corresponding reference screenshot
 )
 mitkAddCustomModuleTest(mitkSurfaceDepthSortingTransparency_StanfordBunnySTL640x480 mitkSurfaceDepthSortingTest
                         ${MITK_DATA_DIR}/RenderingTestData/Stanford_bunny.stl
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Stanford_bunnySTLDepthSorting640x480REF.png
 )
 if(NOT APPLE)
 mitkAddCustomModuleTest(mitkSurfaceDepthPeelingTransparency_StanfordBunnySTL640x480 mitkSurfaceDepthPeelingTest
                         ${MITK_DATA_DIR}/RenderingTestData/Stanford_bunny.stl
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Stanford_bunnySTLDepthPeeling640x480REF.png #corresponding reference screenshot
 )
 endif()
 
 #Test reslice interpolation
 #note: nearest mode is already tested by swivel test
 mitkAddCustomModuleTest(ResliceInterpolationIsLinear mitkImageVtkMapper2DResliceInterpolationPropertyTest
                         1 #linear
                         ${MITK_DATA_DIR}/Pic3D.nrrd
                         -V
                         ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dRefLinear.png #corresponding reference screenshot LINEAR
 )
 
 mitkAddCustomModuleTest(ResliceInterpolationIsCubic mitkImageVtkMapper2DResliceInterpolationPropertyTest
                         3 #cubic
                         ${MITK_DATA_DIR}/Pic3D.nrrd
                         -V
                         ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/pic3dRefCubic.png #corresponding reference screenshot CUBIC
 )
 #End test reslice interpolation
 
 # Testing of the rendering of binary images
 #mitkAddCustomModuleTest(mitkImageVtkMapper2D_binaryTestImage640x480 mitkImageVtkMapper2DTest #test for standard Pic3D axial slice
 #                        ${MITK_DATA_DIR}/RenderingTestData/binaryImage.nrrd #input image to load in data storage
 #                        -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/binaryImage640x480REF.png #corresponding reference screenshot
 #)
 #mitkAddCustomModuleTest(mitkImageVtkMapper2D_binaryTestImageWithRef640x480 mitkImageVtkMapper2DTest #test for standard Pic3D axial slice
 #                        ${MITK_DATA_DIR}/Pic3D.nrrd ${MITK_DATA_DIR}/RenderingTestData/binaryImage.nrrd #input image to load in data storage
 #                        -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/binaryImageWithRef640x480REF.png #corresponding reference screenshot
 #)
 # End of binary image tests
 
 mitkAddCustomModuleTest(mitkSurfaceVtkMapper3DTest_TextureProperty mitkSurfaceVtkMapper3DTest
                         ${MITK_DATA_DIR}/ToF-Data/Kinect_LiverPhantom.vtp
                         ${MITK_DATA_DIR}/ToF-Data/Kinect_LiverPhantom_RGBImage.nrrd
                         -V
                         ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/texturedLiver640x480REF.png #corresponding reference screenshot
 )
 
 mitkAddCustomModuleTest(mitkImageVtkMapper2DTransferFunctionTest_Png2D-bw mitkImageVtkMapper2DTransferFunctionTest
                         ${MITK_DATA_DIR}/Png2D-bw.png
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Png2D-bw-TransferFunctionRGBImage640x480REF.png #corresponding reference screenshot
 )
 
 mitkAddCustomModuleTest(mitkImageVtkMapper2DOpacityTransferFunctionTest_Png2D-bw mitkImageVtkMapper2DOpacityTransferFunctionTest
                         ${MITK_DATA_DIR}/Png2D-bw.png
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Png2D-bw-OpacityTransferFunctionRGBImage640x480REF.png #corresponding reference screenshot
 )
 
 mitkAddCustomModuleTest(mitkSurfaceVtkMapper2DColorTest_RedBall mitkSurfaceVtkMapper2DColorTest
                         ${MITK_DATA_DIR}/ball.stl
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/ballColorRed640x480REF.png #corresponding reference screenshot
 )
 
 mitkAddCustomModuleTest(mitkSurfaceVtkMapper2DColorTest_DasArmeSchwein mitkSurfaceVtkMapper2DColorTest
                         ${MITK_DATA_DIR}/binary.stl
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/binaryColorRed640x480REF.png #corresponding reference screenshot
 )
 
 mitkAddCustomModuleTest(mitkSurfaceVtkMapper2DOpacityTest_BallOpacity mitkSurfaceVtkMapper2DOpacityTest #opacity = 50% (0.5)
                         ${MITK_DATA_DIR}/ball.stl
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/ballOpacity640x480REF.png #corresponding reference screenshot
 )
 
 ############################## DISABLED TESTS
 
 #Removed due to high rendering error.
 #mitkAddCustomModuleTest(mitkSurfaceVtkMapper3DTexturedSphereTest_Football mitkSurfaceVtkMapper3DTexturedSphereTest
 #                        ${MITK_DATA_DIR}/RenderingTestData/texture.jpg #input texture
 #                        -V
 #                        ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/texturedSphere640x480REF.png corresponding reference screenshot
 #)
 
 mitkAddCustomModuleTest(mitkImageVtkMapper2DLookupTableTest_Png2D-bw mitkImageVtkMapper2DLookupTableTest
                         ${MITK_DATA_DIR}/Png2D-bw.png
                         -V ${MITK_DATA_DIR}/RenderingTestData/ReferenceScreenshots/Png2D-bw-LookupTableRGBImage640x480REF.png #corresponding reference screenshot
 )
 
 #mitkAddCustomModuleTest(mitkImageTest_color2DImage mitkImageTest
 #                        ${MITK_DATA_DIR}/NrrdWritingTestImage.jpg
 #)
 
 #mitkAddCustomModuleTest(mitkNodeDependentPointSetInteractorTest mitkNodeDependentPointSetInteractorTest
 #                        ${MITK_DATA_DIR}/Pic3D.pic.gz ${MITK_DATA_DIR}/BallBinary30x30x30.pic.gz
 #)
 SET_PROPERTY(TEST mitkImageVtkMapper2D_rgbaImage640x480 mitkImageVtkMapper2D_pic3d640x480 mitkImageVtkMapper2D_pic3dColorBlue640x480 mitkImageVtkMapper2D_pic3dLevelWindow640x480 mitkImageVtkMapper2D_pic3dSwivel640x480 mitkImageVtkMapper2DTransferFunctionTest_Png2D-bw
   # mitkImageVtkMapper2D_pic3dOpacity640x480
   mitkSurfaceVtkMapper2DOpacityTest_BallOpacity mitkSurfaceVtkMapper2DColorTest_DasArmeSchwein mitkSurfaceVtkMapper2DColorTest_RedBall mitkSurfaceVtkMapper3DTest_TextureProperty mitkPointSetVtkMapper2D_Pic3DPointSetForPic3D640x480 mitkPointSetVtkMapper2D_openMeAlone640x480 mitkPointSetVtkMapper2D_openMeAloneGlyphType640x480 mitkPointSetVtkMapper2D_openMeAloneTransformed640x480 #mitkSurfaceVtkMapper3DTexturedSphereTest_Football
 PROPERTY RUN_SERIAL TRUE)
 
 endif()
 
 add_test(mitkPointSetLocaleTest  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkPointSetLocaleTest ${MITK_DATA_DIR}/pointSet.mps)
 set_property(TEST mitkPointSetLocaleTest PROPERTY LABELS MITK-Core)
 
 add_test(mitkImageWriterTest_nrrdImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageWriterTest ${MITK_DATA_DIR}/NrrdWritingTestImage.jpg)
 add_test(mitkImageWriterTest_2DPNGImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageWriterTest ${MITK_DATA_DIR}/Png2D-bw.png)
 add_test(mitkImageWriterTest_rgbPNGImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageWriterTest ${MITK_DATA_DIR}/RenderingTestData/rgbImage.png)
 add_test(mitkImageWriterTest_rgbaPNGImage ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TESTDRIVER} mitkImageWriterTest ${MITK_DATA_DIR}/RenderingTestData/rgbaImage.png)
 set_property(TEST mitkImageWriterTest_nrrdImage PROPERTY LABELS MITK-Core)
 set_property(TEST mitkImageWriterTest_2DPNGImage PROPERTY LABELS MITK-Core)
 set_property(TEST mitkImageWriterTest_rgbPNGImage PROPERTY LABELS MITK-Core)
 set_property(TEST mitkImageWriterTest_rgbaPNGImage PROPERTY LABELS MITK-Core)
diff --git a/Modules/Core/Testing/DirectOverlayTest.cpp b/Modules/Core/tests/DirectOverlayTest.cpp
similarity index 100%
rename from Modules/Core/Testing/DirectOverlayTest.cpp
rename to Modules/Core/tests/DirectOverlayTest.cpp
diff --git a/Modules/Core/Testing/files.cmake b/Modules/Core/tests/files.cmake
similarity index 100%
rename from Modules/Core/Testing/files.cmake
rename to Modules/Core/tests/files.cmake
diff --git a/Modules/Core/Testing/mitkAbstractTransformGeometryTest.cpp b/Modules/Core/tests/mitkAbstractTransformGeometryTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkAbstractTransformGeometryTest.cpp
rename to Modules/Core/tests/mitkAbstractTransformGeometryTest.cpp
diff --git a/Modules/Core/Testing/mitkAbstractTransformPlaneGeometryTest.cpp b/Modules/Core/tests/mitkAbstractTransformPlaneGeometryTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkAbstractTransformPlaneGeometryTest.cpp
rename to Modules/Core/tests/mitkAbstractTransformPlaneGeometryTest.cpp
diff --git a/Modules/Core/Testing/mitkAccessByItkTest.cpp b/Modules/Core/tests/mitkAccessByItkTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkAccessByItkTest.cpp
rename to Modules/Core/tests/mitkAccessByItkTest.cpp
diff --git a/Modules/Core/Testing/mitkActionTest.cpp b/Modules/Core/tests/mitkActionTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkActionTest.cpp
rename to Modules/Core/tests/mitkActionTest.cpp
diff --git a/Modules/Core/Testing/mitkAffineTransformBaseTest.cpp b/Modules/Core/tests/mitkAffineTransformBaseTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkAffineTransformBaseTest.cpp
rename to Modules/Core/tests/mitkAffineTransformBaseTest.cpp
diff --git a/Modules/Core/Testing/mitkArrayTypeConversionTest.cpp b/Modules/Core/tests/mitkArrayTypeConversionTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkArrayTypeConversionTest.cpp
rename to Modules/Core/tests/mitkArrayTypeConversionTest.cpp
diff --git a/Modules/Core/Testing/mitkBaseDataTest.cpp b/Modules/Core/tests/mitkBaseDataTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkBaseDataTest.cpp
rename to Modules/Core/tests/mitkBaseDataTest.cpp
diff --git a/Modules/Core/Testing/mitkBaseGeometryTest.cpp b/Modules/Core/tests/mitkBaseGeometryTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkBaseGeometryTest.cpp
rename to Modules/Core/tests/mitkBaseGeometryTest.cpp
diff --git a/Modules/Core/Testing/mitkClippedSurfaceBoundsCalculatorTest.cpp b/Modules/Core/tests/mitkClippedSurfaceBoundsCalculatorTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkClippedSurfaceBoundsCalculatorTest.cpp
rename to Modules/Core/tests/mitkClippedSurfaceBoundsCalculatorTest.cpp
diff --git a/Modules/Core/Testing/mitkCoreObjectFactoryTest.cpp b/Modules/Core/tests/mitkCoreObjectFactoryTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkCoreObjectFactoryTest.cpp
rename to Modules/Core/tests/mitkCoreObjectFactoryTest.cpp
diff --git a/Modules/Core/Testing/mitkDICOMLocaleTest.cpp b/Modules/Core/tests/mitkDICOMLocaleTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkDICOMLocaleTest.cpp
rename to Modules/Core/tests/mitkDICOMLocaleTest.cpp
diff --git a/Modules/Core/Testing/mitkDataNodeTest.cpp b/Modules/Core/tests/mitkDataNodeTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkDataNodeTest.cpp
rename to Modules/Core/tests/mitkDataNodeTest.cpp
diff --git a/Modules/Core/Testing/mitkDataStorageTest.cpp b/Modules/Core/tests/mitkDataStorageTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkDataStorageTest.cpp
rename to Modules/Core/tests/mitkDataStorageTest.cpp
diff --git a/Modules/Core/Testing/mitkDicomSeriesReaderTest.cpp b/Modules/Core/tests/mitkDicomSeriesReaderTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkDicomSeriesReaderTest.cpp
rename to Modules/Core/tests/mitkDicomSeriesReaderTest.cpp
diff --git a/Modules/Core/Testing/mitkDispatcherTest.cpp b/Modules/Core/tests/mitkDispatcherTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkDispatcherTest.cpp
rename to Modules/Core/tests/mitkDispatcherTest.cpp
diff --git a/Modules/Core/Testing/mitkEnumerationPropertyTest.cpp b/Modules/Core/tests/mitkEnumerationPropertyTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkEnumerationPropertyTest.cpp
rename to Modules/Core/tests/mitkEnumerationPropertyTest.cpp
diff --git a/Modules/Core/Testing/mitkEqualTest.cpp b/Modules/Core/tests/mitkEqualTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkEqualTest.cpp
rename to Modules/Core/tests/mitkEqualTest.cpp
diff --git a/Modules/Core/Testing/mitkEventConfigTest.cpp b/Modules/Core/tests/mitkEventConfigTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkEventConfigTest.cpp
rename to Modules/Core/tests/mitkEventConfigTest.cpp
diff --git a/Modules/Core/Testing/mitkEventMapperTest.cpp b/Modules/Core/tests/mitkEventMapperTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkEventMapperTest.cpp
rename to Modules/Core/tests/mitkEventMapperTest.cpp
diff --git a/Modules/Core/Testing/mitkEventTest.cpp b/Modules/Core/tests/mitkEventTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkEventTest.cpp
rename to Modules/Core/tests/mitkEventTest.cpp
diff --git a/Modules/Core/Testing/mitkExceptionTest.cpp b/Modules/Core/tests/mitkExceptionTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkExceptionTest.cpp
rename to Modules/Core/tests/mitkExceptionTest.cpp
diff --git a/Modules/Core/Testing/mitkExtractSliceFilterTest.cpp b/Modules/Core/tests/mitkExtractSliceFilterTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkExtractSliceFilterTest.cpp
rename to Modules/Core/tests/mitkExtractSliceFilterTest.cpp
diff --git a/Modules/Core/Testing/mitkFileReaderRegistryTest.cpp b/Modules/Core/tests/mitkFileReaderRegistryTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkFileReaderRegistryTest.cpp
rename to Modules/Core/tests/mitkFileReaderRegistryTest.cpp
diff --git a/Modules/Core/Testing/mitkFileWriterRegistryTest.cpp b/Modules/Core/tests/mitkFileWriterRegistryTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkFileWriterRegistryTest.cpp
rename to Modules/Core/tests/mitkFileWriterRegistryTest.cpp
diff --git a/Modules/Core/Testing/mitkFocusManagerTest.cpp b/Modules/Core/tests/mitkFocusManagerTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkFocusManagerTest.cpp
rename to Modules/Core/tests/mitkFocusManagerTest.cpp
diff --git a/Modules/Core/Testing/mitkGenericPropertyTest.cpp b/Modules/Core/tests/mitkGenericPropertyTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkGenericPropertyTest.cpp
rename to Modules/Core/tests/mitkGenericPropertyTest.cpp
diff --git a/Modules/Core/Testing/mitkGeometry3DEqualTest.cpp b/Modules/Core/tests/mitkGeometry3DEqualTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkGeometry3DEqualTest.cpp
rename to Modules/Core/tests/mitkGeometry3DEqualTest.cpp
diff --git a/Modules/Core/Testing/mitkGeometry3DTest.cpp b/Modules/Core/tests/mitkGeometry3DTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkGeometry3DTest.cpp
rename to Modules/Core/tests/mitkGeometry3DTest.cpp
diff --git a/Modules/Core/Testing/mitkGeometryDataToSurfaceFilterTest.cpp b/Modules/Core/tests/mitkGeometryDataToSurfaceFilterTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkGeometryDataToSurfaceFilterTest.cpp
rename to Modules/Core/tests/mitkGeometryDataToSurfaceFilterTest.cpp
diff --git a/Modules/Core/Testing/mitkGlobalInteractionTest.cpp b/Modules/Core/tests/mitkGlobalInteractionTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkGlobalInteractionTest.cpp
rename to Modules/Core/tests/mitkGlobalInteractionTest.cpp
diff --git a/Modules/Core/Testing/mitkGrabItkImageMemoryTest.cpp b/Modules/Core/tests/mitkGrabItkImageMemoryTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkGrabItkImageMemoryTest.cpp
rename to Modules/Core/tests/mitkGrabItkImageMemoryTest.cpp
diff --git a/Modules/Core/Testing/mitkIOUtilTest.cpp b/Modules/Core/tests/mitkIOUtilTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkIOUtilTest.cpp
rename to Modules/Core/tests/mitkIOUtilTest.cpp
diff --git a/Modules/Core/Testing/mitkITKThreadingTest.cpp b/Modules/Core/tests/mitkITKThreadingTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkITKThreadingTest.cpp
rename to Modules/Core/tests/mitkITKThreadingTest.cpp
diff --git a/Modules/Core/Testing/mitkImageAccessorTest.cpp b/Modules/Core/tests/mitkImageAccessorTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageAccessorTest.cpp
rename to Modules/Core/tests/mitkImageAccessorTest.cpp
diff --git a/Modules/Core/Testing/mitkImageCastTest.cpp b/Modules/Core/tests/mitkImageCastTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageCastTest.cpp
rename to Modules/Core/tests/mitkImageCastTest.cpp
diff --git a/Modules/Core/Testing/mitkImageDataItemTest.cpp b/Modules/Core/tests/mitkImageDataItemTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageDataItemTest.cpp
rename to Modules/Core/tests/mitkImageDataItemTest.cpp
diff --git a/Modules/Core/Testing/mitkImageDimensionConverterTest.cpp b/Modules/Core/tests/mitkImageDimensionConverterTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageDimensionConverterTest.cpp
rename to Modules/Core/tests/mitkImageDimensionConverterTest.cpp
diff --git a/Modules/Core/Testing/mitkImageEqualTest.cpp b/Modules/Core/tests/mitkImageEqualTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageEqualTest.cpp
rename to Modules/Core/tests/mitkImageEqualTest.cpp
diff --git a/Modules/Core/Testing/mitkImageGeneratorTest.cpp b/Modules/Core/tests/mitkImageGeneratorTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageGeneratorTest.cpp
rename to Modules/Core/tests/mitkImageGeneratorTest.cpp
diff --git a/Modules/Core/Testing/mitkImageSliceSelectorTest.cpp b/Modules/Core/tests/mitkImageSliceSelectorTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageSliceSelectorTest.cpp
rename to Modules/Core/tests/mitkImageSliceSelectorTest.cpp
diff --git a/Modules/Core/Testing/mitkImageTest.cpp b/Modules/Core/tests/mitkImageTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageTest.cpp
rename to Modules/Core/tests/mitkImageTest.cpp
diff --git a/Modules/Core/Testing/mitkImageTimeSelectorTest.cpp b/Modules/Core/tests/mitkImageTimeSelectorTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageTimeSelectorTest.cpp
rename to Modules/Core/tests/mitkImageTimeSelectorTest.cpp
diff --git a/Modules/Core/Testing/mitkImageToItkTest.cpp b/Modules/Core/tests/mitkImageToItkTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageToItkTest.cpp
rename to Modules/Core/tests/mitkImageToItkTest.cpp
diff --git a/Modules/Core/Testing/mitkImageToSurfaceFilterTest.cpp b/Modules/Core/tests/mitkImageToSurfaceFilterTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageToSurfaceFilterTest.cpp
rename to Modules/Core/tests/mitkImageToSurfaceFilterTest.cpp
diff --git a/Modules/Core/Testing/mitkImageVtkMapper2DColorTest.cpp b/Modules/Core/tests/mitkImageVtkMapper2DColorTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageVtkMapper2DColorTest.cpp
rename to Modules/Core/tests/mitkImageVtkMapper2DColorTest.cpp
diff --git a/Modules/Core/Testing/mitkImageVtkMapper2DLevelWindowTest.cpp b/Modules/Core/tests/mitkImageVtkMapper2DLevelWindowTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageVtkMapper2DLevelWindowTest.cpp
rename to Modules/Core/tests/mitkImageVtkMapper2DLevelWindowTest.cpp
diff --git a/Modules/Core/Testing/mitkImageVtkMapper2DLookupTableTest.cpp b/Modules/Core/tests/mitkImageVtkMapper2DLookupTableTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageVtkMapper2DLookupTableTest.cpp
rename to Modules/Core/tests/mitkImageVtkMapper2DLookupTableTest.cpp
diff --git a/Modules/Core/Testing/mitkImageVtkMapper2DOpacityTest.cpp b/Modules/Core/tests/mitkImageVtkMapper2DOpacityTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageVtkMapper2DOpacityTest.cpp
rename to Modules/Core/tests/mitkImageVtkMapper2DOpacityTest.cpp
diff --git a/Modules/Core/Testing/mitkImageVtkMapper2DOpacityTransferFunctionTest.cpp b/Modules/Core/tests/mitkImageVtkMapper2DOpacityTransferFunctionTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageVtkMapper2DOpacityTransferFunctionTest.cpp
rename to Modules/Core/tests/mitkImageVtkMapper2DOpacityTransferFunctionTest.cpp
diff --git a/Modules/Core/Testing/mitkImageVtkMapper2DResliceInterpolationPropertyTest.cpp b/Modules/Core/tests/mitkImageVtkMapper2DResliceInterpolationPropertyTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageVtkMapper2DResliceInterpolationPropertyTest.cpp
rename to Modules/Core/tests/mitkImageVtkMapper2DResliceInterpolationPropertyTest.cpp
diff --git a/Modules/Core/Testing/mitkImageVtkMapper2DSwivelTest.cpp b/Modules/Core/tests/mitkImageVtkMapper2DSwivelTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageVtkMapper2DSwivelTest.cpp
rename to Modules/Core/tests/mitkImageVtkMapper2DSwivelTest.cpp
diff --git a/Modules/Core/Testing/mitkImageVtkMapper2DTest.cpp b/Modules/Core/tests/mitkImageVtkMapper2DTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageVtkMapper2DTest.cpp
rename to Modules/Core/tests/mitkImageVtkMapper2DTest.cpp
diff --git a/Modules/Core/Testing/mitkImageVtkMapper2DTransferFunctionTest.cpp b/Modules/Core/tests/mitkImageVtkMapper2DTransferFunctionTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageVtkMapper2DTransferFunctionTest.cpp
rename to Modules/Core/tests/mitkImageVtkMapper2DTransferFunctionTest.cpp
diff --git a/Modules/Core/Testing/mitkImageWriterTest.cpp b/Modules/Core/tests/mitkImageWriterTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImageWriterTest.cpp
rename to Modules/Core/tests/mitkImageWriterTest.cpp
diff --git a/Modules/Core/Testing/mitkImportItkImageTest.cpp b/Modules/Core/tests/mitkImportItkImageTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkImportItkImageTest.cpp
rename to Modules/Core/tests/mitkImportItkImageTest.cpp
diff --git a/Modules/Core/Testing/mitkInstantiateAccessFunctionTest.cpp b/Modules/Core/tests/mitkInstantiateAccessFunctionTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkInstantiateAccessFunctionTest.cpp
rename to Modules/Core/tests/mitkInstantiateAccessFunctionTest.cpp
diff --git a/Modules/Core/Testing/mitkInteractionEventTest.cpp b/Modules/Core/tests/mitkInteractionEventTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkInteractionEventTest.cpp
rename to Modules/Core/tests/mitkInteractionEventTest.cpp
diff --git a/Modules/Core/Testing/mitkInteractorTest.cpp b/Modules/Core/tests/mitkInteractorTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkInteractorTest.cpp
rename to Modules/Core/tests/mitkInteractorTest.cpp
diff --git a/Modules/Core/Testing/mitkLevelWindowManagerTest.cpp b/Modules/Core/tests/mitkLevelWindowManagerTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkLevelWindowManagerTest.cpp
rename to Modules/Core/tests/mitkLevelWindowManagerTest.cpp
diff --git a/Modules/Core/Testing/mitkLevelWindowTest.cpp b/Modules/Core/tests/mitkLevelWindowTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkLevelWindowTest.cpp
rename to Modules/Core/tests/mitkLevelWindowTest.cpp
diff --git a/Modules/Core/Testing/mitkLineTest.cpp b/Modules/Core/tests/mitkLineTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkLineTest.cpp
rename to Modules/Core/tests/mitkLineTest.cpp
diff --git a/Modules/Core/Testing/mitkLogTest.cpp b/Modules/Core/tests/mitkLogTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkLogTest.cpp
rename to Modules/Core/tests/mitkLogTest.cpp
diff --git a/Modules/Core/Testing/mitkLoggingAdapterTest.cpp b/Modules/Core/tests/mitkLoggingAdapterTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkLoggingAdapterTest.cpp
rename to Modules/Core/tests/mitkLoggingAdapterTest.cpp
diff --git a/Modules/Core/Testing/mitkLookupTableTest.cpp b/Modules/Core/tests/mitkLookupTableTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkLookupTableTest.cpp
rename to Modules/Core/tests/mitkLookupTableTest.cpp
diff --git a/Modules/Core/Testing/mitkMaterialTest.cpp b/Modules/Core/tests/mitkMaterialTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkMaterialTest.cpp
rename to Modules/Core/tests/mitkMaterialTest.cpp
diff --git a/Modules/Core/Testing/mitkMatrixTypeConversionTest.cpp b/Modules/Core/tests/mitkMatrixTypeConversionTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkMatrixTypeConversionTest.cpp
rename to Modules/Core/tests/mitkMatrixTypeConversionTest.cpp
diff --git a/Modules/Core/Testing/mitkMessageTest.cpp b/Modules/Core/tests/mitkMessageTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkMessageTest.cpp
rename to Modules/Core/tests/mitkMessageTest.cpp
diff --git a/Modules/Core/Testing/mitkMultiComponentImageDataComparisonFilterTest.cpp b/Modules/Core/tests/mitkMultiComponentImageDataComparisonFilterTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkMultiComponentImageDataComparisonFilterTest.cpp
rename to Modules/Core/tests/mitkMultiComponentImageDataComparisonFilterTest.cpp
diff --git a/Modules/Core/Testing/mitkNodeDependentPointSetInteractorTest.cpp b/Modules/Core/tests/mitkNodeDependentPointSetInteractorTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkNodeDependentPointSetInteractorTest.cpp
rename to Modules/Core/tests/mitkNodeDependentPointSetInteractorTest.cpp
diff --git a/Modules/Core/Testing/mitkNodePredicateSourceTest.cpp b/Modules/Core/tests/mitkNodePredicateSourceTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkNodePredicateSourceTest.cpp
rename to Modules/Core/tests/mitkNodePredicateSourceTest.cpp
diff --git a/Modules/Core/Testing/mitkPixelTypeTest.cpp b/Modules/Core/tests/mitkPixelTypeTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPixelTypeTest.cpp
rename to Modules/Core/tests/mitkPixelTypeTest.cpp
diff --git a/Modules/Core/Testing/mitkPlaneGeometryTest.cpp b/Modules/Core/tests/mitkPlaneGeometryTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPlaneGeometryTest.cpp
rename to Modules/Core/tests/mitkPlaneGeometryTest.cpp
diff --git a/Modules/Core/Testing/mitkPlanePositionManagerTest.cpp b/Modules/Core/tests/mitkPlanePositionManagerTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPlanePositionManagerTest.cpp
rename to Modules/Core/tests/mitkPlanePositionManagerTest.cpp
diff --git a/Modules/Core/Testing/mitkPointSetDataInteractorTest.cpp b/Modules/Core/tests/mitkPointSetDataInteractorTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointSetDataInteractorTest.cpp
rename to Modules/Core/tests/mitkPointSetDataInteractorTest.cpp
diff --git a/Modules/Core/Testing/mitkPointSetEqualTest.cpp b/Modules/Core/tests/mitkPointSetEqualTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointSetEqualTest.cpp
rename to Modules/Core/tests/mitkPointSetEqualTest.cpp
diff --git a/Modules/Core/Testing/mitkPointSetFileIOTest.cpp b/Modules/Core/tests/mitkPointSetFileIOTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointSetFileIOTest.cpp
rename to Modules/Core/tests/mitkPointSetFileIOTest.cpp
diff --git a/Modules/Core/Testing/mitkPointSetInteractorTest.cpp b/Modules/Core/tests/mitkPointSetInteractorTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointSetInteractorTest.cpp
rename to Modules/Core/tests/mitkPointSetInteractorTest.cpp
diff --git a/Modules/Core/Testing/mitkPointSetLocaleTest.cpp b/Modules/Core/tests/mitkPointSetLocaleTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointSetLocaleTest.cpp
rename to Modules/Core/tests/mitkPointSetLocaleTest.cpp
diff --git a/Modules/Core/Testing/mitkPointSetOnEmptyTest.cpp b/Modules/Core/tests/mitkPointSetOnEmptyTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointSetOnEmptyTest.cpp
rename to Modules/Core/tests/mitkPointSetOnEmptyTest.cpp
diff --git a/Modules/Core/Testing/mitkPointSetPointOperationsTest.cpp b/Modules/Core/tests/mitkPointSetPointOperationsTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointSetPointOperationsTest.cpp
rename to Modules/Core/tests/mitkPointSetPointOperationsTest.cpp
diff --git a/Modules/Core/Testing/mitkPointSetReaderTest.cpp b/Modules/Core/tests/mitkPointSetReaderTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointSetReaderTest.cpp
rename to Modules/Core/tests/mitkPointSetReaderTest.cpp
diff --git a/Modules/Core/Testing/mitkPointSetTest.cpp b/Modules/Core/tests/mitkPointSetTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointSetTest.cpp
rename to Modules/Core/tests/mitkPointSetTest.cpp
diff --git a/Modules/Core/Testing/mitkPointSetVtkMapper2DGlyphTypeTest.cpp b/Modules/Core/tests/mitkPointSetVtkMapper2DGlyphTypeTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointSetVtkMapper2DGlyphTypeTest.cpp
rename to Modules/Core/tests/mitkPointSetVtkMapper2DGlyphTypeTest.cpp
diff --git a/Modules/Core/Testing/mitkPointSetVtkMapper2DImageTest.cpp b/Modules/Core/tests/mitkPointSetVtkMapper2DImageTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointSetVtkMapper2DImageTest.cpp
rename to Modules/Core/tests/mitkPointSetVtkMapper2DImageTest.cpp
diff --git a/Modules/Core/Testing/mitkPointSetVtkMapper2DTest.cpp b/Modules/Core/tests/mitkPointSetVtkMapper2DTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointSetVtkMapper2DTest.cpp
rename to Modules/Core/tests/mitkPointSetVtkMapper2DTest.cpp
diff --git a/Modules/Core/Testing/mitkPointSetVtkMapper2DTransformedPointsTest.cpp b/Modules/Core/tests/mitkPointSetVtkMapper2DTransformedPointsTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointSetVtkMapper2DTransformedPointsTest.cpp
rename to Modules/Core/tests/mitkPointSetVtkMapper2DTransformedPointsTest.cpp
diff --git a/Modules/Core/Testing/mitkPointSetWriterTest.cpp b/Modules/Core/tests/mitkPointSetWriterTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointSetWriterTest.cpp
rename to Modules/Core/tests/mitkPointSetWriterTest.cpp
diff --git a/Modules/Core/Testing/mitkPointTypeConversionTest.cpp b/Modules/Core/tests/mitkPointTypeConversionTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPointTypeConversionTest.cpp
rename to Modules/Core/tests/mitkPointTypeConversionTest.cpp
diff --git a/Modules/Core/Testing/mitkProgressBarTest.cpp b/Modules/Core/tests/mitkProgressBarTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkProgressBarTest.cpp
rename to Modules/Core/tests/mitkProgressBarTest.cpp
diff --git a/Modules/Core/Testing/mitkPropertyAliasesTest.cpp b/Modules/Core/tests/mitkPropertyAliasesTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPropertyAliasesTest.cpp
rename to Modules/Core/tests/mitkPropertyAliasesTest.cpp
diff --git a/Modules/Core/Testing/mitkPropertyDescriptionsTest.cpp b/Modules/Core/tests/mitkPropertyDescriptionsTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPropertyDescriptionsTest.cpp
rename to Modules/Core/tests/mitkPropertyDescriptionsTest.cpp
diff --git a/Modules/Core/Testing/mitkPropertyExtensionsTest.cpp b/Modules/Core/tests/mitkPropertyExtensionsTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPropertyExtensionsTest.cpp
rename to Modules/Core/tests/mitkPropertyExtensionsTest.cpp
diff --git a/Modules/Core/Testing/mitkPropertyFiltersTest.cpp b/Modules/Core/tests/mitkPropertyFiltersTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPropertyFiltersTest.cpp
rename to Modules/Core/tests/mitkPropertyFiltersTest.cpp
diff --git a/Modules/Core/Testing/mitkPropertyListTest.cpp b/Modules/Core/tests/mitkPropertyListTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPropertyListTest.cpp
rename to Modules/Core/tests/mitkPropertyListTest.cpp
diff --git a/Modules/Core/Testing/mitkPropertyTest.cpp b/Modules/Core/tests/mitkPropertyTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkPropertyTest.cpp
rename to Modules/Core/tests/mitkPropertyTest.cpp
diff --git a/Modules/Core/Testing/mitkProportionalTimeGeometryTest.cpp b/Modules/Core/tests/mitkProportionalTimeGeometryTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkProportionalTimeGeometryTest.cpp
rename to Modules/Core/tests/mitkProportionalTimeGeometryTest.cpp
diff --git a/Modules/Core/Testing/mitkRawImageFileReaderTest.cpp b/Modules/Core/tests/mitkRawImageFileReaderTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkRawImageFileReaderTest.cpp
rename to Modules/Core/tests/mitkRawImageFileReaderTest.cpp
diff --git a/Modules/Core/Testing/mitkRegistrationBaseTest.cpp b/Modules/Core/tests/mitkRegistrationBaseTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkRegistrationBaseTest.cpp
rename to Modules/Core/tests/mitkRegistrationBaseTest.cpp
diff --git a/Modules/Core/Testing/mitkRenderingManagerTest.cpp b/Modules/Core/tests/mitkRenderingManagerTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkRenderingManagerTest.cpp
rename to Modules/Core/tests/mitkRenderingManagerTest.cpp
diff --git a/Modules/Core/Testing/mitkSTLFileReaderTest.cpp b/Modules/Core/tests/mitkSTLFileReaderTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkSTLFileReaderTest.cpp
rename to Modules/Core/tests/mitkSTLFileReaderTest.cpp
diff --git a/Modules/Core/Testing/mitkShaderRepositoryTest.cpp b/Modules/Core/tests/mitkShaderRepositoryTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkShaderRepositoryTest.cpp
rename to Modules/Core/tests/mitkShaderRepositoryTest.cpp
diff --git a/Modules/Core/Testing/mitkSliceNavigationControllerTest.cpp b/Modules/Core/tests/mitkSliceNavigationControllerTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkSliceNavigationControllerTest.cpp
rename to Modules/Core/tests/mitkSliceNavigationControllerTest.cpp
diff --git a/Modules/Core/Testing/mitkSlicedGeometry3DTest.cpp b/Modules/Core/tests/mitkSlicedGeometry3DTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkSlicedGeometry3DTest.cpp
rename to Modules/Core/tests/mitkSlicedGeometry3DTest.cpp
diff --git a/Modules/Core/Testing/mitkStateMachineContainerTest.cpp b/Modules/Core/tests/mitkStateMachineContainerTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkStateMachineContainerTest.cpp
rename to Modules/Core/tests/mitkStateMachineContainerTest.cpp
diff --git a/Modules/Core/Testing/mitkStateMachineFactoryTest.cpp b/Modules/Core/tests/mitkStateMachineFactoryTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkStateMachineFactoryTest.cpp
rename to Modules/Core/tests/mitkStateMachineFactoryTest.cpp
diff --git a/Modules/Core/Testing/mitkStateMachineTest.cpp b/Modules/Core/tests/mitkStateMachineTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkStateMachineTest.cpp
rename to Modules/Core/tests/mitkStateMachineTest.cpp
diff --git a/Modules/Core/Testing/mitkStateTest.cpp b/Modules/Core/tests/mitkStateTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkStateTest.cpp
rename to Modules/Core/tests/mitkStateTest.cpp
diff --git a/Modules/Core/Testing/mitkStepperTest.cpp b/Modules/Core/tests/mitkStepperTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkStepperTest.cpp
rename to Modules/Core/tests/mitkStepperTest.cpp
diff --git a/Modules/Core/Testing/mitkSurfaceDepthPeelingTest.cpp b/Modules/Core/tests/mitkSurfaceDepthPeelingTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkSurfaceDepthPeelingTest.cpp
rename to Modules/Core/tests/mitkSurfaceDepthPeelingTest.cpp
diff --git a/Modules/Core/Testing/mitkSurfaceDepthSortingTest.cpp b/Modules/Core/tests/mitkSurfaceDepthSortingTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkSurfaceDepthSortingTest.cpp
rename to Modules/Core/tests/mitkSurfaceDepthSortingTest.cpp
diff --git a/Modules/Core/Testing/mitkSurfaceEqualTest.cpp b/Modules/Core/tests/mitkSurfaceEqualTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkSurfaceEqualTest.cpp
rename to Modules/Core/tests/mitkSurfaceEqualTest.cpp
diff --git a/Modules/Core/Testing/mitkSurfaceTest.cpp b/Modules/Core/tests/mitkSurfaceTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkSurfaceTest.cpp
rename to Modules/Core/tests/mitkSurfaceTest.cpp
diff --git a/Modules/Core/Testing/mitkSurfaceToImageFilterTest.cpp b/Modules/Core/tests/mitkSurfaceToImageFilterTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkSurfaceToImageFilterTest.cpp
rename to Modules/Core/tests/mitkSurfaceToImageFilterTest.cpp
diff --git a/Modules/Core/Testing/mitkSurfaceToSurfaceFilterTest.cpp b/Modules/Core/tests/mitkSurfaceToSurfaceFilterTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkSurfaceToSurfaceFilterTest.cpp
rename to Modules/Core/tests/mitkSurfaceToSurfaceFilterTest.cpp
diff --git a/Modules/Core/Testing/mitkSurfaceVtkMapper2DColorTest.cpp b/Modules/Core/tests/mitkSurfaceVtkMapper2DColorTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkSurfaceVtkMapper2DColorTest.cpp
rename to Modules/Core/tests/mitkSurfaceVtkMapper2DColorTest.cpp
diff --git a/Modules/Core/Testing/mitkSurfaceVtkMapper2DOpacityTest.cpp b/Modules/Core/tests/mitkSurfaceVtkMapper2DOpacityTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkSurfaceVtkMapper2DOpacityTest.cpp
rename to Modules/Core/tests/mitkSurfaceVtkMapper2DOpacityTest.cpp
diff --git a/Modules/Core/Testing/mitkSurfaceVtkMapper3DTest.cpp b/Modules/Core/tests/mitkSurfaceVtkMapper3DTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkSurfaceVtkMapper3DTest.cpp
rename to Modules/Core/tests/mitkSurfaceVtkMapper3DTest.cpp
diff --git a/Modules/Core/Testing/mitkSurfaceVtkMapper3DTexturedSphereTest.cpp b/Modules/Core/tests/mitkSurfaceVtkMapper3DTexturedSphereTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkSurfaceVtkMapper3DTexturedSphereTest.cpp
rename to Modules/Core/tests/mitkSurfaceVtkMapper3DTexturedSphereTest.cpp
diff --git a/Modules/Core/Testing/mitkSurfaceVtkWriterTest.cpp b/Modules/Core/tests/mitkSurfaceVtkWriterTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkSurfaceVtkWriterTest.cpp
rename to Modules/Core/tests/mitkSurfaceVtkWriterTest.cpp
diff --git a/Modules/Core/Testing/mitkTestUtilSharedLibrary.cpp b/Modules/Core/tests/mitkTestUtilSharedLibrary.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkTestUtilSharedLibrary.cpp
rename to Modules/Core/tests/mitkTestUtilSharedLibrary.cpp
diff --git a/Modules/Core/Testing/mitkTimeGeometryTest.cpp b/Modules/Core/tests/mitkTimeGeometryTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkTimeGeometryTest.cpp
rename to Modules/Core/tests/mitkTimeGeometryTest.cpp
diff --git a/Modules/Core/Testing/mitkTinyXMLTest.cpp b/Modules/Core/tests/mitkTinyXMLTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkTinyXMLTest.cpp
rename to Modules/Core/tests/mitkTinyXMLTest.cpp
diff --git a/Modules/Core/Testing/mitkTransferFunctionTest.cpp b/Modules/Core/tests/mitkTransferFunctionTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkTransferFunctionTest.cpp
rename to Modules/Core/tests/mitkTransferFunctionTest.cpp
diff --git a/Modules/Core/Testing/mitkTransitionTest.cpp b/Modules/Core/tests/mitkTransitionTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkTransitionTest.cpp
rename to Modules/Core/tests/mitkTransitionTest.cpp
diff --git a/Modules/Core/Testing/mitkUIDGeneratorTest.cpp b/Modules/Core/tests/mitkUIDGeneratorTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkUIDGeneratorTest.cpp
rename to Modules/Core/tests/mitkUIDGeneratorTest.cpp
diff --git a/Modules/Core/Testing/mitkUndoControllerTest.cpp b/Modules/Core/tests/mitkUndoControllerTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkUndoControllerTest.cpp
rename to Modules/Core/tests/mitkUndoControllerTest.cpp
diff --git a/Modules/Core/Testing/mitkVTKRenderWindowSizeTest.cpp b/Modules/Core/tests/mitkVTKRenderWindowSizeTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkVTKRenderWindowSizeTest.cpp
rename to Modules/Core/tests/mitkVTKRenderWindowSizeTest.cpp
diff --git a/Modules/Core/Testing/mitkVectorTest.cpp b/Modules/Core/tests/mitkVectorTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkVectorTest.cpp
rename to Modules/Core/tests/mitkVectorTest.cpp
diff --git a/Modules/Core/Testing/mitkVectorTypeConversionTest.cpp b/Modules/Core/tests/mitkVectorTypeConversionTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkVectorTypeConversionTest.cpp
rename to Modules/Core/tests/mitkVectorTypeConversionTest.cpp
diff --git a/Modules/Core/Testing/mitkVerboseLimitedLinearUndoTest.cpp b/Modules/Core/tests/mitkVerboseLimitedLinearUndoTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkVerboseLimitedLinearUndoTest.cpp
rename to Modules/Core/tests/mitkVerboseLimitedLinearUndoTest.cpp
diff --git a/Modules/Core/Testing/mitkVolumeCalculatorTest.cpp b/Modules/Core/tests/mitkVolumeCalculatorTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkVolumeCalculatorTest.cpp
rename to Modules/Core/tests/mitkVolumeCalculatorTest.cpp
diff --git a/Modules/Core/Testing/mitkVtkPropRendererTest.cpp b/Modules/Core/tests/mitkVtkPropRendererTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkVtkPropRendererTest.cpp
rename to Modules/Core/tests/mitkVtkPropRendererTest.cpp
diff --git a/Modules/Core/Testing/mitkVtkWidgetRenderingTest.cpp b/Modules/Core/tests/mitkVtkWidgetRenderingTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkVtkWidgetRenderingTest.cpp
rename to Modules/Core/tests/mitkVtkWidgetRenderingTest.cpp
diff --git a/Modules/Core/Testing/mitkWeakPointerTest.cpp b/Modules/Core/tests/mitkWeakPointerTest.cpp
similarity index 100%
rename from Modules/Core/Testing/mitkWeakPointerTest.cpp
rename to Modules/Core/tests/mitkWeakPointerTest.cpp
diff --git a/Modules/Core/Testing/Resources/Interactions/AddAndRemovePoints.xml b/Modules/Core/tests/resources/Interactions/AddAndRemovePoints.xml
similarity index 100%
rename from Modules/Core/Testing/Resources/Interactions/AddAndRemovePoints.xml
rename to Modules/Core/tests/resources/Interactions/AddAndRemovePoints.xml
diff --git a/Modules/Core/Testing/Resources/Interactions/StatemachineConfigTest.xml b/Modules/Core/tests/resources/Interactions/StatemachineConfigTest.xml
similarity index 100%
rename from Modules/Core/Testing/Resources/Interactions/StatemachineConfigTest.xml
rename to Modules/Core/tests/resources/Interactions/StatemachineConfigTest.xml
diff --git a/Modules/Core/Testing/Resources/Interactions/StatemachineTest.xml b/Modules/Core/tests/resources/Interactions/StatemachineTest.xml
similarity index 100%
rename from Modules/Core/Testing/Resources/Interactions/StatemachineTest.xml
rename to Modules/Core/tests/resources/Interactions/StatemachineTest.xml
diff --git a/Modules/Core/Testing/Resources/Interactions/globalConfig.xml b/Modules/Core/tests/resources/Interactions/globalConfig.xml
similarity index 100%
rename from Modules/Core/Testing/Resources/Interactions/globalConfig.xml
rename to Modules/Core/tests/resources/Interactions/globalConfig.xml
diff --git a/Modules/Core/Testing/vtkMitkThickSlicesFilterTest.cpp b/Modules/Core/tests/vtkMitkThickSlicesFilterTest.cpp
similarity index 100%
rename from Modules/Core/Testing/vtkMitkThickSlicesFilterTest.cpp
rename to Modules/Core/tests/vtkMitkThickSlicesFilterTest.cpp