diff --git a/Modules/Core/files.cmake b/Modules/Core/files.cmake
index 2efe3c5dc2..2f1a6d97cf 100644
--- a/Modules/Core/files.cmake
+++ b/Modules/Core/files.cmake
@@ -1,325 +1,326 @@
 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/mitkConvert2Dto3DImageFilter.cpp
   Algorithms/mitkDataNodeSource.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
 
   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/mitkAbstractTransformGeometry.cpp
   DataManagement/mitkAnnotationProperty.cpp
   DataManagement/mitkApplicationCursor.cpp
   DataManagement/mitkApplyTransformMatrixOperation.cpp
   DataManagement/mitkBaseData.cpp
   DataManagement/mitkBaseGeometry.cpp
   DataManagement/mitkBaseProperty.cpp
   DataManagement/mitkChannelDescriptor.cpp
   DataManagement/mitkClippingProperty.cpp
   DataManagement/mitkColorProperty.cpp
   DataManagement/mitkDataNode.cpp
   DataManagement/mitkDataStorage.cpp
   DataManagement/mitkDisplayGeometry.cpp
   DataManagement/mitkEnumerationProperty.cpp
   DataManagement/mitkFloatPropertyExtension.cpp
   DataManagement/mitkGeometry3D.cpp
   DataManagement/mitkGeometryData.cpp
   DataManagement/mitkGeometryTransformHolder.cpp
   DataManagement/mitkGroupTagProperty.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/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/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/mitkPropertyListReplacedObserver.cpp
   DataManagement/mitkPropertyObserver.cpp
   DataManagement/mitkProportionalTimeGeometry.cpp
   DataManagement/mitkRenderingModeProperty.cpp
   DataManagement/mitkResliceMethodProperty.cpp
   DataManagement/mitkRestorePlanePositionOperation.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/mitkTransferFunctionInitializer.cpp
   DataManagement/mitkTransferFunctionProperty.cpp
   DataManagement/mitkVector.cpp
+  DataManagement/mitkVectorProperty.cpp
   DataManagement/mitkVtkInterpolationProperty.cpp
   DataManagement/mitkVtkRepresentationProperty.cpp
   DataManagement/mitkVtkResliceInterpolationProperty.cpp
   DataManagement/mitkVtkScalarModeProperty.cpp
   DataManagement/mitkVtkVolumeRenderingProperty.cpp
   DataManagement/mitkWeakPointerProperty.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/mitkEventConfig.cpp
   Interactions/mitkEvent.cpp
   Interactions/mitkEventDescription.cpp
   Interactions/mitkEventFactory.cpp
   Interactions/mitkEventMapper.cpp
   Interactions/mitkEventRecorder.cpp
   Interactions/mitkEventStateMachine.cpp
   Interactions/mitkGlobalInteraction.cpp
   Interactions/mitkInteractionEventConst.cpp
   Interactions/mitkInteractionEvent.cpp
   Interactions/mitkInteractionEventHandler.cpp
   Interactions/mitkInteractionEventObserver.cpp
   Interactions/mitkInteractionKeyEvent.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/mitkStateMachineContainer.cpp
   Interactions/mitkStateMachine.cpp
   Interactions/mitkStateMachineFactory.cpp
   Interactions/mitkStateMachineState.cpp
   Interactions/mitkStateMachineTransition.cpp
   Interactions/mitkTransition.cpp
   Interactions/mitkVtkEventAdapter.cpp
   Interactions/mitkVtkInteractorStyle.cxx
   Interactions/mitkWheelEvent.cpp
   Interactions/mitkXML2EventParser.cpp
 
   IO/mitkAbstractFileIO.cpp
   IO/mitkAbstractFileReader.cpp
   IO/mitkAbstractFileWriter.cpp
   IO/mitkCustomMimeType.cpp
   IO/mitkDicomSeriesReader.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/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
 
   Rendering/mitkAbstractOverlayLayouter.cpp
   Rendering/mitkBaseRenderer.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/mitkRenderWindowBase.cpp
   Rendering/mitkRenderWindow.cpp
   Rendering/mitkRenderWindowFrame.cpp
   #Rendering/mitkSurfaceGLMapper2D.cpp Moved to deprecated LegacyGL Module
   Rendering/mitkSurfaceVtkMapper2D.cpp
   Rendering/mitkSurfaceVtkMapper3D.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/vtkMitkThickSlicesFilter.cpp
   Rendering/vtkNeverTranslucentTexture.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/VectorProperties/include/mitkVectorProperty.h b/Modules/Core/include/mitkVectorProperty.h
