diff --git a/CADModels/CurvilinearProbe/Probe_C5-2_60.stl b/Models/CurvilinearProbe/Probe_C5-2_60.stl
similarity index 100%
rename from CADModels/CurvilinearProbe/Probe_C5-2_60.stl
rename to Models/CurvilinearProbe/Probe_C5-2_60.stl
diff --git a/CADModels/CurvilinearProbe/Probe_C5-2_60.stp b/Models/CurvilinearProbe/Probe_C5-2_60.stp
similarity index 100%
rename from CADModels/CurvilinearProbe/Probe_C5-2_60.stp
rename to Models/CurvilinearProbe/Probe_C5-2_60.stp
diff --git a/CADModels/CurvilinearProbe/Probe_C5-2_60.x_t b/Models/CurvilinearProbe/Probe_C5-2_60.x_t
similarity index 100%
rename from CADModels/CurvilinearProbe/Probe_C5-2_60.x_t
rename to Models/CurvilinearProbe/Probe_C5-2_60.x_t
diff --git a/CADModels/EndocavityProbe/Probe_EC9-5_10.stl b/Models/EndocavityProbe/Probe_EC9-5_10.stl
similarity index 100%
rename from CADModels/EndocavityProbe/Probe_EC9-5_10.stl
rename to Models/EndocavityProbe/Probe_EC9-5_10.stl
diff --git a/CADModels/FieldGenerator/NDI/Mobile/MobileFieldGenerator.scdoc b/Models/FieldGenerator/NDI/Mobile/MobileFieldGenerator.scdoc
similarity index 100%
rename from CADModels/FieldGenerator/NDI/Mobile/MobileFieldGenerator.scdoc
rename to Models/FieldGenerator/NDI/Mobile/MobileFieldGenerator.scdoc
diff --git a/CADModels/FieldGenerator/NDI/Mobile/MobileFieldGenerator.stl b/Models/FieldGenerator/NDI/Mobile/MobileFieldGenerator.stl
similarity index 100%
rename from CADModels/FieldGenerator/NDI/Mobile/MobileFieldGenerator.stl
rename to Models/FieldGenerator/NDI/Mobile/MobileFieldGenerator.stl
diff --git a/CADModels/LegoPhantom/LegoPhantom.stl b/Models/LegoPhantom/LegoPhantom.stl
similarity index 100%
rename from CADModels/LegoPhantom/LegoPhantom.stl
rename to Models/LegoPhantom/LegoPhantom.stl
diff --git a/CADModels/LegoPhantom/LegoPhantom2.0.stl b/Models/LegoPhantom/LegoPhantom2.0.stl
similarity index 100%
rename from CADModels/LegoPhantom/LegoPhantom2.0.stl
rename to Models/LegoPhantom/LegoPhantom2.0.stl
diff --git a/CADModels/LegoPhantom/LegoPhantom3.1.stl b/Models/LegoPhantom/LegoPhantom3.1.stl
similarity index 100%
rename from CADModels/LegoPhantom/LegoPhantom3.1.stl
rename to Models/LegoPhantom/LegoPhantom3.1.stl
diff --git a/CADModels/LinearProbe/Probe_L14-5_38.stl b/Models/LinearProbe/Probe_L14-5_38.stl
similarity index 100%
rename from CADModels/LinearProbe/Probe_L14-5_38.stl
rename to Models/LinearProbe/Probe_L14-5_38.stl
diff --git a/CADModels/LinearProbe/Probe_L14-5_38_lowres.stl b/Models/LinearProbe/Probe_L14-5_38_lowres.stl
similarity index 100%
rename from CADModels/LinearProbe/Probe_L14-5_38_lowres.stl
rename to Models/LinearProbe/Probe_L14-5_38_lowres.stl
diff --git a/CADModels/NDIRomPatterns/OpticalMarker_3in.stl b/Models/NDIRomPatterns/OpticalMarker_3in.stl
similarity index 100%
rename from CADModels/NDIRomPatterns/OpticalMarker_3in.stl
rename to Models/NDIRomPatterns/OpticalMarker_3in.stl
diff --git a/CADModels/Stylus/NDI/8700248.stl b/Models/Stylus/NDI/8700248.stl
similarity index 100%
rename from CADModels/Stylus/NDI/8700248.stl
rename to Models/Stylus/NDI/8700248.stl
diff --git a/CADModels/Stylus/Stylus_Example.stl b/Models/Stylus/Stylus_Example.stl
similarity index 100%
rename from CADModels/Stylus/Stylus_Example.stl
rename to Models/Stylus/Stylus_Example.stl
diff --git a/CADModels/Stylus/needle_20cm.vtk b/Models/Stylus/needle_20cm.vtk
similarity index 100%
rename from CADModels/Stylus/needle_20cm.vtk
rename to Models/Stylus/needle_20cm.vtk
diff --git a/CADModels/fCalPhantom/fCal_1.0.stl b/Models/fCalPhantom/fCal_1.0.stl
similarity index 100%
rename from CADModels/fCalPhantom/fCal_1.0.stl
rename to Models/fCalPhantom/fCal_1.0.stl
diff --git a/CADModels/fCalPhantom/fCal_1.1.stl b/Models/fCalPhantom/fCal_1.1.stl
similarity index 100%
rename from CADModels/fCalPhantom/fCal_1.1.stl
rename to Models/fCalPhantom/fCal_1.1.stl
diff --git a/CADModels/fCalPhantom/fCal_1.2.stl b/Models/fCalPhantom/fCal_1.2.stl
similarity index 100%
rename from CADModels/fCalPhantom/fCal_1.2.stl
rename to Models/fCalPhantom/fCal_1.2.stl
diff --git a/CADModels/fCalPhantom/fCal_2.0.stl b/Models/fCalPhantom/fCal_2.0.stl
similarity index 100%
rename from CADModels/fCalPhantom/fCal_2.0.stl
rename to Models/fCalPhantom/fCal_2.0.stl
diff --git a/CADModels/fCalPhantom/fCal_3.0.stl b/Models/fCalPhantom/fCal_3.0.stl
similarity index 100%
rename from CADModels/fCalPhantom/fCal_3.0.stl
rename to Models/fCalPhantom/fCal_3.0.stl
diff --git a/CADModels/fCalPhantom/fCal_3.1.stl b/Models/fCalPhantom/fCal_3.1.stl
similarity index 100%
rename from CADModels/fCalPhantom/fCal_3.1.stl
rename to Models/fCalPhantom/fCal_3.1.stl
diff --git a/CADModels/fCalPhantom/fCal_L1.4.stl b/Models/fCalPhantom/fCal_L1.4.stl
similarity index 100%
rename from CADModels/fCalPhantom/fCal_L1.4.stl
rename to Models/fCalPhantom/fCal_L1.4.stl
diff --git a/CADModels/fCalPhantom/fCal_L2.0.stl b/Models/fCalPhantom/fCal_L2.0.stl
similarity index 100%
rename from CADModels/fCalPhantom/fCal_L2.0.stl
rename to Models/fCalPhantom/fCal_L2.0.stl
diff --git a/CADModels/fCalPhantom/fCal_L3.0.stl b/Models/fCalPhantom/fCal_L3.0.stl
similarity index 100%
rename from CADModels/fCalPhantom/fCal_L3.0.stl
rename to Models/fCalPhantom/fCal_L3.0.stl
diff --git a/TestImages/Agilent_Scope_Recording_DP310.nrrd b/Volumes/Agilent_Scope_Recording_DP310.nrrd
similarity index 100%
rename from TestImages/Agilent_Scope_Recording_DP310.nrrd
rename to Volumes/Agilent_Scope_Recording_DP310.nrrd
diff --git a/TestImages/BkCurvilinearRfData.mhd b/Volumes/BkCurvilinearRfData.mhd
similarity index 100%
rename from TestImages/BkCurvilinearRfData.mhd
rename to Volumes/BkCurvilinearRfData.mhd
diff --git a/TestImages/BkCurvilinearRfData.raw b/Volumes/BkCurvilinearRfData.raw
similarity index 100%
rename from TestImages/BkCurvilinearRfData.raw
rename to Volumes/BkCurvilinearRfData.raw
diff --git a/TestImages/BkCurvilinearScanConvertedData.mha b/Volumes/BkCurvilinearScanConvertedData.mha
similarity index 100%
rename from TestImages/BkCurvilinearScanConvertedData.mha
rename to Volumes/BkCurvilinearScanConvertedData.mha
diff --git a/TestImages/BoneUltrasound_L14.mha b/Volumes/BoneUltrasound_L14.mha
similarity index 100%
rename from TestImages/BoneUltrasound_L14.mha
rename to Volumes/BoneUltrasound_L14.mha
diff --git a/TestImages/CIRS_Phantom_TranslationData1_Baseline.xml b/Volumes/CIRS_Phantom_TranslationData1_Baseline.xml
similarity index 100%
rename from TestImages/CIRS_Phantom_TranslationData1_Baseline.xml
rename to Volumes/CIRS_Phantom_TranslationData1_Baseline.xml
diff --git a/TestImages/CIRS_TranslationData1.mha b/Volumes/CIRS_TranslationData1.mha
similarity index 100%
rename from TestImages/CIRS_TranslationData1.mha
rename to Volumes/CIRS_TranslationData1.mha
diff --git a/TestImages/ColorNrrdSample.nrrd b/Volumes/ColorNrrdSample.nrrd
similarity index 100%
rename from TestImages/ColorNrrdSample.nrrd
rename to Volumes/ColorNrrdSample.nrrd
diff --git a/TestImages/EightLandmarkPointsTrackedForPhantomRegistration.mha b/Volumes/EightLandmarkPointsTrackedForPhantomRegistration.mha
similarity index 100%
rename from TestImages/EightLandmarkPointsTrackedForPhantomRegistration.mha
rename to Volumes/EightLandmarkPointsTrackedForPhantomRegistration.mha
diff --git a/TestImages/FacetInPlaneInsertion.mha b/Volumes/FacetInPlaneInsertion.mha
similarity index 100%
rename from TestImages/FacetInPlaneInsertion.mha
rename to Volumes/FacetInPlaneInsertion.mha
diff --git a/TestImages/FcsvReaderTest1.fcsv b/Volumes/FcsvReaderTest1.fcsv
similarity index 100%
rename from TestImages/FcsvReaderTest1.fcsv
rename to Volumes/FcsvReaderTest1.fcsv
diff --git a/TestImages/FreehandCalibration3NWires.results.xml b/Volumes/FreehandCalibration3NWires.results.xml
similarity index 100%
rename from TestImages/FreehandCalibration3NWires.results.xml
rename to Volumes/FreehandCalibration3NWires.results.xml
diff --git a/TestImages/FreehandCalibration3NWires_fCal2.0.results.xml b/Volumes/FreehandCalibration3NWires_fCal2.0.results.xml
similarity index 100%
rename from TestImages/FreehandCalibration3NWires_fCal2.0.results.xml
rename to Volumes/FreehandCalibration3NWires_fCal2.0.results.xml
diff --git a/TestImages/FreehandCalibration3NWires_fCal2.0_Depth15_1.mha b/Volumes/FreehandCalibration3NWires_fCal2.0_Depth15_1.mha
similarity index 100%
rename from TestImages/FreehandCalibration3NWires_fCal2.0_Depth15_1.mha
rename to Volumes/FreehandCalibration3NWires_fCal2.0_Depth15_1.mha
diff --git a/TestImages/FreehandCalibration3NWires_fCal2.0_Depth15_2.mha b/Volumes/FreehandCalibration3NWires_fCal2.0_Depth15_2.mha
similarity index 100%
rename from TestImages/FreehandCalibration3NWires_fCal2.0_Depth15_2.mha
rename to Volumes/FreehandCalibration3NWires_fCal2.0_Depth15_2.mha
diff --git a/TestImages/IPEA_OptimizationMethod_Calibration.results.xml b/Volumes/IPEA_OptimizationMethod_Calibration.results.xml
similarity index 100%
rename from TestImages/IPEA_OptimizationMethod_Calibration.results.xml
rename to Volumes/IPEA_OptimizationMethod_Calibration.results.xml
diff --git a/TestImages/IPEI_OptimizationMethod_Calibration.results.xml b/Volumes/IPEI_OptimizationMethod_Calibration.results.xml
similarity index 100%
rename from TestImages/IPEI_OptimizationMethod_Calibration.results.xml
rename to Volumes/IPEI_OptimizationMethod_Calibration.results.xml
diff --git a/TestImages/ImportanceMask.png b/Volumes/ImportanceMask.png
similarity index 100%
rename from TestImages/ImportanceMask.png
rename to Volumes/ImportanceMask.png
diff --git a/TestImages/ImportanceMaskInput.mha b/Volumes/ImportanceMaskInput.mha
similarity index 100%
rename from TestImages/ImportanceMaskInput.mha
rename to Volumes/ImportanceMaskInput.mha
diff --git a/TestImages/LineSegmentationResultsBaseline.xml b/Volumes/LineSegmentationResultsBaseline.xml
similarity index 100%
rename from TestImages/LineSegmentationResultsBaseline.xml
rename to Volumes/LineSegmentationResultsBaseline.xml
diff --git a/TestImages/Linux/ColorNrrdSample.nrrd b/Volumes/Linux/ColorNrrdSample.nrrd
similarity index 100%
rename from TestImages/Linux/ColorNrrdSample.nrrd
rename to Volumes/Linux/ColorNrrdSample.nrrd
diff --git a/TestImages/Linux/NrrdSample.nrrd b/Volumes/Linux/NrrdSample.nrrd
similarity index 100%
rename from TestImages/Linux/NrrdSample.nrrd
rename to Volumes/Linux/NrrdSample.nrrd
diff --git a/TestImages/MetaImageSequenceIOTest1.mhd b/Volumes/MetaImageSequenceIOTest1.mhd
similarity index 100%
rename from TestImages/MetaImageSequenceIOTest1.mhd
rename to Volumes/MetaImageSequenceIOTest1.mhd
diff --git a/TestImages/MetaImageSequenceIOTest1.zraw b/Volumes/MetaImageSequenceIOTest1.zraw
similarity index 100%
rename from TestImages/MetaImageSequenceIOTest1.zraw
rename to Volumes/MetaImageSequenceIOTest1.zraw
diff --git a/TestImages/Needle_20cm.stl b/Volumes/Needle_20cm.stl
similarity index 100%
rename from TestImages/Needle_20cm.stl
rename to Volumes/Needle_20cm.stl
diff --git a/TestImages/NrrdSample.nrrd b/Volumes/NrrdSample.nrrd
similarity index 100%
rename from TestImages/NrrdSample.nrrd
rename to Volumes/NrrdSample.nrrd
diff --git a/TestImages/NwirePhantomFreehand.mha b/Volumes/NwirePhantomFreehand.mha
similarity index 100%
rename from TestImages/NwirePhantomFreehand.mha
rename to Volumes/NwirePhantomFreehand.mha
diff --git a/TestImages/NwirePhantomFreehandCropped.mha b/Volumes/NwirePhantomFreehandCropped.mha
similarity index 100%
rename from TestImages/NwirePhantomFreehandCropped.mha
rename to Volumes/NwirePhantomFreehandCropped.mha
diff --git a/TestImages/NwirePhantomFreehandReconstructed.mha b/Volumes/NwirePhantomFreehandReconstructed.mha
similarity index 100%
rename from TestImages/NwirePhantomFreehandReconstructed.mha
rename to Volumes/NwirePhantomFreehandReconstructed.mha
diff --git a/TestImages/OPEA_OptimizationMethod_Calibration.results.xml b/Volumes/OPEA_OptimizationMethod_Calibration.results.xml
similarity index 100%
rename from TestImages/OPEA_OptimizationMethod_Calibration.results.xml
rename to Volumes/OPEA_OptimizationMethod_Calibration.results.xml
diff --git a/TestImages/OPEI_OptimizationMethod_Calibration.results.xml b/Volumes/OPEI_OptimizationMethod_Calibration.results.xml
similarity index 100%
rename from TestImages/OPEI_OptimizationMethod_Calibration.results.xml
rename to Volumes/OPEI_OptimizationMethod_Calibration.results.xml
diff --git a/TestImages/PhantomRegistration.results.xml b/Volumes/PhantomRegistration.results.xml
similarity index 100%
rename from TestImages/PhantomRegistration.results.xml
rename to Volumes/PhantomRegistration.results.xml
diff --git a/TestImages/PhantomRegistrationLandmarkDetection.results.xml b/Volumes/PhantomRegistrationLandmarkDetection.results.xml
similarity index 100%
rename from TestImages/PhantomRegistrationLandmarkDetection.results.xml
rename to Volumes/PhantomRegistrationLandmarkDetection.results.xml
diff --git a/TestImages/PlusMathTestData.xml b/Volumes/PlusMathTestData.xml
similarity index 100%
rename from TestImages/PlusMathTestData.xml
rename to Volumes/PlusMathTestData.xml
diff --git a/TestImages/PlusTransverseProcessEnhancerTestData.mha b/Volumes/PlusTransverseProcessEnhancerTestData.mha
similarity index 100%
rename from TestImages/PlusTransverseProcessEnhancerTestData.mha
rename to Volumes/PlusTransverseProcessEnhancerTestData.mha
diff --git a/TestImages/Prostate10_tracker.mha b/Volumes/Prostate10_tracker.mha
similarity index 100%
rename from TestImages/Prostate10_tracker.mha
rename to Volumes/Prostate10_tracker.mha
diff --git a/TestImages/Prostate10_video.mhd b/Volumes/Prostate10_video.mhd
similarity index 100%
rename from TestImages/Prostate10_video.mhd
rename to Volumes/Prostate10_video.mhd
diff --git a/TestImages/Prostate10_video.raw b/Volumes/Prostate10_video.raw
similarity index 100%
rename from TestImages/Prostate10_video.raw
rename to Volumes/Prostate10_video.raw
diff --git a/TestImages/ReferenceToRASCalibration.mha b/Volumes/ReferenceToRASCalibration.mha
similarity index 100%
rename from TestImages/ReferenceToRASCalibration.mha
rename to Volumes/ReferenceToRASCalibration.mha
diff --git a/TestImages/RotationAxisCalibrationData-Ulterius.mha b/Volumes/RotationAxisCalibrationData-Ulterius.mha
similarity index 100%
rename from TestImages/RotationAxisCalibrationData-Ulterius.mha
rename to Volumes/RotationAxisCalibrationData-Ulterius.mha
diff --git a/TestImages/RotationAxisCalibrationData-Ulterius_Baseline.xml b/Volumes/RotationAxisCalibrationData-Ulterius_Baseline.xml
similarity index 100%
rename from TestImages/RotationAxisCalibrationData-Ulterius_Baseline.xml
rename to Volumes/RotationAxisCalibrationData-Ulterius_Baseline.xml
diff --git a/TestImages/SegmentationTest_BKMedical_RandomStepperMotionData2.mha b/Volumes/SegmentationTest_BKMedical_RandomStepperMotionData2.mha
similarity index 100%
rename from TestImages/SegmentationTest_BKMedical_RandomStepperMotionData2.mha
rename to Volumes/SegmentationTest_BKMedical_RandomStepperMotionData2.mha
diff --git a/TestImages/SegmentationTest_BKMedical_RandomStepperMotionData2_Segmentation_baseline.xml b/Volumes/SegmentationTest_BKMedical_RandomStepperMotionData2_Segmentation_baseline.xml
similarity index 100%
rename from TestImages/SegmentationTest_BKMedical_RandomStepperMotionData2_Segmentation_baseline.xml
rename to Volumes/SegmentationTest_BKMedical_RandomStepperMotionData2_Segmentation_baseline.xml
diff --git a/TestImages/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed.mha b/Volumes/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed.mha
similarity index 100%
rename from TestImages/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed.mha
rename to Volumes/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed.mha
diff --git a/TestImages/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed_Anonymized.mha b/Volumes/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed_Anonymized.mha
similarity index 100%
rename from TestImages/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed_Anonymized.mha
rename to Volumes/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed_Anonymized.mha
diff --git a/TestImages/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed_Cropped_FlipX.mha b/Volumes/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed_Cropped_FlipX.mha
similarity index 100%
rename from TestImages/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed_Cropped_FlipX.mha
rename to Volumes/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed_Cropped_FlipX.mha
diff --git a/TestImages/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed_PatientCropped.mha b/Volumes/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed_PatientCropped.mha
similarity index 100%
rename from TestImages/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed_PatientCropped.mha
rename to Volumes/SegmentationTest_BKMedical_RandomStepperMotionData2_Trimmed_PatientCropped.mha
diff --git a/TestImages/SegmentationTest_VLCUS_RandomStepperMotionData2.mha b/Volumes/SegmentationTest_VLCUS_RandomStepperMotionData2.mha
similarity index 100%
rename from TestImages/SegmentationTest_VLCUS_RandomStepperMotionData2.mha
rename to Volumes/SegmentationTest_VLCUS_RandomStepperMotionData2.mha
diff --git a/TestImages/SegmentationTest_VLCUS_RandomStepperMotionData2_Segmentation_baseline.xml b/Volumes/SegmentationTest_VLCUS_RandomStepperMotionData2_Segmentation_baseline.xml
similarity index 100%
rename from TestImages/SegmentationTest_VLCUS_RandomStepperMotionData2_Segmentation_baseline.xml
rename to Volumes/SegmentationTest_VLCUS_RandomStepperMotionData2_Segmentation_baseline.xml
diff --git a/TestImages/ShortTrackedUltrasoundCapture.mha b/Volumes/ShortTrackedUltrasoundCapture.mha
similarity index 100%
rename from TestImages/ShortTrackedUltrasoundCapture.mha
rename to Volumes/ShortTrackedUltrasoundCapture.mha
diff --git a/TestImages/SpatialSensorFusionTestBaseline.mha b/Volumes/SpatialSensorFusionTestBaseline.mha
similarity index 100%
rename from TestImages/SpatialSensorFusionTestBaseline.mha
rename to Volumes/SpatialSensorFusionTestBaseline.mha
diff --git a/TestImages/SpatialSensorFusionTestInput.mha b/Volumes/SpatialSensorFusionTestInput.mha
similarity index 100%
rename from TestImages/SpatialSensorFusionTestInput.mha
rename to Volumes/SpatialSensorFusionTestInput.mha
diff --git a/TestImages/SpinePhantom2Freehand.mha b/Volumes/SpinePhantom2Freehand.mha
similarity index 100%
rename from TestImages/SpinePhantom2Freehand.mha
rename to Volumes/SpinePhantom2Freehand.mha
diff --git a/TestImages/SpinePhantom2Model.stl b/Volumes/SpinePhantom2Model.stl
similarity index 100%
rename from TestImages/SpinePhantom2Model.stl
rename to Volumes/SpinePhantom2Model.stl
diff --git a/TestImages/SpinePhantomFreehand.mha b/Volumes/SpinePhantomFreehand.mha
similarity index 100%
rename from TestImages/SpinePhantomFreehand.mha
rename to Volumes/SpinePhantomFreehand.mha
diff --git a/TestImages/SpinePhantomFreehand3FramesFloat.mha b/Volumes/SpinePhantomFreehand3FramesFloat.mha
similarity index 100%
rename from TestImages/SpinePhantomFreehand3FramesFloat.mha
rename to Volumes/SpinePhantomFreehand3FramesFloat.mha
diff --git a/TestImages/SpinePhantomFreehandReconstructed.mha b/Volumes/SpinePhantomFreehandReconstructed.mha
similarity index 100%
rename from TestImages/SpinePhantomFreehandReconstructed.mha
rename to Volumes/SpinePhantomFreehandReconstructed.mha
diff --git a/TestImages/SpinePhantomPartialSurfaceContact.mha b/Volumes/SpinePhantomPartialSurfaceContact.mha
similarity index 100%
rename from TestImages/SpinePhantomPartialSurfaceContact.mha
rename to Volumes/SpinePhantomPartialSurfaceContact.mha
diff --git a/TestImages/SpinePhantomPartialSurfaceContactWithClipRegionBaseline.mha b/Volumes/SpinePhantomPartialSurfaceContactWithClipRegionBaseline.mha
similarity index 100%
rename from TestImages/SpinePhantomPartialSurfaceContactWithClipRegionBaseline.mha
rename to Volumes/SpinePhantomPartialSurfaceContactWithClipRegionBaseline.mha
diff --git a/TestImages/SpineUltrasound-Lumbar-C5.mha b/Volumes/SpineUltrasound-Lumbar-C5.mha
similarity index 100%
rename from TestImages/SpineUltrasound-Lumbar-C5.mha
rename to Volumes/SpineUltrasound-Lumbar-C5.mha
diff --git a/TestImages/StylusCalibration.results.xml b/Volumes/StylusCalibration.results.xml
similarity index 100%
rename from TestImages/StylusCalibration.results.xml
rename to Volumes/StylusCalibration.results.xml
diff --git a/TestImages/SyntheticTrackerBuffer20.mha b/Volumes/SyntheticTrackerBuffer20.mha
similarity index 100%
rename from TestImages/SyntheticTrackerBuffer20.mha
rename to Volumes/SyntheticTrackerBuffer20.mha
diff --git a/TestImages/SyntheticVideoBuffer20.mha b/Volumes/SyntheticVideoBuffer20.mha
similarity index 100%
rename from TestImages/SyntheticVideoBuffer20.mha
rename to Volumes/SyntheticVideoBuffer20.mha
diff --git a/TestImages/TemporalCalibrationResultsBaseline.xml b/Volumes/TemporalCalibrationResultsBaseline.xml
similarity index 100%
rename from TestImages/TemporalCalibrationResultsBaseline.xml
rename to Volumes/TemporalCalibrationResultsBaseline.xml
diff --git a/TestImages/TimestampFilteringTest.mha b/Volumes/TimestampFilteringTest.mha
similarity index 100%
rename from TestImages/TimestampFilteringTest.mha
rename to Volumes/TimestampFilteringTest.mha
diff --git a/TestImages/TransformInterpolationTest.mha b/Volumes/TransformInterpolationTest.mha
similarity index 100%
rename from TestImages/TransformInterpolationTest.mha
rename to Volumes/TransformInterpolationTest.mha
diff --git a/TestImages/USTC_3NWires_ProbeRotation.mha b/Volumes/USTC_3NWires_ProbeRotation.mha
similarity index 100%
rename from TestImages/USTC_3NWires_ProbeRotation.mha
rename to Volumes/USTC_3NWires_ProbeRotation.mha
diff --git a/TestImages/USTC_3NWires_ProbeTranslation.mha b/Volumes/USTC_3NWires_ProbeTranslation.mha
similarity index 100%
rename from TestImages/USTC_3NWires_ProbeTranslation.mha
rename to Volumes/USTC_3NWires_ProbeTranslation.mha
diff --git a/TestImages/USTC_3NWires_RandomStepperMotionCalibration.mha b/Volumes/USTC_3NWires_RandomStepperMotionCalibration.mha
similarity index 100%
rename from TestImages/USTC_3NWires_RandomStepperMotionCalibration.mha
rename to Volumes/USTC_3NWires_RandomStepperMotionCalibration.mha
diff --git a/TestImages/USTC_3NWires_RandomStepperMotionValidation.mha b/Volumes/USTC_3NWires_RandomStepperMotionValidation.mha
similarity index 100%
rename from TestImages/USTC_3NWires_RandomStepperMotionValidation.mha
rename to Volumes/USTC_3NWires_RandomStepperMotionValidation.mha
diff --git a/TestImages/USTC_3NWires_StepperCalibrationResultBaseline.xml b/Volumes/USTC_3NWires_StepperCalibrationResultBaseline.xml
similarity index 100%
rename from TestImages/USTC_3NWires_StepperCalibrationResultBaseline.xml
rename to Volumes/USTC_3NWires_StepperCalibrationResultBaseline.xml
diff --git a/TestImages/USTC_3NWires_TemplateTranslation.mha b/Volumes/USTC_3NWires_TemplateTranslation.mha
similarity index 100%
rename from TestImages/USTC_3NWires_TemplateTranslation.mha
rename to Volumes/USTC_3NWires_TemplateTranslation.mha
diff --git a/TestImages/USTC_FrameGrabber_ProbeRotationData.mha b/Volumes/USTC_FrameGrabber_ProbeRotationData.mha
similarity index 100%
rename from TestImages/USTC_FrameGrabber_ProbeRotationData.mha
rename to Volumes/USTC_FrameGrabber_ProbeRotationData.mha
diff --git a/TestImages/USTC_FrameGrabber_ProbeRotationData_Segmentation_baseline.xml b/Volumes/USTC_FrameGrabber_ProbeRotationData_Segmentation_baseline.xml
similarity index 100%
rename from TestImages/USTC_FrameGrabber_ProbeRotationData_Segmentation_baseline.xml
rename to Volumes/USTC_FrameGrabber_ProbeRotationData_Segmentation_baseline.xml
diff --git a/TestImages/USTC_FrameGrabber_ProbeTranslationData.mha b/Volumes/USTC_FrameGrabber_ProbeTranslationData.mha
similarity index 100%
rename from TestImages/USTC_FrameGrabber_ProbeTranslationData.mha
rename to Volumes/USTC_FrameGrabber_ProbeTranslationData.mha
diff --git a/TestImages/USTC_FrameGrabber_RandomStepperMotionData1.mha b/Volumes/USTC_FrameGrabber_RandomStepperMotionData1.mha
similarity index 100%
rename from TestImages/USTC_FrameGrabber_RandomStepperMotionData1.mha
rename to Volumes/USTC_FrameGrabber_RandomStepperMotionData1.mha
diff --git a/TestImages/USTC_FrameGrabber_RandomStepperMotionData2.mha b/Volumes/USTC_FrameGrabber_RandomStepperMotionData2.mha
similarity index 100%
rename from TestImages/USTC_FrameGrabber_RandomStepperMotionData2.mha
rename to Volumes/USTC_FrameGrabber_RandomStepperMotionData2.mha
diff --git a/TestImages/USTC_FrameGrabber_StepperCalibrationResultBaseline.xml b/Volumes/USTC_FrameGrabber_StepperCalibrationResultBaseline.xml
similarity index 100%
rename from TestImages/USTC_FrameGrabber_StepperCalibrationResultBaseline.xml
rename to Volumes/USTC_FrameGrabber_StepperCalibrationResultBaseline.xml
diff --git a/TestImages/USTC_FrameGrabber_TemplateTranslationData.mha b/Volumes/USTC_FrameGrabber_TemplateTranslationData.mha
similarity index 100%
rename from TestImages/USTC_FrameGrabber_TemplateTranslationData.mha
rename to Volumes/USTC_FrameGrabber_TemplateTranslationData.mha
diff --git a/TestImages/USTC_Ulterius_ProbeRotationData.mha b/Volumes/USTC_Ulterius_ProbeRotationData.mha
similarity index 100%
rename from TestImages/USTC_Ulterius_ProbeRotationData.mha
rename to Volumes/USTC_Ulterius_ProbeRotationData.mha
diff --git a/TestImages/USTC_Ulterius_ProbeRotationData_Segmentation_baseline.xml b/Volumes/USTC_Ulterius_ProbeRotationData_Segmentation_baseline.xml
similarity index 100%
rename from TestImages/USTC_Ulterius_ProbeRotationData_Segmentation_baseline.xml
rename to Volumes/USTC_Ulterius_ProbeRotationData_Segmentation_baseline.xml
diff --git a/TestImages/USTC_Ulterius_ProbeTranslationData.mha b/Volumes/USTC_Ulterius_ProbeTranslationData.mha
similarity index 100%
rename from TestImages/USTC_Ulterius_ProbeTranslationData.mha
rename to Volumes/USTC_Ulterius_ProbeTranslationData.mha
diff --git a/TestImages/USTC_Ulterius_RandomStepperMotionData1.mha b/Volumes/USTC_Ulterius_RandomStepperMotionData1.mha
similarity index 100%
rename from TestImages/USTC_Ulterius_RandomStepperMotionData1.mha
rename to Volumes/USTC_Ulterius_RandomStepperMotionData1.mha
diff --git a/TestImages/USTC_Ulterius_RandomStepperMotionData2.mha b/Volumes/USTC_Ulterius_RandomStepperMotionData2.mha
similarity index 100%
rename from TestImages/USTC_Ulterius_RandomStepperMotionData2.mha
rename to Volumes/USTC_Ulterius_RandomStepperMotionData2.mha
diff --git a/TestImages/USTC_Ulterius_StepperCalibrationResultBaseline.xml b/Volumes/USTC_Ulterius_StepperCalibrationResultBaseline.xml
similarity index 100%
rename from TestImages/USTC_Ulterius_StepperCalibrationResultBaseline.xml
rename to Volumes/USTC_Ulterius_StepperCalibrationResultBaseline.xml
diff --git a/TestImages/USTC_Ulterius_TemplateTranslationData.mha b/Volumes/USTC_Ulterius_TemplateTranslationData.mha
similarity index 100%
rename from TestImages/USTC_Ulterius_TemplateTranslationData.mha
rename to Volumes/USTC_Ulterius_TemplateTranslationData.mha
diff --git a/TestImages/UltrasonixCurvilinearBrightnessData.mha b/Volumes/UltrasonixCurvilinearBrightnessData.mha
similarity index 100%
rename from TestImages/UltrasonixCurvilinearBrightnessData.mha
rename to Volumes/UltrasonixCurvilinearBrightnessData.mha
diff --git a/TestImages/UltrasonixCurvilinearRfData.mha b/Volumes/UltrasonixCurvilinearRfData.mha
similarity index 100%
rename from TestImages/UltrasonixCurvilinearRfData.mha
rename to Volumes/UltrasonixCurvilinearRfData.mha
diff --git a/TestImages/UltrasonixCurvilinearScanConvertedData.mha b/Volumes/UltrasonixCurvilinearScanConvertedData.mha
similarity index 100%
rename from TestImages/UltrasonixCurvilinearScanConvertedData.mha
rename to Volumes/UltrasonixCurvilinearScanConvertedData.mha
diff --git a/TestImages/UltrasonixCurvilinearScanConvertedDataGroundTruth.mha b/Volumes/UltrasonixCurvilinearScanConvertedDataGroundTruth.mha
similarity index 100%
rename from TestImages/UltrasonixCurvilinearScanConvertedDataGroundTruth.mha
rename to Volumes/UltrasonixCurvilinearScanConvertedDataGroundTruth.mha
diff --git a/TestImages/UltrasonixFrame5Baseline.tiff b/Volumes/UltrasonixFrame5Baseline.tiff
similarity index 100%
rename from TestImages/UltrasonixFrame5Baseline.tiff
rename to Volumes/UltrasonixFrame5Baseline.tiff
diff --git a/TestImages/UltrasonixLinearRfData.mha b/Volumes/UltrasonixLinearRfData.mha
similarity index 100%
rename from TestImages/UltrasonixLinearRfData.mha
rename to Volumes/UltrasonixLinearRfData.mha
diff --git a/TestImages/UltrasonixLinearScanConvertedData.mha b/Volumes/UltrasonixLinearScanConvertedData.mha
similarity index 100%
rename from TestImages/UltrasonixLinearScanConvertedData.mha
rename to Volumes/UltrasonixLinearScanConvertedData.mha
diff --git a/TestImages/UltrasonixVolume.b8 b/Volumes/UltrasonixVolume.b8
similarity index 100%
rename from TestImages/UltrasonixVolume.b8
rename to Volumes/UltrasonixVolume.b8
diff --git a/TestImages/UsSimulatorOutputSpinePhantom2CurvilinearBaseline.mha b/Volumes/UsSimulatorOutputSpinePhantom2CurvilinearBaseline.mha
similarity index 100%
rename from TestImages/UsSimulatorOutputSpinePhantom2CurvilinearBaseline.mha
rename to Volumes/UsSimulatorOutputSpinePhantom2CurvilinearBaseline.mha
diff --git a/TestImages/UsSimulatorOutputSpinePhantom2CurvilinearBaselineNoUS.mha b/Volumes/UsSimulatorOutputSpinePhantom2CurvilinearBaselineNoUS.mha
similarity index 100%
rename from TestImages/UsSimulatorOutputSpinePhantom2CurvilinearBaselineNoUS.mha
rename to Volumes/UsSimulatorOutputSpinePhantom2CurvilinearBaselineNoUS.mha
diff --git a/TestImages/UsSimulatorOutputSpinePhantom2CurvilinearBaselineNoUSCompressed.mha b/Volumes/UsSimulatorOutputSpinePhantom2CurvilinearBaselineNoUSCompressed.mha
similarity index 100%
rename from TestImages/UsSimulatorOutputSpinePhantom2CurvilinearBaselineNoUSCompressed.mha
rename to Volumes/UsSimulatorOutputSpinePhantom2CurvilinearBaselineNoUSCompressed.mha
diff --git a/TestImages/UsSimulatorOutputSpinePhantom2LinearBaseline.mha b/Volumes/UsSimulatorOutputSpinePhantom2LinearBaseline.mha
similarity index 100%
rename from TestImages/UsSimulatorOutputSpinePhantom2LinearBaseline.mha
rename to Volumes/UsSimulatorOutputSpinePhantom2LinearBaseline.mha
diff --git a/TestImages/UsTemplateCalibration.results.xml b/Volumes/UsTemplateCalibration.results.xml
similarity index 100%
rename from TestImages/UsTemplateCalibration.results.xml
rename to Volumes/UsTemplateCalibration.results.xml
diff --git a/TestImages/UsTemplateCalibration_3NWires.results.xml b/Volumes/UsTemplateCalibration_3NWires.results.xml
similarity index 100%
rename from TestImages/UsTemplateCalibration_3NWires.results.xml
rename to Volumes/UsTemplateCalibration_3NWires.results.xml
diff --git a/TestImages/UsTemplateCalibration_FrameGrabber.results.xml b/Volumes/UsTemplateCalibration_FrameGrabber.results.xml
similarity index 100%
rename from TestImages/UsTemplateCalibration_FrameGrabber.results.xml
rename to Volumes/UsTemplateCalibration_FrameGrabber.results.xml
diff --git a/TestImages/UsTestSeqBaselineThomasShortened.mha b/Volumes/UsTestSeqBaselineThomasShortened.mha
similarity index 100%
rename from TestImages/UsTestSeqBaselineThomasShortened.mha
rename to Volumes/UsTestSeqBaselineThomasShortened.mha
diff --git a/TestImages/UsTestSeqBaselineThomasShortened_baseline.xml b/Volumes/UsTestSeqBaselineThomasShortened_baseline.xml
similarity index 100%
rename from TestImages/UsTestSeqBaselineThomasShortened_baseline.xml
rename to Volumes/UsTestSeqBaselineThomasShortened_baseline.xml
diff --git a/TestImages/UsTestSeqIla5ManualFidSeg.fcsv b/Volumes/UsTestSeqIla5ManualFidSeg.fcsv
similarity index 100%
rename from TestImages/UsTestSeqIla5ManualFidSeg.fcsv
rename to Volumes/UsTestSeqIla5ManualFidSeg.fcsv
diff --git a/TestImages/WaterTankBottomTranslationCombined.mha b/Volumes/WaterTankBottomTranslationCombined.mha
similarity index 100%
rename from TestImages/WaterTankBottomTranslationCombined.mha
rename to Volumes/WaterTankBottomTranslationCombined.mha
diff --git a/TestImages/WaterTankBottomTranslationTrackerBuffer-trimmed.mha b/Volumes/WaterTankBottomTranslationTrackerBuffer-trimmed.mha
similarity index 100%
rename from TestImages/WaterTankBottomTranslationTrackerBuffer-trimmed.mha
rename to Volumes/WaterTankBottomTranslationTrackerBuffer-trimmed.mha
diff --git a/TestImages/WaterTankBottomTranslationTrackerBuffer.mha b/Volumes/WaterTankBottomTranslationTrackerBuffer.mha
similarity index 100%
rename from TestImages/WaterTankBottomTranslationTrackerBuffer.mha
rename to Volumes/WaterTankBottomTranslationTrackerBuffer.mha
diff --git a/TestImages/WaterTankBottomTranslationVideoBuffer.mha b/Volumes/WaterTankBottomTranslationVideoBuffer.mha
similarity index 100%
rename from TestImages/WaterTankBottomTranslationVideoBuffer.mha
rename to Volumes/WaterTankBottomTranslationVideoBuffer.mha
diff --git a/TestImages/fCal_Test_Calibration_3NWires.mha b/Volumes/fCal_Test_Calibration_3NWires.mha
similarity index 100%
rename from TestImages/fCal_Test_Calibration_3NWires.mha
rename to Volumes/fCal_Test_Calibration_3NWires.mha
diff --git a/TestImages/fCal_Test_Calibration_3NWires_fCal2.0.mha b/Volumes/fCal_Test_Calibration_3NWires_fCal2.0.mha
similarity index 100%
rename from TestImages/fCal_Test_Calibration_3NWires_fCal2.0.mha
rename to Volumes/fCal_Test_Calibration_3NWires_fCal2.0.mha
diff --git a/TestImages/fCal_Test_Validation_3NWires.mha b/Volumes/fCal_Test_Validation_3NWires.mha
similarity index 100%
rename from TestImages/fCal_Test_Validation_3NWires.mha
rename to Volumes/fCal_Test_Validation_3NWires.mha
diff --git a/TestImages/fCal_Test_Validation_3NWires_fCal2.0.mha b/Volumes/fCal_Test_Validation_3NWires_fCal2.0.mha
similarity index 100%
rename from TestImages/fCal_Test_Validation_3NWires_fCal2.0.mha
rename to Volumes/fCal_Test_Validation_3NWires_fCal2.0.mha
diff --git a/TestImages/iE33_NDIAurora_BeatingHeartPhantom_MitralValveInsertion.mha b/Volumes/iE33_NDIAurora_BeatingHeartPhantom_MitralValveInsertion.mha
similarity index 100%
rename from TestImages/iE33_NDIAurora_BeatingHeartPhantom_MitralValveInsertion.mha
rename to Volumes/iE33_NDIAurora_BeatingHeartPhantom_MitralValveInsertion.mha
diff --git a/TestImages/ie33_NDIAurora_Probe_Stylus_compressed.mha b/Volumes/ie33_NDIAurora_Probe_Stylus_compressed.mha
similarity index 100%
rename from TestImages/ie33_NDIAurora_Probe_Stylus_compressed.mha
rename to Volumes/ie33_NDIAurora_Probe_Stylus_compressed.mha
diff --git a/TestImages/ie33_biplane_LeftCaptureDevice_compressed.mha b/Volumes/ie33_biplane_LeftCaptureDevice_compressed.mha
similarity index 100%
rename from TestImages/ie33_biplane_LeftCaptureDevice_compressed.mha
rename to Volumes/ie33_biplane_LeftCaptureDevice_compressed.mha
diff --git a/TestImages/ie33_biplane_RightCaptureDevice_compressed.mha b/Volumes/ie33_biplane_RightCaptureDevice_compressed.mha
similarity index 100%
rename from TestImages/ie33_biplane_RightCaptureDevice_compressed.mha
rename to Volumes/ie33_biplane_RightCaptureDevice_compressed.mha
diff --git a/TestImages/vtkVolumeReconstructorFloatType1OutputCompare.mha b/Volumes/vtkVolumeReconstructorFloatType1OutputCompare.mha
similarity index 100%
rename from TestImages/vtkVolumeReconstructorFloatType1OutputCompare.mha
rename to Volumes/vtkVolumeReconstructorFloatType1OutputCompare.mha
diff --git a/TestImages/vtkVolumeReconstructorMaximum1OutputCompare.mha b/Volumes/vtkVolumeReconstructorMaximum1OutputCompare.mha
similarity index 100%
rename from TestImages/vtkVolumeReconstructorMaximum1OutputCompare.mha
rename to Volumes/vtkVolumeReconstructorMaximum1OutputCompare.mha
diff --git a/TestImages/vtkVolumeReconstructorTestIMLiFvolumeRef.mha b/Volumes/vtkVolumeReconstructorTestIMLiFvolumeRef.mha
similarity index 100%
rename from TestImages/vtkVolumeReconstructorTestIMLiFvolumeRef.mha
rename to Volumes/vtkVolumeReconstructorTestIMLiFvolumeRef.mha
diff --git a/TestImages/vtkVolumeReconstructorTestIMLiNvolumeRef.mha b/Volumes/vtkVolumeReconstructorTestIMLiNvolumeRef.mha
similarity index 100%
rename from TestImages/vtkVolumeReconstructorTestIMLiNvolumeRef.mha
rename to Volumes/vtkVolumeReconstructorTestIMLiNvolumeRef.mha
diff --git a/TestImages/vtkVolumeReconstructorTestIMLiPvolumeRef.mha b/Volumes/vtkVolumeReconstructorTestIMLiPvolumeRef.mha
similarity index 100%
rename from TestImages/vtkVolumeReconstructorTestIMLiPvolumeRef.mha
rename to Volumes/vtkVolumeReconstructorTestIMLiPvolumeRef.mha
diff --git a/TestImages/vtkVolumeReconstructorTestIMNNFvolumeRef.mha b/Volumes/vtkVolumeReconstructorTestIMNNFvolumeRef.mha
similarity index 100%
rename from TestImages/vtkVolumeReconstructorTestIMNNFvolumeRef.mha
rename to Volumes/vtkVolumeReconstructorTestIMNNFvolumeRef.mha
diff --git a/TestImages/vtkVolumeReconstructorTestIMNNNvolumeRef.mha b/Volumes/vtkVolumeReconstructorTestIMNNNvolumeRef.mha
similarity index 100%
rename from TestImages/vtkVolumeReconstructorTestIMNNNvolumeRef.mha
rename to Volumes/vtkVolumeReconstructorTestIMNNNvolumeRef.mha
diff --git a/TestImages/vtkVolumeReconstructorTestIMNNPvolumeRef.mha b/Volumes/vtkVolumeReconstructorTestIMNNPvolumeRef.mha
similarity index 100%
rename from TestImages/vtkVolumeReconstructorTestIMNNPvolumeRef.mha
rename to Volumes/vtkVolumeReconstructorTestIMNNPvolumeRef.mha
diff --git a/TestImages/vtkVolumeReconstructorTestLNLATEvolumeRef.mha b/Volumes/vtkVolumeReconstructorTestLNLATEvolumeRef.mha
similarity index 100%
rename from TestImages/vtkVolumeReconstructorTestLNLATEvolumeRef.mha
rename to Volumes/vtkVolumeReconstructorTestLNLATEvolumeRef.mha
diff --git a/TestImages/vtkVolumeReconstructorTestLNMAXIvolumeRef.mha b/Volumes/vtkVolumeReconstructorTestLNMAXIvolumeRef.mha
similarity index 100%
rename from TestImages/vtkVolumeReconstructorTestLNMAXIvolumeRef.mha
rename to Volumes/vtkVolumeReconstructorTestLNMAXIvolumeRef.mha
diff --git a/TestImages/vtkVolumeReconstructorTestLNMEANvolumeRef.mha b/Volumes/vtkVolumeReconstructorTestLNMEANvolumeRef.mha
similarity index 100%
rename from TestImages/vtkVolumeReconstructorTestLNMEANvolumeRef.mha
rename to Volumes/vtkVolumeReconstructorTestLNMEANvolumeRef.mha
diff --git a/TestImages/vtkVolumeReconstructorTestNNLATEvolumeRef.mha b/Volumes/vtkVolumeReconstructorTestNNLATEvolumeRef.mha
similarity index 100%
rename from TestImages/vtkVolumeReconstructorTestNNLATEvolumeRef.mha
rename to Volumes/vtkVolumeReconstructorTestNNLATEvolumeRef.mha
diff --git a/TestImages/vtkVolumeReconstructorTestNNMAXIvolumeRef.mha b/Volumes/vtkVolumeReconstructorTestNNMAXIvolumeRef.mha
similarity index 100%
rename from TestImages/vtkVolumeReconstructorTestNNMAXIvolumeRef.mha
rename to Volumes/vtkVolumeReconstructorTestNNMAXIvolumeRef.mha
diff --git a/TestImages/vtkVolumeReconstructorTestNNMEANvolumeRef.mha b/Volumes/vtkVolumeReconstructorTestNNMEANvolumeRef.mha
similarity index 100%
rename from TestImages/vtkVolumeReconstructorTestNNMEANvolumeRef.mha
rename to Volumes/vtkVolumeReconstructorTestNNMEANvolumeRef.mha