similarity index 96%
rename from Modules/VectorProperties/include/mitkVectorProperty.h
rename to Modules/Core/include/mitkVectorProperty.h
index 45297e3d1b..8d80543a13 100644
--- a/Modules/VectorProperties/include/mitkVectorProperty.h
+++ b/Modules/Core/include/mitkVectorProperty.h
@@ -1,138 +1,138 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #ifndef mitkVectorProperty_h
 #define mitkVectorProperty_h
 
 // MITK
-#include "MitkVectorPropertiesExports.h"
-#include "mitkBaseProperty.h"
+#include <MitkCoreExports.h>
+#include <mitkBaseProperty.h>
 
 // STL
 #include <vector>
 
 namespace mitk
 {
 
 /**
   \brief Helper for VectorProperty to determine a good ITK ClassName.
 
   This template is specialized for special instantiations that need
   a serializer of this VectorProperty.
 */
 template <typename D>
 struct VectorPropertyDataType {
   static const char* prefix() { return "Invalid"; }
 };
 
 /**
   \brief Providing a std::vector as property.
 
   Templated over the data type of the std::vector that is held
   by this class. Nothing special about data handling, setting and
   getting of std::vectors is implemented by-value.
 
   When checking the declaration of this class, you'll notice
   that it does not use the mitkClassMacro but instead writes all
   of its definition manually.
   This is in order to specifically override the GetNameOfClass()
   method without having to inherit again from the template (see
   comments in code).
 */
 template <typename DATATYPE>
-class MITKVECTORPROPERTIES_EXPORT VectorProperty : public BaseProperty
+class MITKCORE_EXPORT VectorProperty : public BaseProperty
 {
 public:
 
   typedef std::vector<DATATYPE> VectorType;
 
   // Manually expand most of mitkClassMacro:
   //   mitkClassMacro(VectorProperty<DATATYPE>, mitk::BaseProperty);
   // This manual expansion is done to override explicitly
   // the GetNameOfClass() and GetStaticNameOfClass() methods
   typedef VectorProperty<DATATYPE> Self;
   typedef BaseProperty SuperClass;
   typedef itk::SmartPointer<Self> Pointer;
   typedef itk::SmartPointer<const Self>  ConstPointer;
   virtual std::vector<std::string> GetClassHierarchy() const override { return mitk::GetClassHierarchy<Self>(); }
 
   /// This function must return different
   /// strings in function of the template parameter!
   /// Serialization depends on this feature.
   static const char* GetStaticNameOfClass()
   {
     // concatenate a prefix dependent on the template type and our own classname
     static std::string nameOfClass = std::string( VectorPropertyDataType<DATATYPE>::prefix()) + "VectorProperty";
     return nameOfClass.c_str();
   }
 
   virtual const char* GetNameOfClass() const override
   {
     return this->GetStaticNameOfClass();
   }
 
   itkFactorylessNewMacro(Self);
   itkCloneMacro(Self)
 
   /// Returns the property value as a std::string
   virtual std::string GetValueAsString() const override;
 
   /// returns a const reference to the contained vector
   virtual const VectorType& GetValue() const;
 
   /// sets the content vector
   virtual void SetValue(const VectorType& parameter_vector);
 
 private:
 
   /// purposely not implemented
   VectorProperty& operator=(const Self&);
 
   /// creates a copy of it self
   virtual itk::LightObject::Pointer InternalClone() const override;
 
   /// compares two properties.
   virtual bool IsEqual(const BaseProperty& an_other_property) const override;
 
   /// assigns the content of an_other_property to this
   virtual bool Assign(const BaseProperty& an_other_property) override;
 
   /// property content
   VectorType m_PropertyContent;
 };
 
 /// This should be used in .h files.
 #define MITK_DECLARE_VECTOR_PROPERTY(TYPE, PREFIX) \
  \
 typedef VectorProperty<TYPE> PREFIX ## VectorProperty; \
  \
 template <> \
 struct VectorPropertyDataType< TYPE > \
 { \
   static const char* prefix() { return #PREFIX; } \
 };
 
 /// This should be used in a .cpp file
 #define MITK_DEFINE_VECTOR_PROPERTY(TYPE) \
 template class VectorProperty<TYPE>;
 
 MITK_DECLARE_VECTOR_PROPERTY(double, Double)
 MITK_DECLARE_VECTOR_PROPERTY(int, Int)
 
 } // namespace
 
 #endif
 
diff --git a/Modules/VectorProperties/src/mitkVectorProperty.cpp b/Modules/Core/src/DataManagement/mitkVectorProperty.cpp
similarity index 100%
rename from Modules/VectorProperties/src/mitkVectorProperty.cpp
rename to Modules/Core/src/DataManagement/mitkVectorProperty.cpp
diff --git a/Modules/Core/test/files.cmake b/Modules/Core/test/files.cmake
index a48057fffb..1bb7e4991b 100644
--- a/Modules/Core/test/files.cmake
+++ b/Modules/Core/test/files.cmake
@@ -1,194 +1,195 @@
 # tests with no extra command line parameter
 set(MODULE_TESTS
   # IMPORTANT: If you plan to deactivate / comment out a test please write a bug number to the commented out line of code.
   #
   #     Example: #mitkMyTest #this test is commented out because of bug 12345
   #
   # It is important that the bug is open and that the test will be activated again before the bug is closed. This assures that
   # no test is forgotten after it was commented out. If there is no bug for your current problem, please add a new one and
   # mark it as critical.
 
   ################## DISABLED TESTS #################################################
   #mitkAbstractTransformGeometryTest.cpp #seems as tested class mitkExternAbstractTransformGeometry doesnt exist any more
   #mitkStateMachineContainerTest.cpp #rewrite test, indirect since no longer exported Bug 14529
   #mitkRegistrationBaseTest.cpp #tested class  mitkRegistrationBase doesn't exist any more
   #mitkSegmentationInterpolationTest.cpp #file doesn't exist!
   #mitkPipelineSmartPointerCorrectnessTest.cpp #file doesn't exist!
   #mitkITKThreadingTest.cpp #test outdated because itk::Semaphore was removed from ITK
   #mitkAbstractTransformPlaneGeometryTest.cpp #mitkVtkAbstractTransformPlaneGeometry doesn't exist any more
   #mitkTestUtilSharedLibrary.cpp #Linker problem with this test...
   #mitkTextOverlay2DSymbolsRenderingTest.cpp #Implementation of the tested feature is not finished yet. Ask Christoph or see bug 15104 for details.
 
   ################# RUNNING TESTS ###################################################
   mitkAccessByItkTest.cpp
   mitkCoreObjectFactoryTest.cpp
   mitkDataNodeTest.cpp
   mitkMaterialTest.cpp
   mitkActionTest.cpp
   mitkDispatcherTest.cpp
   mitkEnumerationPropertyTest.cpp
   mitkEventTest.cpp
   mitkFileReaderRegistryTest.cpp
   #mitkFileWriterRegistryTest.cpp
   mitkFocusManagerTest.cpp
   mitkGenericPropertyTest.cpp
   mitkGeometry3DTest.cpp
   mitkGeometry3DEqualTest.cpp
   mitkGeometryDataToSurfaceFilterTest.cpp
   mitkGlobalInteractionTest.cpp
   mitkImageCastTest.cpp
   mitkImageEqualTest.cpp
   mitkImageDataItemTest.cpp
   mitkImageGeneratorTest.cpp
   mitkIOUtilTest.cpp
   mitkBaseDataTest.cpp
   mitkImportItkImageTest.cpp
   mitkGrabItkImageMemoryTest.cpp
   mitkInstantiateAccessFunctionTest.cpp
   mitkInteractorTest.cpp
   mitkLevelWindowTest.cpp
   mitkMessageTest.cpp
   mitkPixelTypeTest.cpp
   mitkPlaneGeometryTest.cpp
   mitkPointSetTest.cpp
   mitkPointSetEqualTest.cpp
   mitkPointSetFileIOTest.cpp
   mitkPointSetOnEmptyTest.cpp
   mitkPointSetWriterTest.cpp
   mitkPointSetReaderTest.cpp
   mitkPointSetInteractorTest.cpp
   mitkPointSetPointOperationsTest.cpp
   mitkProgressBarTest.cpp
   mitkPropertyTest.cpp
   mitkPropertyListTest.cpp
   mitkSlicedGeometry3DTest.cpp
   mitkSliceNavigationControllerTest.cpp
   mitkStateMachineTest.cpp
   mitkStateTest.cpp
   mitkSurfaceTest.cpp
   mitkSurfaceEqualTest.cpp
   mitkSurfaceToSurfaceFilterTest.cpp
   mitkTimeGeometryTest.cpp
   mitkProportionalTimeGeometryTest.cpp
   mitkTransitionTest.cpp
   mitkUndoControllerTest.cpp
   mitkVtkWidgetRenderingTest.cpp
   mitkVerboseLimitedLinearUndoTest.cpp
   mitkWeakPointerTest.cpp
   mitkTransferFunctionTest.cpp
   mitkStepperTest.cpp
   mitkRenderingManagerTest.cpp
   vtkMitkThickSlicesFilterTest.cpp
   mitkNodePredicateSourceTest.cpp
   mitkVectorTest.cpp
   mitkClippedSurfaceBoundsCalculatorTest.cpp
   mitkExceptionTest.cpp
   mitkExtractSliceFilterTest.cpp
   mitkLogTest.cpp
   mitkImageDimensionConverterTest.cpp
   mitkLoggingAdapterTest.cpp
   mitkUIDGeneratorTest.cpp
   mitkShaderRepositoryTest.cpp
   mitkPlanePositionManagerTest.cpp
   mitkAffineTransformBaseTest.cpp
   mitkPropertyAliasesTest.cpp
   mitkPropertyDescriptionsTest.cpp
   mitkPropertyExtensionsTest.cpp
   mitkPropertyFiltersTest.cpp
   mitkTinyXMLTest.cpp
   mitkRawImageFileReaderTest.cpp
   mitkInteractionEventTest.cpp
   mitkLookupTableTest.cpp
   mitkSTLFileReaderTest.cpp
   mitkPointTypeConversionTest.cpp
   mitkVectorTypeConversionTest.cpp
   mitkMatrixTypeConversionTest.cpp
   mitkArrayTypeConversionTest.cpp
   mitkSurfaceToImageFilterTest.cpp
   mitkBaseGeometryTest.cpp
   mitkImageToSurfaceFilterTest.cpp
   mitkEqualTest.cpp
   mitkLineTest.cpp
   mitkItkImageIOTest.cpp
+  mitkVectorPropertyTest.cpp
 )
 
 if(MITK_ENABLE_RENDERING_TESTING)
 set(MODULE_TESTS
   ${MODULE_TESTS}
   mitkPointSetDataInteractorTest.cpp #since mitkInteractionTestHelper is currently creating a vtkRenderWindow
   mitkSurfaceVtkMapper2DTest.cpp #new rendering test in CppUnit style
 )
 endif()
 
 
 
 # test with image filename as an extra command line parameter
 set(MODULE_IMAGE_TESTS
   mitkImageTimeSelectorTest.cpp #only runs on images
   mitkImageAccessorTest.cpp #only runs on images
 )
 
 set(MODULE_SURFACE_TESTS
   mitkSurfaceVtkWriterTest.cpp #only runs on surfaces
 )
 
 # list of images for which the tests are run
 set(MODULE_TESTIMAGES
   US4DCyl.nrrd
   Pic3D.nrrd
   Pic2DplusT.nrrd
   BallBinary30x30x30.nrrd
   Png2D-bw.png
 )
 set(MODULE_TESTSURFACES
   binary.stl
   ball.stl
 )
 
 set(MODULE_CUSTOM_TESTS
     mitkDataStorageTest.cpp
     mitkDicomSeriesReaderTest.cpp
     mitkDICOMLocaleTest.cpp
     mitkDataNodeTest.cpp
     mitkEventMapperTest.cpp
     mitkEventConfigTest.cpp
     mitkNodeDependentPointSetInteractorTest.cpp
     mitkStateMachineFactoryTest.cpp
     mitkPointSetLocaleTest.cpp
     mitkImageTest.cpp
     mitkImageVtkMapper2DTest.cpp
     mitkImageVtkMapper2DLevelWindowTest.cpp
     mitkImageVtkMapper2DOpacityTest.cpp
     mitkImageVtkMapper2DResliceInterpolationPropertyTest.cpp
     mitkImageVtkMapper2DColorTest.cpp
     mitkImageVtkMapper2DSwivelTest.cpp
     mitkImageVtkMapper2DTransferFunctionTest.cpp
     mitkImageVtkMapper2DOpacityTransferFunctionTest.cpp
     mitkImageVtkMapper2DLookupTableTest.cpp
     mitkSurfaceVtkMapper3DTest
     mitkSurfaceVtkMapper3DTexturedSphereTest.cpp
     mitkVolumeCalculatorTest.cpp
     mitkLevelWindowManagerTest.cpp
     mitkPointSetVtkMapper2DTest.cpp
     mitkPointSetVtkMapper2DImageTest.cpp
     mitkPointSetVtkMapper2DGlyphTypeTest.cpp
     mitkPointSetVtkMapper2DTransformedPointsTest.cpp
     mitkVTKRenderWindowSizeTest.cpp
     mitkMultiComponentImageDataComparisonFilterTest.cpp
     mitkImageToItkTest.cpp
     mitkImageSliceSelectorTest.cpp
     mitkSurfaceDepthPeelingTest.cpp
 )
 
 # Currently not working on windows because of a rendering timing issue
 # see bug 18083 for details
 if(NOT WIN32)
  set(MODULE_CUSTOM_TESTS ${MODULE_CUSTOM_TESTS} mitkSurfaceDepthSortingTest.cpp)
 endif()
 
 set(RESOURCE_FILES
   Interactions/AddAndRemovePoints.xml
   Interactions/globalConfig.xml
   Interactions/StatemachineTest.xml
   Interactions/StatemachineConfigTest.xml
 )
diff --git a/Modules/VectorProperties/test/mitkVectorPropertyTest.cpp b/Modules/Core/test/mitkVectorPropertyTest.cpp
similarity index 100%
rename from Modules/VectorProperties/test/mitkVectorPropertyTest.cpp
rename to Modules/Core/test/mitkVectorPropertyTest.cpp
diff --git a/Modules/ModuleList.cmake b/Modules/ModuleList.cmake
index a3cea121fa..e8c8e06df4 100644
--- a/Modules/ModuleList.cmake
+++ b/Modules/ModuleList.cmake
@@ -1,72 +1,71 @@
 # The entries in the mitk_modules list must be
 # ordered according to their dependencies.
 
 set(mitk_modules
   Core
   AppUtil
   DCMTesting
   RDF
   LegacyIO
   DataTypesExt
   Overlays
   LegacyGL
   AlgorithmsExt
   MapperExt
   DICOMReader
   DICOMTesting
   Qt4Qt5TestModule
   SceneSerializationBase
   PlanarFigure
   ImageDenoising
   ImageExtraction
   ImageStatistics
   LegacyAdaptors
   SceneSerialization
   GraphAlgorithms
   Multilabel
   ContourModel
   SurfaceInterpolation
   Segmentation
   PlanarFigureSegmentation
   OpenViewCore
   QmlItems
   QtWidgets
   QtWidgetsExt
   SegmentationUI
   DiffusionImaging
   GPGPU
   OpenIGTLink
   IGTBase
   IGT
   CameraCalibration
   RigidRegistration
   RigidRegistrationUI
   DeformableRegistration
   DeformableRegistrationUI
   OpenCL
   OpenCVVideoSupport
   QtOverlays
   InputDevices
   ToFHardware
   ToFProcessing
   ToFUI
   US
   USUI
   DicomUI
   Simulation
   Remeshing
   Python
   Persistence
   OpenIGTLinkUI
   IGTUI
   VtkShaders
   DicomRT
   IOExt
   XNAT
   TubeGraph
-  VectorProperties
 )
 
 if(MITK_ENABLE_PIC_READER)
   list(APPEND mitk_modules IpPicSupportIO)
 endif()
diff --git a/Modules/SceneSerializationBase/files.cmake b/Modules/SceneSerializationBase/files.cmake
index 5e34cffa7f..022aebc1c2 100644
--- a/Modules/SceneSerializationBase/files.cmake
+++ b/Modules/SceneSerializationBase/files.cmake
@@ -1,32 +1,33 @@
 file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
 
 set(CPP_FILES
   mitkAnnotationPropertySerializer.cpp
   mitkBaseDataSerializer.cpp
   mitkBasePropertySerializer.cpp
   mitkBoolLookupTablePropertySerializer.cpp
   mitkBoolPropertySerializer.cpp
   mitkClippingPropertySerializer.cpp
   mitkColorPropertySerializer.cpp
   mitkDoublePropertySerializer.cpp
   mitkEnumerationPropertySerializer.cpp
   mitkEnumerationSubclassesSerializer.cpp
   mitkFloatLookupTablePropertySerializer.cpp
   mitkFloatPropertySerializer.cpp
   mitkGroupTagPropertySerializer.cpp
   mitkIntLookupTablePropertySerializer.cpp
   mitkIntPropertySerializer.cpp
   mitkLevelWindowPropertySerializer.cpp
   mitkLookupTablePropertySerializer.cpp
   mitkPoint3dPropertySerializer.cpp
   mitkPoint3iPropertySerializer.cpp
   mitkPoint4dPropertySerializer.cpp
   mitkPropertyListSerializer.cpp
   mitkStringLookupTablePropertySerializer.cpp
   mitkStringPropertySerializer.cpp
   mitkTransferFunctionPropertySerializer.cpp
   mitkUIntPropertySerializer.cpp
   mitkUShortPropertySerializer.cpp
   mitkVector3DPropertySerializer.cpp
+  mitkVectorPropertySerializer.cpp
 )
 
diff --git a/Modules/VectorProperties/src/mitkVectorPropertySerializer.h b/Modules/SceneSerializationBase/include/mitkVectorPropertySerializer.h
similarity index 97%
rename from Modules/VectorProperties/src/mitkVectorPropertySerializer.h
rename to Modules/SceneSerializationBase/include/mitkVectorPropertySerializer.h
index a420a54da9..d4a1a49cf9 100644
--- a/Modules/VectorProperties/src/mitkVectorPropertySerializer.h
+++ b/Modules/SceneSerializationBase/include/mitkVectorPropertySerializer.h
@@ -1,164 +1,164 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #ifndef mitkVectorPropertySerializer_h
 #define mitkVectorPropertySerializer_h
 
 #include "mitkBasePropertySerializer.h"
 
 #include "mitkVectorProperty.h"
 
 namespace mitk {
 
 /**
   \brief Serializes a VectorProperty
 
   Serializes an instance of VectorProperty into a XML structure like
 
   \verbatim
   <Values>
     <Value idx="0" value="17.3"/>
     <Value idx="1" value="7.2"/>
     <Value idx="2" value="-17.3"/>
   </Values>
   \endverbatim
 
   This class is implemented as a template and makes use of std::stringstream
   for necessary conversions of specific data types to and from string.
 
   For numeric types, the class adds a precision token to stringstream that
   should usually suffice.
 */
 template< typename DATATYPE >
-class VectorPropertySerializer : public BasePropertySerializer
+class MITKSCENESERIALIZATIONBASE_EXPORT VectorPropertySerializer : public BasePropertySerializer
 {
 public:
 
   // Expand manually most of mitkClassMacro:
   // mitkClassMacro(VectorProperty<DATATYPE>, mitk::BaseProperty);
   // This manual expansion is done to override explicitely
   // the GetNameOfClass methods
   typedef VectorProperty<DATATYPE> PropertyType;
   typedef VectorPropertySerializer<DATATYPE> Self;
   typedef BasePropertySerializer SuperClass;
   typedef itk::SmartPointer<Self> Pointer;
   typedef itk::SmartPointer<const Self>  ConstPointer;
   virtual std::vector<std::string> GetClassHierarchy() const override
   {
       return mitk::GetClassHierarchy<Self>();
   }
 
   // This function must return different
   // strings in function of the template parameter!
   // Serialization depends on this feature.
   static const char* GetStaticNameOfClass()
   {
     // concatenate a prefix dependent on the template type and our own classname
     static std::string nameOfClass = std::string( VectorPropertyDataType<DATATYPE>::prefix()) + "VectorPropertySerializer";
     return nameOfClass.c_str();
   }
 
   virtual const char* GetNameOfClass() const override
   {
     return this->GetStaticNameOfClass();
   }
 
   itkFactorylessNewMacro(Self);
   itkCloneMacro(Self)
 
   virtual TiXmlElement* Serialize() override
   {
     auto listElement = new TiXmlElement( "Values" );
 
     if ( const PropertyType* prop = dynamic_cast<const PropertyType*>(m_Property.GetPointer()) )
     {
       typename PropertyType::VectorType elements = prop->GetValue();
       unsigned int index(0);
       for (auto listEntry : elements)
       {
         std::stringstream indexS;
         indexS << index++;
 
         std::stringstream valueS;
         valueS.precision(16);
         valueS <<  listEntry;
         auto entryElement = new TiXmlElement("Value");
         entryElement->SetAttribute("idx", indexS.str());
         entryElement->SetAttribute("value", valueS.str());
         listElement->LinkEndChild( entryElement );
       }
 
       return listElement;
     }
     else
     {
       return nullptr;
     }
   }
 
 
     virtual BaseProperty::Pointer Deserialize(TiXmlElement* listElement) override
     {
       typename PropertyType::VectorType datalist;
 
       if ( listElement )
       {
         MITK_DEBUG << "Deserializing " << *listElement;
 
         unsigned int index(0);
         std::string valueString;
         DATATYPE value;
         for ( TiXmlElement* valueElement = listElement->FirstChildElement("Value");
               valueElement;
               valueElement = valueElement->NextSiblingElement("Value") )
         {
           if ( valueElement->QueryValueAttribute("value", &valueString) != TIXML_SUCCESS )
           {
               MITK_ERROR << "Missing value attribute in <Values> list";
             return nullptr;
           }
 
           std::istringstream ss(valueString);
           if ( !(ss >> value ) )
           {
             MITK_ERROR << "Could not make sense of '" << valueString << "'";
             return nullptr;
           }
 
           datalist.push_back(value);
           ++index;
         }
 
         typename PropertyType::Pointer property = PropertyType::New();
         property->SetValue( datalist );
         return property.GetPointer();
       }
       else
       {
         MITK_ERROR << "Missing <Values> tag.";
       }
 
       return nullptr;
     }
 
 };
 
 typedef VectorPropertySerializer<double> DoubleVectorPropertySerializer;
 typedef VectorPropertySerializer<int> IntVectorPropertySerializer;
 
 } // namespace
 
 #endif
diff --git a/Modules/VectorProperties/src/mitkVectorPropertySerializer.cpp b/Modules/SceneSerializationBase/src/mitkVectorPropertySerializer.cpp
similarity index 100%
rename from Modules/VectorProperties/src/mitkVectorPropertySerializer.cpp
rename to Modules/SceneSerializationBase/src/mitkVectorPropertySerializer.cpp
diff --git a/Modules/SceneSerializationBase/test/files.cmake b/Modules/SceneSerializationBase/test/files.cmake
index 4ac3c56d3b..443288d963 100644
--- a/Modules/SceneSerializationBase/test/files.cmake
+++ b/Modules/SceneSerializationBase/test/files.cmake
@@ -1,5 +1,6 @@
 
 set(MODULE_TESTS
   mitkPropertySerializationTest.cpp
+  mitkVectorPropertySerializerTest.cpp
 )
 
diff --git a/Modules/VectorProperties/test/mitkVectorPropertySerializerTest.cpp b/Modules/SceneSerializationBase/test/mitkVectorPropertySerializerTest.cpp
similarity index 100%
rename from Modules/VectorProperties/test/mitkVectorPropertySerializerTest.cpp
rename to Modules/SceneSerializationBase/test/mitkVectorPropertySerializerTest.cpp
diff --git a/Modules/VectorProperties/CMakeLists.txt b/Modules/VectorProperties/CMakeLists.txt
deleted file mode 100644
index 61e7626cc7..0000000000
--- a/Modules/VectorProperties/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-MITK_CREATE_MODULE(
-  DEPENDS MitkCore MitkSceneSerializationBase
-  PACKAGE_DEPENDS PUBLIC tinyxml
-  WARNINGS_AS_ERRORS
-)
-add_subdirectory(test)
-
diff --git a/Modules/VectorProperties/files.cmake b/Modules/VectorProperties/files.cmake
deleted file mode 100644
index a3eae0a0ff..0000000000
--- a/Modules/VectorProperties/files.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*")
-
-set(CPP_FILES
-  mitkVectorProperty.cpp
-  mitkVectorPropertySerializer.cpp
-)
-
diff --git a/Modules/VectorProperties/test/CMakeLists.txt b/Modules/VectorProperties/test/CMakeLists.txt
deleted file mode 100644
index 9e651d1e89..0000000000
--- a/Modules/VectorProperties/test/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-MITK_CREATE_MODULE_TESTS()
-  
diff --git a/Modules/VectorProperties/test/files.cmake b/Modules/VectorProperties/test/files.cmake
deleted file mode 100644
index 728afb37dc..0000000000
--- a/Modules/VectorProperties/test/files.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-set(MODULE_TESTS
-  mitkVectorPropertyTest.cpp
-  mitkVectorPropertySerializerTest.cpp
-)
-