diff --git a/AMR/Testing/Cxx/CMakeLists.txt b/AMR/Core/Testing/Cxx/CMakeLists.txt similarity index 100% rename from AMR/Testing/Cxx/CMakeLists.txt rename to AMR/Core/Testing/Cxx/CMakeLists.txt diff --git a/Parallel/Testing/Cxx/TestAMRUtilities.cxx b/AMR/Core/Testing/Cxx/TestAMRUtilities.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestAMRUtilities.cxx rename to AMR/Core/Testing/Cxx/TestAMRUtilities.cxx diff --git a/AMR/Testing/Cxx/TestEnzoReader.cxx b/AMR/Core/Testing/Cxx/TestEnzoReader.cxx similarity index 100% rename from AMR/Testing/Cxx/TestEnzoReader.cxx rename to AMR/Core/Testing/Cxx/TestEnzoReader.cxx diff --git a/AMR/Testing/Cxx/TestFlashReader.cxx b/AMR/Core/Testing/Cxx/TestFlashReader.cxx similarity index 100% rename from AMR/Testing/Cxx/TestFlashReader.cxx rename to AMR/Core/Testing/Cxx/TestFlashReader.cxx diff --git a/AMR/vtkAMRBaseParticlesReader.cxx b/AMR/Core/vtkAMRBaseParticlesReader.cxx similarity index 100% rename from AMR/vtkAMRBaseParticlesReader.cxx rename to AMR/Core/vtkAMRBaseParticlesReader.cxx diff --git a/AMR/vtkAMRBaseParticlesReader.h b/AMR/Core/vtkAMRBaseParticlesReader.h similarity index 100% rename from AMR/vtkAMRBaseParticlesReader.h rename to AMR/Core/vtkAMRBaseParticlesReader.h diff --git a/AMR/vtkAMRBaseReader.cxx b/AMR/Core/vtkAMRBaseReader.cxx similarity index 100% rename from AMR/vtkAMRBaseReader.cxx rename to AMR/Core/vtkAMRBaseReader.cxx diff --git a/AMR/vtkAMRBaseReader.h b/AMR/Core/vtkAMRBaseReader.h similarity index 100% rename from AMR/vtkAMRBaseReader.h rename to AMR/Core/vtkAMRBaseReader.h diff --git a/AMR/vtkAMRCutPlane.cxx b/AMR/Core/vtkAMRCutPlane.cxx similarity index 100% rename from AMR/vtkAMRCutPlane.cxx rename to AMR/Core/vtkAMRCutPlane.cxx diff --git a/AMR/vtkAMRCutPlane.h b/AMR/Core/vtkAMRCutPlane.h similarity index 100% rename from AMR/vtkAMRCutPlane.h rename to AMR/Core/vtkAMRCutPlane.h diff --git a/AMR/vtkAMRDataSetCache.cxx b/AMR/Core/vtkAMRDataSetCache.cxx similarity index 100% rename from AMR/vtkAMRDataSetCache.cxx rename to AMR/Core/vtkAMRDataSetCache.cxx diff --git a/AMR/vtkAMRDataSetCache.h b/AMR/Core/vtkAMRDataSetCache.h similarity index 100% rename from AMR/vtkAMRDataSetCache.h rename to AMR/Core/vtkAMRDataSetCache.h diff --git a/AMR/vtkAMREnzoParticlesReader.cxx b/AMR/Core/vtkAMREnzoParticlesReader.cxx similarity index 100% rename from AMR/vtkAMREnzoParticlesReader.cxx rename to AMR/Core/vtkAMREnzoParticlesReader.cxx diff --git a/AMR/vtkAMREnzoParticlesReader.h b/AMR/Core/vtkAMREnzoParticlesReader.h similarity index 100% rename from AMR/vtkAMREnzoParticlesReader.h rename to AMR/Core/vtkAMREnzoParticlesReader.h diff --git a/AMR/vtkAMREnzoReader.cxx b/AMR/Core/vtkAMREnzoReader.cxx similarity index 100% rename from AMR/vtkAMREnzoReader.cxx rename to AMR/Core/vtkAMREnzoReader.cxx diff --git a/AMR/vtkAMREnzoReader.h b/AMR/Core/vtkAMREnzoReader.h similarity index 100% rename from AMR/vtkAMREnzoReader.h rename to AMR/Core/vtkAMREnzoReader.h diff --git a/AMR/vtkAMREnzoReaderInternal.cxx b/AMR/Core/vtkAMREnzoReaderInternal.cxx similarity index 100% rename from AMR/vtkAMREnzoReaderInternal.cxx rename to AMR/Core/vtkAMREnzoReaderInternal.cxx diff --git a/AMR/vtkAMREnzoReaderInternal.h b/AMR/Core/vtkAMREnzoReaderInternal.h similarity index 100% rename from AMR/vtkAMREnzoReaderInternal.h rename to AMR/Core/vtkAMREnzoReaderInternal.h diff --git a/AMR/vtkAMRFlashParticlesReader.cxx b/AMR/Core/vtkAMRFlashParticlesReader.cxx similarity index 100% rename from AMR/vtkAMRFlashParticlesReader.cxx rename to AMR/Core/vtkAMRFlashParticlesReader.cxx diff --git a/AMR/vtkAMRFlashParticlesReader.h b/AMR/Core/vtkAMRFlashParticlesReader.h similarity index 100% rename from AMR/vtkAMRFlashParticlesReader.h rename to AMR/Core/vtkAMRFlashParticlesReader.h diff --git a/AMR/vtkAMRFlashReader.cxx b/AMR/Core/vtkAMRFlashReader.cxx similarity index 100% rename from AMR/vtkAMRFlashReader.cxx rename to AMR/Core/vtkAMRFlashReader.cxx diff --git a/AMR/vtkAMRFlashReader.h b/AMR/Core/vtkAMRFlashReader.h similarity index 100% rename from AMR/vtkAMRFlashReader.h rename to AMR/Core/vtkAMRFlashReader.h diff --git a/AMR/vtkAMRFlashReaderInternal.cxx b/AMR/Core/vtkAMRFlashReaderInternal.cxx similarity index 100% rename from AMR/vtkAMRFlashReaderInternal.cxx rename to AMR/Core/vtkAMRFlashReaderInternal.cxx diff --git a/AMR/vtkAMRFlashReaderInternal.h b/AMR/Core/vtkAMRFlashReaderInternal.h similarity index 100% rename from AMR/vtkAMRFlashReaderInternal.h rename to AMR/Core/vtkAMRFlashReaderInternal.h diff --git a/AMR/vtkAMRGaussianPulseSource.cxx b/AMR/Core/vtkAMRGaussianPulseSource.cxx similarity index 100% rename from AMR/vtkAMRGaussianPulseSource.cxx rename to AMR/Core/vtkAMRGaussianPulseSource.cxx diff --git a/AMR/vtkAMRGaussianPulseSource.h b/AMR/Core/vtkAMRGaussianPulseSource.h similarity index 100% rename from AMR/vtkAMRGaussianPulseSource.h rename to AMR/Core/vtkAMRGaussianPulseSource.h diff --git a/AMR/vtkAMRResampleFilter.cxx b/AMR/Core/vtkAMRResampleFilter.cxx similarity index 100% rename from AMR/vtkAMRResampleFilter.cxx rename to AMR/Core/vtkAMRResampleFilter.cxx diff --git a/AMR/vtkAMRResampleFilter.h b/AMR/Core/vtkAMRResampleFilter.h similarity index 100% rename from AMR/vtkAMRResampleFilter.h rename to AMR/Core/vtkAMRResampleFilter.h diff --git a/AMR/vtkAMRSliceFilter.cxx b/AMR/Core/vtkAMRSliceFilter.cxx similarity index 100% rename from AMR/vtkAMRSliceFilter.cxx rename to AMR/Core/vtkAMRSliceFilter.cxx diff --git a/AMR/vtkAMRSliceFilter.h b/AMR/Core/vtkAMRSliceFilter.h similarity index 100% rename from AMR/vtkAMRSliceFilter.h rename to AMR/Core/vtkAMRSliceFilter.h diff --git a/AMR/vtkAMRToMultiBlockFilter.cxx b/AMR/Core/vtkAMRToMultiBlockFilter.cxx similarity index 100% rename from AMR/vtkAMRToMultiBlockFilter.cxx rename to AMR/Core/vtkAMRToMultiBlockFilter.cxx diff --git a/AMR/vtkAMRToMultiBlockFilter.h b/AMR/Core/vtkAMRToMultiBlockFilter.h similarity index 100% rename from AMR/vtkAMRToMultiBlockFilter.h rename to AMR/Core/vtkAMRToMultiBlockFilter.h diff --git a/Parallel/vtkAMRUtilities.cxx b/AMR/Core/vtkAMRUtilities.cxx similarity index 100% rename from Parallel/vtkAMRUtilities.cxx rename to AMR/Core/vtkAMRUtilities.cxx diff --git a/Parallel/vtkAMRUtilities.h b/AMR/Core/vtkAMRUtilities.h similarity index 100% rename from Parallel/vtkAMRUtilities.h rename to AMR/Core/vtkAMRUtilities.h diff --git a/VTKConfigVersion.cmake.in b/CMake/VTKConfigVersion.cmake.in similarity index 100% rename from VTKConfigVersion.cmake.in rename to CMake/VTKConfigVersion.cmake.in diff --git a/Parallel/VTKParallelCMakeTests.cmake b/CMake/VTKParallelCMakeTests.cmake similarity index 100% rename from Parallel/VTKParallelCMakeTests.cmake rename to CMake/VTKParallelCMakeTests.cmake diff --git a/Charts/Testing/Cxx/CMakeLists.txt b/Charts/Core/Testing/Cxx/CMakeLists.txt similarity index 100% rename from Charts/Testing/Cxx/CMakeLists.txt rename to Charts/Core/Testing/Cxx/CMakeLists.txt diff --git a/Charts/Testing/Cxx/TestBarGraph.cxx b/Charts/Core/Testing/Cxx/TestBarGraph.cxx similarity index 100% rename from Charts/Testing/Cxx/TestBarGraph.cxx rename to Charts/Core/Testing/Cxx/TestBarGraph.cxx diff --git a/Charts/Testing/Cxx/TestBarGraphHorizontal.cxx b/Charts/Core/Testing/Cxx/TestBarGraphHorizontal.cxx similarity index 100% rename from Charts/Testing/Cxx/TestBarGraphHorizontal.cxx rename to Charts/Core/Testing/Cxx/TestBarGraphHorizontal.cxx diff --git a/Charts/Testing/Cxx/TestChartMatrix.cxx b/Charts/Core/Testing/Cxx/TestChartMatrix.cxx similarity index 100% rename from Charts/Testing/Cxx/TestChartMatrix.cxx rename to Charts/Core/Testing/Cxx/TestChartMatrix.cxx diff --git a/Charts/Testing/Cxx/TestChartXYZ.cxx b/Charts/Core/Testing/Cxx/TestChartXYZ.cxx similarity index 100% rename from Charts/Testing/Cxx/TestChartXYZ.cxx rename to Charts/Core/Testing/Cxx/TestChartXYZ.cxx diff --git a/Charts/Testing/Cxx/TestChartsOn3D.cxx b/Charts/Core/Testing/Cxx/TestChartsOn3D.cxx similarity index 100% rename from Charts/Testing/Cxx/TestChartsOn3D.cxx rename to Charts/Core/Testing/Cxx/TestChartsOn3D.cxx diff --git a/Charts/Testing/Cxx/TestColorTransferFunction.cxx b/Charts/Core/Testing/Cxx/TestColorTransferFunction.cxx similarity index 100% rename from Charts/Testing/Cxx/TestColorTransferFunction.cxx rename to Charts/Core/Testing/Cxx/TestColorTransferFunction.cxx diff --git a/Charts/Testing/Cxx/TestContext.cxx b/Charts/Core/Testing/Cxx/TestContext.cxx similarity index 100% rename from Charts/Testing/Cxx/TestContext.cxx rename to Charts/Core/Testing/Cxx/TestContext.cxx diff --git a/Charts/Testing/Cxx/TestContextImage.cxx b/Charts/Core/Testing/Cxx/TestContextImage.cxx similarity index 100% rename from Charts/Testing/Cxx/TestContextImage.cxx rename to Charts/Core/Testing/Cxx/TestContextImage.cxx diff --git a/Charts/Testing/Cxx/TestContextScene.cxx b/Charts/Core/Testing/Cxx/TestContextScene.cxx similarity index 100% rename from Charts/Testing/Cxx/TestContextScene.cxx rename to Charts/Core/Testing/Cxx/TestContextScene.cxx diff --git a/Charts/Testing/Cxx/TestContextUnicode.cxx b/Charts/Core/Testing/Cxx/TestContextUnicode.cxx similarity index 100% rename from Charts/Testing/Cxx/TestContextUnicode.cxx rename to Charts/Core/Testing/Cxx/TestContextUnicode.cxx diff --git a/Charts/Testing/Cxx/TestControlPointsHandleItem.cxx b/Charts/Core/Testing/Cxx/TestControlPointsHandleItem.cxx similarity index 100% rename from Charts/Testing/Cxx/TestControlPointsHandleItem.cxx rename to Charts/Core/Testing/Cxx/TestControlPointsHandleItem.cxx diff --git a/Charts/Testing/Cxx/TestControlPointsItem.cxx b/Charts/Core/Testing/Cxx/TestControlPointsItem.cxx similarity index 100% rename from Charts/Testing/Cxx/TestControlPointsItem.cxx rename to Charts/Core/Testing/Cxx/TestControlPointsItem.cxx diff --git a/Charts/Testing/Cxx/TestControlPointsItemEvents.cxx b/Charts/Core/Testing/Cxx/TestControlPointsItemEvents.cxx similarity index 100% rename from Charts/Testing/Cxx/TestControlPointsItemEvents.cxx rename to Charts/Core/Testing/Cxx/TestControlPointsItemEvents.cxx diff --git a/Charts/Testing/Cxx/TestDiagram.cxx b/Charts/Core/Testing/Cxx/TestDiagram.cxx similarity index 100% rename from Charts/Testing/Cxx/TestDiagram.cxx rename to Charts/Core/Testing/Cxx/TestDiagram.cxx diff --git a/Charts/Testing/Cxx/TestFreeTypeRender.cxx b/Charts/Core/Testing/Cxx/TestFreeTypeRender.cxx similarity index 100% rename from Charts/Testing/Cxx/TestFreeTypeRender.cxx rename to Charts/Core/Testing/Cxx/TestFreeTypeRender.cxx diff --git a/Charts/Testing/Cxx/TestGLSL.cxx b/Charts/Core/Testing/Cxx/TestGLSL.cxx similarity index 100% rename from Charts/Testing/Cxx/TestGLSL.cxx rename to Charts/Core/Testing/Cxx/TestGLSL.cxx diff --git a/Charts/Testing/Cxx/TestHistogram2D.cxx b/Charts/Core/Testing/Cxx/TestHistogram2D.cxx similarity index 100% rename from Charts/Testing/Cxx/TestHistogram2D.cxx rename to Charts/Core/Testing/Cxx/TestHistogram2D.cxx diff --git a/Charts/Testing/Cxx/TestLegendHiddenPlots.cxx b/Charts/Core/Testing/Cxx/TestLegendHiddenPlots.cxx similarity index 100% rename from Charts/Testing/Cxx/TestLegendHiddenPlots.cxx rename to Charts/Core/Testing/Cxx/TestLegendHiddenPlots.cxx diff --git a/Charts/Testing/Cxx/TestLinePlot.cxx b/Charts/Core/Testing/Cxx/TestLinePlot.cxx similarity index 100% rename from Charts/Testing/Cxx/TestLinePlot.cxx rename to Charts/Core/Testing/Cxx/TestLinePlot.cxx diff --git a/Charts/Testing/Cxx/TestLinePlot2.cxx b/Charts/Core/Testing/Cxx/TestLinePlot2.cxx similarity index 100% rename from Charts/Testing/Cxx/TestLinePlot2.cxx rename to Charts/Core/Testing/Cxx/TestLinePlot2.cxx diff --git a/Charts/Testing/Cxx/TestLinePlotAxisFonts.cxx b/Charts/Core/Testing/Cxx/TestLinePlotAxisFonts.cxx similarity index 100% rename from Charts/Testing/Cxx/TestLinePlotAxisFonts.cxx rename to Charts/Core/Testing/Cxx/TestLinePlotAxisFonts.cxx diff --git a/Charts/Testing/Cxx/TestLinePlotInteraction.cxx b/Charts/Core/Testing/Cxx/TestLinePlotInteraction.cxx similarity index 100% rename from Charts/Testing/Cxx/TestLinePlotInteraction.cxx rename to Charts/Core/Testing/Cxx/TestLinePlotInteraction.cxx diff --git a/Charts/Testing/Cxx/TestMultipleChartRenderers.cxx b/Charts/Core/Testing/Cxx/TestMultipleChartRenderers.cxx similarity index 100% rename from Charts/Testing/Cxx/TestMultipleChartRenderers.cxx rename to Charts/Core/Testing/Cxx/TestMultipleChartRenderers.cxx diff --git a/Charts/Testing/Cxx/TestMultipleRenderers.cxx b/Charts/Core/Testing/Cxx/TestMultipleRenderers.cxx similarity index 100% rename from Charts/Testing/Cxx/TestMultipleRenderers.cxx rename to Charts/Core/Testing/Cxx/TestMultipleRenderers.cxx diff --git a/Charts/Testing/Cxx/TestMultipleScalarsToColors.cxx b/Charts/Core/Testing/Cxx/TestMultipleScalarsToColors.cxx similarity index 100% rename from Charts/Testing/Cxx/TestMultipleScalarsToColors.cxx rename to Charts/Core/Testing/Cxx/TestMultipleScalarsToColors.cxx diff --git a/Charts/Testing/Cxx/TestParallelCoordinates.cxx b/Charts/Core/Testing/Cxx/TestParallelCoordinates.cxx similarity index 100% rename from Charts/Testing/Cxx/TestParallelCoordinates.cxx rename to Charts/Core/Testing/Cxx/TestParallelCoordinates.cxx diff --git a/Charts/Testing/Cxx/TestPieChart.cxx b/Charts/Core/Testing/Cxx/TestPieChart.cxx similarity index 100% rename from Charts/Testing/Cxx/TestPieChart.cxx rename to Charts/Core/Testing/Cxx/TestPieChart.cxx diff --git a/Charts/Testing/Cxx/TestPlotMatrix.cxx b/Charts/Core/Testing/Cxx/TestPlotMatrix.cxx similarity index 100% rename from Charts/Testing/Cxx/TestPlotMatrix.cxx rename to Charts/Core/Testing/Cxx/TestPlotMatrix.cxx diff --git a/Charts/Testing/Cxx/TestQtContextUnicode.cxx b/Charts/Core/Testing/Cxx/TestQtContextUnicode.cxx similarity index 100% rename from Charts/Testing/Cxx/TestQtContextUnicode.cxx rename to Charts/Core/Testing/Cxx/TestQtContextUnicode.cxx diff --git a/Charts/Testing/Cxx/TestQtDiagram.cxx b/Charts/Core/Testing/Cxx/TestQtDiagram.cxx similarity index 100% rename from Charts/Testing/Cxx/TestQtDiagram.cxx rename to Charts/Core/Testing/Cxx/TestQtDiagram.cxx diff --git a/Charts/Testing/Cxx/TestScalarsToColors.cxx b/Charts/Core/Testing/Cxx/TestScalarsToColors.cxx similarity index 100% rename from Charts/Testing/Cxx/TestScalarsToColors.cxx rename to Charts/Core/Testing/Cxx/TestScalarsToColors.cxx diff --git a/Charts/Testing/Cxx/TestScatterPlot.cxx b/Charts/Core/Testing/Cxx/TestScatterPlot.cxx similarity index 100% rename from Charts/Testing/Cxx/TestScatterPlot.cxx rename to Charts/Core/Testing/Cxx/TestScatterPlot.cxx diff --git a/Charts/Testing/Cxx/TestScatterPlotMatrix.cxx b/Charts/Core/Testing/Cxx/TestScatterPlotMatrix.cxx similarity index 100% rename from Charts/Testing/Cxx/TestScatterPlotMatrix.cxx rename to Charts/Core/Testing/Cxx/TestScatterPlotMatrix.cxx diff --git a/Charts/Testing/Cxx/TestScatterPlotMatrixVehicles.cxx b/Charts/Core/Testing/Cxx/TestScatterPlotMatrixVehicles.cxx similarity index 100% rename from Charts/Testing/Cxx/TestScatterPlotMatrixVehicles.cxx rename to Charts/Core/Testing/Cxx/TestScatterPlotMatrixVehicles.cxx diff --git a/Charts/Testing/Cxx/TestScatterPlotMatrixVisible.cxx b/Charts/Core/Testing/Cxx/TestScatterPlotMatrixVisible.cxx similarity index 100% rename from Charts/Testing/Cxx/TestScatterPlotMatrixVisible.cxx rename to Charts/Core/Testing/Cxx/TestScatterPlotMatrixVisible.cxx diff --git a/Charts/Testing/Cxx/TestScientificPlot.cxx b/Charts/Core/Testing/Cxx/TestScientificPlot.cxx similarity index 100% rename from Charts/Testing/Cxx/TestScientificPlot.cxx rename to Charts/Core/Testing/Cxx/TestScientificPlot.cxx diff --git a/Charts/Testing/Cxx/TestStackedBarGraph.cxx b/Charts/Core/Testing/Cxx/TestStackedBarGraph.cxx similarity index 100% rename from Charts/Testing/Cxx/TestStackedBarGraph.cxx rename to Charts/Core/Testing/Cxx/TestStackedBarGraph.cxx diff --git a/Charts/Testing/Cxx/TestStackedPlot.cxx b/Charts/Core/Testing/Cxx/TestStackedPlot.cxx similarity index 100% rename from Charts/Testing/Cxx/TestStackedPlot.cxx rename to Charts/Core/Testing/Cxx/TestStackedPlot.cxx diff --git a/Charts/Testing/Python/TestBarGraph.py b/Charts/Core/Testing/Python/TestBarGraph.py similarity index 100% rename from Charts/Testing/Python/TestBarGraph.py rename to Charts/Core/Testing/Python/TestBarGraph.py diff --git a/Charts/Testing/Python/TestLinePlot.py b/Charts/Core/Testing/Python/TestLinePlot.py similarity index 100% rename from Charts/Testing/Python/TestLinePlot.py rename to Charts/Core/Testing/Python/TestLinePlot.py diff --git a/Charts/Testing/Python/TestLinePlotColors.py b/Charts/Core/Testing/Python/TestLinePlotColors.py similarity index 100% rename from Charts/Testing/Python/TestLinePlotColors.py rename to Charts/Core/Testing/Python/TestLinePlotColors.py diff --git a/Charts/Testing/Python/TestParallelCoordinatesColors.py b/Charts/Core/Testing/Python/TestParallelCoordinatesColors.py similarity index 100% rename from Charts/Testing/Python/TestParallelCoordinatesColors.py rename to Charts/Core/Testing/Python/TestParallelCoordinatesColors.py diff --git a/Charts/Testing/Python/TestScatterPlotColors.py b/Charts/Core/Testing/Python/TestScatterPlotColors.py similarity index 100% rename from Charts/Testing/Python/TestScatterPlotColors.py rename to Charts/Core/Testing/Python/TestScatterPlotColors.py diff --git a/Charts/Testing/Python/TestStackedPlot.py b/Charts/Core/Testing/Python/TestStackedPlot.py similarity index 100% rename from Charts/Testing/Python/TestStackedPlot.py rename to Charts/Core/Testing/Python/TestStackedPlot.py diff --git a/Charts/vtkAxis.cxx b/Charts/Core/vtkAxis.cxx similarity index 100% rename from Charts/vtkAxis.cxx rename to Charts/Core/vtkAxis.cxx diff --git a/Charts/vtkAxis.h b/Charts/Core/vtkAxis.h similarity index 100% rename from Charts/vtkAxis.h rename to Charts/Core/vtkAxis.h diff --git a/Charts/vtkAxisExtended.cxx b/Charts/Core/vtkAxisExtended.cxx similarity index 100% rename from Charts/vtkAxisExtended.cxx rename to Charts/Core/vtkAxisExtended.cxx diff --git a/Charts/vtkAxisExtended.h b/Charts/Core/vtkAxisExtended.h similarity index 100% rename from Charts/vtkAxisExtended.h rename to Charts/Core/vtkAxisExtended.h diff --git a/Charts/vtkChart.cxx b/Charts/Core/vtkChart.cxx similarity index 100% rename from Charts/vtkChart.cxx rename to Charts/Core/vtkChart.cxx diff --git a/Charts/vtkChart.h b/Charts/Core/vtkChart.h similarity index 100% rename from Charts/vtkChart.h rename to Charts/Core/vtkChart.h diff --git a/Charts/vtkChartHistogram2D.cxx b/Charts/Core/vtkChartHistogram2D.cxx similarity index 100% rename from Charts/vtkChartHistogram2D.cxx rename to Charts/Core/vtkChartHistogram2D.cxx diff --git a/Charts/vtkChartHistogram2D.h b/Charts/Core/vtkChartHistogram2D.h similarity index 100% rename from Charts/vtkChartHistogram2D.h rename to Charts/Core/vtkChartHistogram2D.h diff --git a/Charts/vtkChartLegend.cxx b/Charts/Core/vtkChartLegend.cxx similarity index 100% rename from Charts/vtkChartLegend.cxx rename to Charts/Core/vtkChartLegend.cxx diff --git a/Charts/vtkChartLegend.h b/Charts/Core/vtkChartLegend.h similarity index 100% rename from Charts/vtkChartLegend.h rename to Charts/Core/vtkChartLegend.h diff --git a/Charts/vtkChartMatrix.cxx b/Charts/Core/vtkChartMatrix.cxx similarity index 100% rename from Charts/vtkChartMatrix.cxx rename to Charts/Core/vtkChartMatrix.cxx diff --git a/Charts/vtkChartMatrix.h b/Charts/Core/vtkChartMatrix.h similarity index 100% rename from Charts/vtkChartMatrix.h rename to Charts/Core/vtkChartMatrix.h diff --git a/Charts/vtkChartParallelCoordinates.cxx b/Charts/Core/vtkChartParallelCoordinates.cxx similarity index 100% rename from Charts/vtkChartParallelCoordinates.cxx rename to Charts/Core/vtkChartParallelCoordinates.cxx diff --git a/Charts/vtkChartParallelCoordinates.h b/Charts/Core/vtkChartParallelCoordinates.h similarity index 100% rename from Charts/vtkChartParallelCoordinates.h rename to Charts/Core/vtkChartParallelCoordinates.h diff --git a/Charts/vtkChartPie.cxx b/Charts/Core/vtkChartPie.cxx similarity index 100% rename from Charts/vtkChartPie.cxx rename to Charts/Core/vtkChartPie.cxx diff --git a/Charts/vtkChartPie.h b/Charts/Core/vtkChartPie.h similarity index 100% rename from Charts/vtkChartPie.h rename to Charts/Core/vtkChartPie.h diff --git a/Charts/vtkChartXY.cxx b/Charts/Core/vtkChartXY.cxx similarity index 100% rename from Charts/vtkChartXY.cxx rename to Charts/Core/vtkChartXY.cxx diff --git a/Charts/vtkChartXY.h b/Charts/Core/vtkChartXY.h similarity index 100% rename from Charts/vtkChartXY.h rename to Charts/Core/vtkChartXY.h diff --git a/Charts/vtkChartXYZ.cxx b/Charts/Core/vtkChartXYZ.cxx similarity index 100% rename from Charts/vtkChartXYZ.cxx rename to Charts/Core/vtkChartXYZ.cxx diff --git a/Charts/vtkChartXYZ.h b/Charts/Core/vtkChartXYZ.h similarity index 100% rename from Charts/vtkChartXYZ.h rename to Charts/Core/vtkChartXYZ.h diff --git a/Charts/vtkColorLegend.cxx b/Charts/Core/vtkColorLegend.cxx similarity index 100% rename from Charts/vtkColorLegend.cxx rename to Charts/Core/vtkColorLegend.cxx diff --git a/Charts/vtkColorLegend.h b/Charts/Core/vtkColorLegend.h similarity index 100% rename from Charts/vtkColorLegend.h rename to Charts/Core/vtkColorLegend.h diff --git a/Charts/vtkColorSeries.cxx b/Charts/Core/vtkColorSeries.cxx similarity index 100% rename from Charts/vtkColorSeries.cxx rename to Charts/Core/vtkColorSeries.cxx diff --git a/Charts/vtkColorSeries.h b/Charts/Core/vtkColorSeries.h similarity index 100% rename from Charts/vtkColorSeries.h rename to Charts/Core/vtkColorSeries.h diff --git a/Charts/vtkColorTransferControlPointsItem.cxx b/Charts/Core/vtkColorTransferControlPointsItem.cxx similarity index 100% rename from Charts/vtkColorTransferControlPointsItem.cxx rename to Charts/Core/vtkColorTransferControlPointsItem.cxx diff --git a/Charts/vtkColorTransferControlPointsItem.h b/Charts/Core/vtkColorTransferControlPointsItem.h similarity index 100% rename from Charts/vtkColorTransferControlPointsItem.h rename to Charts/Core/vtkColorTransferControlPointsItem.h diff --git a/Charts/vtkColorTransferFunctionItem.cxx b/Charts/Core/vtkColorTransferFunctionItem.cxx similarity index 100% rename from Charts/vtkColorTransferFunctionItem.cxx rename to Charts/Core/vtkColorTransferFunctionItem.cxx diff --git a/Charts/vtkColorTransferFunctionItem.h b/Charts/Core/vtkColorTransferFunctionItem.h similarity index 100% rename from Charts/vtkColorTransferFunctionItem.h rename to Charts/Core/vtkColorTransferFunctionItem.h diff --git a/Charts/vtkCompositeControlPointsItem.cxx b/Charts/Core/vtkCompositeControlPointsItem.cxx similarity index 100% rename from Charts/vtkCompositeControlPointsItem.cxx rename to Charts/Core/vtkCompositeControlPointsItem.cxx diff --git a/Charts/vtkCompositeControlPointsItem.h b/Charts/Core/vtkCompositeControlPointsItem.h similarity index 100% rename from Charts/vtkCompositeControlPointsItem.h rename to Charts/Core/vtkCompositeControlPointsItem.h diff --git a/Charts/vtkCompositeTransferFunctionItem.cxx b/Charts/Core/vtkCompositeTransferFunctionItem.cxx similarity index 100% rename from Charts/vtkCompositeTransferFunctionItem.cxx rename to Charts/Core/vtkCompositeTransferFunctionItem.cxx diff --git a/Charts/vtkCompositeTransferFunctionItem.h b/Charts/Core/vtkCompositeTransferFunctionItem.h similarity index 100% rename from Charts/vtkCompositeTransferFunctionItem.h rename to Charts/Core/vtkCompositeTransferFunctionItem.h diff --git a/Charts/vtkControlPointsItem.cxx b/Charts/Core/vtkControlPointsItem.cxx similarity index 100% rename from Charts/vtkControlPointsItem.cxx rename to Charts/Core/vtkControlPointsItem.cxx diff --git a/Charts/vtkControlPointsItem.h b/Charts/Core/vtkControlPointsItem.h similarity index 100% rename from Charts/vtkControlPointsItem.h rename to Charts/Core/vtkControlPointsItem.h diff --git a/Charts/vtkLookupTableItem.cxx b/Charts/Core/vtkLookupTableItem.cxx similarity index 100% rename from Charts/vtkLookupTableItem.cxx rename to Charts/Core/vtkLookupTableItem.cxx diff --git a/Charts/vtkLookupTableItem.h b/Charts/Core/vtkLookupTableItem.h similarity index 100% rename from Charts/vtkLookupTableItem.h rename to Charts/Core/vtkLookupTableItem.h diff --git a/Charts/vtkPiecewiseControlPointsItem.cxx b/Charts/Core/vtkPiecewiseControlPointsItem.cxx similarity index 100% rename from Charts/vtkPiecewiseControlPointsItem.cxx rename to Charts/Core/vtkPiecewiseControlPointsItem.cxx diff --git a/Charts/vtkPiecewiseControlPointsItem.h b/Charts/Core/vtkPiecewiseControlPointsItem.h similarity index 100% rename from Charts/vtkPiecewiseControlPointsItem.h rename to Charts/Core/vtkPiecewiseControlPointsItem.h diff --git a/Charts/vtkPiecewiseFunctionItem.cxx b/Charts/Core/vtkPiecewiseFunctionItem.cxx similarity index 100% rename from Charts/vtkPiecewiseFunctionItem.cxx rename to Charts/Core/vtkPiecewiseFunctionItem.cxx diff --git a/Charts/vtkPiecewiseFunctionItem.h b/Charts/Core/vtkPiecewiseFunctionItem.h similarity index 100% rename from Charts/vtkPiecewiseFunctionItem.h rename to Charts/Core/vtkPiecewiseFunctionItem.h diff --git a/Charts/vtkPiecewisePointHandleItem.cxx b/Charts/Core/vtkPiecewisePointHandleItem.cxx similarity index 100% rename from Charts/vtkPiecewisePointHandleItem.cxx rename to Charts/Core/vtkPiecewisePointHandleItem.cxx diff --git a/Charts/vtkPiecewisePointHandleItem.h b/Charts/Core/vtkPiecewisePointHandleItem.h similarity index 100% rename from Charts/vtkPiecewisePointHandleItem.h rename to Charts/Core/vtkPiecewisePointHandleItem.h diff --git a/Charts/vtkPlot.cxx b/Charts/Core/vtkPlot.cxx similarity index 100% rename from Charts/vtkPlot.cxx rename to Charts/Core/vtkPlot.cxx diff --git a/Charts/vtkPlot.h b/Charts/Core/vtkPlot.h similarity index 100% rename from Charts/vtkPlot.h rename to Charts/Core/vtkPlot.h diff --git a/Charts/vtkPlotBar.cxx b/Charts/Core/vtkPlotBar.cxx similarity index 100% rename from Charts/vtkPlotBar.cxx rename to Charts/Core/vtkPlotBar.cxx diff --git a/Charts/vtkPlotBar.h b/Charts/Core/vtkPlotBar.h similarity index 100% rename from Charts/vtkPlotBar.h rename to Charts/Core/vtkPlotBar.h diff --git a/Charts/vtkPlotGrid.cxx b/Charts/Core/vtkPlotGrid.cxx similarity index 100% rename from Charts/vtkPlotGrid.cxx rename to Charts/Core/vtkPlotGrid.cxx diff --git a/Charts/vtkPlotGrid.h b/Charts/Core/vtkPlotGrid.h similarity index 100% rename from Charts/vtkPlotGrid.h rename to Charts/Core/vtkPlotGrid.h diff --git a/Charts/vtkPlotHistogram2D.cxx b/Charts/Core/vtkPlotHistogram2D.cxx similarity index 100% rename from Charts/vtkPlotHistogram2D.cxx rename to Charts/Core/vtkPlotHistogram2D.cxx diff --git a/Charts/vtkPlotHistogram2D.h b/Charts/Core/vtkPlotHistogram2D.h similarity index 100% rename from Charts/vtkPlotHistogram2D.h rename to Charts/Core/vtkPlotHistogram2D.h diff --git a/Charts/vtkPlotLine.cxx b/Charts/Core/vtkPlotLine.cxx similarity index 100% rename from Charts/vtkPlotLine.cxx rename to Charts/Core/vtkPlotLine.cxx diff --git a/Charts/vtkPlotLine.h b/Charts/Core/vtkPlotLine.h similarity index 100% rename from Charts/vtkPlotLine.h rename to Charts/Core/vtkPlotLine.h diff --git a/Charts/vtkPlotParallelCoordinates.cxx b/Charts/Core/vtkPlotParallelCoordinates.cxx similarity index 100% rename from Charts/vtkPlotParallelCoordinates.cxx rename to Charts/Core/vtkPlotParallelCoordinates.cxx diff --git a/Charts/vtkPlotParallelCoordinates.h b/Charts/Core/vtkPlotParallelCoordinates.h similarity index 100% rename from Charts/vtkPlotParallelCoordinates.h rename to Charts/Core/vtkPlotParallelCoordinates.h diff --git a/Charts/vtkPlotPie.cxx b/Charts/Core/vtkPlotPie.cxx similarity index 100% rename from Charts/vtkPlotPie.cxx rename to Charts/Core/vtkPlotPie.cxx diff --git a/Charts/vtkPlotPie.h b/Charts/Core/vtkPlotPie.h similarity index 100% rename from Charts/vtkPlotPie.h rename to Charts/Core/vtkPlotPie.h diff --git a/Charts/vtkPlotPoints.cxx b/Charts/Core/vtkPlotPoints.cxx similarity index 100% rename from Charts/vtkPlotPoints.cxx rename to Charts/Core/vtkPlotPoints.cxx diff --git a/Charts/vtkPlotPoints.h b/Charts/Core/vtkPlotPoints.h similarity index 100% rename from Charts/vtkPlotPoints.h rename to Charts/Core/vtkPlotPoints.h diff --git a/Charts/vtkPlotStacked.cxx b/Charts/Core/vtkPlotStacked.cxx similarity index 100% rename from Charts/vtkPlotStacked.cxx rename to Charts/Core/vtkPlotStacked.cxx diff --git a/Charts/vtkPlotStacked.h b/Charts/Core/vtkPlotStacked.h similarity index 100% rename from Charts/vtkPlotStacked.h rename to Charts/Core/vtkPlotStacked.h diff --git a/Charts/vtkScalarsToColorsItem.cxx b/Charts/Core/vtkScalarsToColorsItem.cxx similarity index 100% rename from Charts/vtkScalarsToColorsItem.cxx rename to Charts/Core/vtkScalarsToColorsItem.cxx diff --git a/Charts/vtkScalarsToColorsItem.h b/Charts/Core/vtkScalarsToColorsItem.h similarity index 100% rename from Charts/vtkScalarsToColorsItem.h rename to Charts/Core/vtkScalarsToColorsItem.h diff --git a/Charts/vtkScatterPlotMatrix.cxx b/Charts/Core/vtkScatterPlotMatrix.cxx similarity index 100% rename from Charts/vtkScatterPlotMatrix.cxx rename to Charts/Core/vtkScatterPlotMatrix.cxx diff --git a/Charts/vtkScatterPlotMatrix.h b/Charts/Core/vtkScatterPlotMatrix.h similarity index 100% rename from Charts/vtkScatterPlotMatrix.h rename to Charts/Core/vtkScatterPlotMatrix.h diff --git a/Chemistry/CMakeLists.txt b/Chemistry/Core/CMakeLists.txt similarity index 100% rename from Chemistry/CMakeLists.txt rename to Chemistry/Core/CMakeLists.txt diff --git a/Chemistry/vtkBODRData/COPYING b/Chemistry/Core/COPYING similarity index 100% rename from Chemistry/vtkBODRData/COPYING rename to Chemistry/Core/COPYING diff --git a/Chemistry/Testing/Cxx/TestBallAndStick.cxx b/Chemistry/Core/Testing/Cxx/TestBallAndStick.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestBallAndStick.cxx rename to Chemistry/Core/Testing/Cxx/TestBallAndStick.cxx diff --git a/Chemistry/Testing/Cxx/TestBondColorModeDiscreteByAtom.cxx b/Chemistry/Core/Testing/Cxx/TestBondColorModeDiscreteByAtom.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestBondColorModeDiscreteByAtom.cxx rename to Chemistry/Core/Testing/Cxx/TestBondColorModeDiscreteByAtom.cxx diff --git a/Chemistry/Testing/Cxx/TestBondColorModeSingleColor.cxx b/Chemistry/Core/Testing/Cxx/TestBondColorModeSingleColor.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestBondColorModeSingleColor.cxx rename to Chemistry/Core/Testing/Cxx/TestBondColorModeSingleColor.cxx diff --git a/Chemistry/Testing/Cxx/TestCMLMoleculeReader.cxx b/Chemistry/Core/Testing/Cxx/TestCMLMoleculeReader.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestCMLMoleculeReader.cxx rename to Chemistry/Core/Testing/Cxx/TestCMLMoleculeReader.cxx diff --git a/Chemistry/Testing/Cxx/TestCompositeRender.cxx b/Chemistry/Core/Testing/Cxx/TestCompositeRender.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestCompositeRender.cxx rename to Chemistry/Core/Testing/Cxx/TestCompositeRender.cxx diff --git a/Chemistry/Testing/Cxx/TestFastRender.cxx b/Chemistry/Core/Testing/Cxx/TestFastRender.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestFastRender.cxx rename to Chemistry/Core/Testing/Cxx/TestFastRender.cxx diff --git a/Chemistry/Testing/Cxx/TestLiquoriceSticks.cxx b/Chemistry/Core/Testing/Cxx/TestLiquoriceSticks.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestLiquoriceSticks.cxx rename to Chemistry/Core/Testing/Cxx/TestLiquoriceSticks.cxx diff --git a/Chemistry/Testing/Cxx/TestMolecule.cxx b/Chemistry/Core/Testing/Cxx/TestMolecule.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestMolecule.cxx rename to Chemistry/Core/Testing/Cxx/TestMolecule.cxx diff --git a/Chemistry/Testing/Cxx/TestMoleculeSelection.cxx b/Chemistry/Core/Testing/Cxx/TestMoleculeSelection.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestMoleculeSelection.cxx rename to Chemistry/Core/Testing/Cxx/TestMoleculeSelection.cxx diff --git a/Chemistry/Testing/Cxx/TestMultiCylinderOff.cxx b/Chemistry/Core/Testing/Cxx/TestMultiCylinderOff.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestMultiCylinderOff.cxx rename to Chemistry/Core/Testing/Cxx/TestMultiCylinderOff.cxx diff --git a/Chemistry/Testing/Cxx/TestMultiCylinderOn.cxx b/Chemistry/Core/Testing/Cxx/TestMultiCylinderOn.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestMultiCylinderOn.cxx rename to Chemistry/Core/Testing/Cxx/TestMultiCylinderOn.cxx diff --git a/Chemistry/Testing/Cxx/TestOpenQubeElectronicData.cxx b/Chemistry/Core/Testing/Cxx/TestOpenQubeElectronicData.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestOpenQubeElectronicData.cxx rename to Chemistry/Core/Testing/Cxx/TestOpenQubeElectronicData.cxx diff --git a/Chemistry/Testing/Cxx/TestOpenQubeMOPACDensity.cxx b/Chemistry/Core/Testing/Cxx/TestOpenQubeMOPACDensity.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestOpenQubeMOPACDensity.cxx rename to Chemistry/Core/Testing/Cxx/TestOpenQubeMOPACDensity.cxx diff --git a/Chemistry/Testing/Cxx/TestOpenQubeMOPACOrbital.cxx b/Chemistry/Core/Testing/Cxx/TestOpenQubeMOPACOrbital.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestOpenQubeMOPACOrbital.cxx rename to Chemistry/Core/Testing/Cxx/TestOpenQubeMOPACOrbital.cxx diff --git a/Chemistry/Testing/Cxx/TestPeriodicTable.cxx b/Chemistry/Core/Testing/Cxx/TestPeriodicTable.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestPeriodicTable.cxx rename to Chemistry/Core/Testing/Cxx/TestPeriodicTable.cxx diff --git a/Chemistry/Testing/Cxx/TestProgrammableElectronicData.cxx b/Chemistry/Core/Testing/Cxx/TestProgrammableElectronicData.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestProgrammableElectronicData.cxx rename to Chemistry/Core/Testing/Cxx/TestProgrammableElectronicData.cxx diff --git a/Chemistry/Testing/Cxx/TestSimpleBondPerceiver.cxx b/Chemistry/Core/Testing/Cxx/TestSimpleBondPerceiver.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestSimpleBondPerceiver.cxx rename to Chemistry/Core/Testing/Cxx/TestSimpleBondPerceiver.cxx diff --git a/Chemistry/Testing/Cxx/TestVDWSpheres.cxx b/Chemistry/Core/Testing/Cxx/TestVDWSpheres.cxx similarity index 100% rename from Chemistry/Testing/Cxx/TestVDWSpheres.cxx rename to Chemistry/Core/Testing/Cxx/TestVDWSpheres.cxx diff --git a/Chemistry/vtkBODRData/elements.xml b/Chemistry/Core/elements.xml similarity index 100% rename from Chemistry/vtkBODRData/elements.xml rename to Chemistry/Core/elements.xml diff --git a/Chemistry/vtkBlueObeliskData.cxx b/Chemistry/Core/vtkBlueObeliskData.cxx similarity index 100% rename from Chemistry/vtkBlueObeliskData.cxx rename to Chemistry/Core/vtkBlueObeliskData.cxx diff --git a/Chemistry/vtkBlueObeliskData.h b/Chemistry/Core/vtkBlueObeliskData.h similarity index 100% rename from Chemistry/vtkBlueObeliskData.h rename to Chemistry/Core/vtkBlueObeliskData.h diff --git a/Chemistry/vtkBlueObeliskDataParser.cxx b/Chemistry/Core/vtkBlueObeliskDataParser.cxx similarity index 100% rename from Chemistry/vtkBlueObeliskDataParser.cxx rename to Chemistry/Core/vtkBlueObeliskDataParser.cxx diff --git a/Chemistry/vtkBlueObeliskDataParser.h b/Chemistry/Core/vtkBlueObeliskDataParser.h similarity index 100% rename from Chemistry/vtkBlueObeliskDataParser.h rename to Chemistry/Core/vtkBlueObeliskDataParser.h diff --git a/Chemistry/vtkCMLMoleculeReader.cxx b/Chemistry/Core/vtkCMLMoleculeReader.cxx similarity index 100% rename from Chemistry/vtkCMLMoleculeReader.cxx rename to Chemistry/Core/vtkCMLMoleculeReader.cxx diff --git a/Chemistry/vtkCMLMoleculeReader.h b/Chemistry/Core/vtkCMLMoleculeReader.h similarity index 100% rename from Chemistry/vtkCMLMoleculeReader.h rename to Chemistry/Core/vtkCMLMoleculeReader.h diff --git a/Chemistry/vtkChemistryConfigure.h.in b/Chemistry/Core/vtkChemistryConfigure.h.in similarity index 100% rename from Chemistry/vtkChemistryConfigure.h.in rename to Chemistry/Core/vtkChemistryConfigure.h.in diff --git a/Chemistry/vtkMoleculeAlgorithm.cxx b/Chemistry/Core/vtkMoleculeAlgorithm.cxx similarity index 100% rename from Chemistry/vtkMoleculeAlgorithm.cxx rename to Chemistry/Core/vtkMoleculeAlgorithm.cxx diff --git a/Chemistry/vtkMoleculeAlgorithm.h b/Chemistry/Core/vtkMoleculeAlgorithm.h similarity index 100% rename from Chemistry/vtkMoleculeAlgorithm.h rename to Chemistry/Core/vtkMoleculeAlgorithm.h diff --git a/Chemistry/vtkMoleculeMapper.cxx b/Chemistry/Core/vtkMoleculeMapper.cxx similarity index 100% rename from Chemistry/vtkMoleculeMapper.cxx rename to Chemistry/Core/vtkMoleculeMapper.cxx diff --git a/Chemistry/vtkMoleculeMapper.h b/Chemistry/Core/vtkMoleculeMapper.h similarity index 100% rename from Chemistry/vtkMoleculeMapper.h rename to Chemistry/Core/vtkMoleculeMapper.h diff --git a/Chemistry/vtkMoleculeToAtomBallFilter.cxx b/Chemistry/Core/vtkMoleculeToAtomBallFilter.cxx similarity index 100% rename from Chemistry/vtkMoleculeToAtomBallFilter.cxx rename to Chemistry/Core/vtkMoleculeToAtomBallFilter.cxx diff --git a/Chemistry/vtkMoleculeToAtomBallFilter.h b/Chemistry/Core/vtkMoleculeToAtomBallFilter.h similarity index 100% rename from Chemistry/vtkMoleculeToAtomBallFilter.h rename to Chemistry/Core/vtkMoleculeToAtomBallFilter.h diff --git a/Chemistry/vtkMoleculeToBondStickFilter.cxx b/Chemistry/Core/vtkMoleculeToBondStickFilter.cxx similarity index 100% rename from Chemistry/vtkMoleculeToBondStickFilter.cxx rename to Chemistry/Core/vtkMoleculeToBondStickFilter.cxx diff --git a/Chemistry/vtkMoleculeToBondStickFilter.h b/Chemistry/Core/vtkMoleculeToBondStickFilter.h similarity index 100% rename from Chemistry/vtkMoleculeToBondStickFilter.h rename to Chemistry/Core/vtkMoleculeToBondStickFilter.h diff --git a/Chemistry/vtkMoleculeToPolyDataFilter.cxx b/Chemistry/Core/vtkMoleculeToPolyDataFilter.cxx similarity index 100% rename from Chemistry/vtkMoleculeToPolyDataFilter.cxx rename to Chemistry/Core/vtkMoleculeToPolyDataFilter.cxx diff --git a/Chemistry/vtkMoleculeToPolyDataFilter.h b/Chemistry/Core/vtkMoleculeToPolyDataFilter.h similarity index 100% rename from Chemistry/vtkMoleculeToPolyDataFilter.h rename to Chemistry/Core/vtkMoleculeToPolyDataFilter.h diff --git a/Chemistry/vtkOpenQubeElectronicData.cxx b/Chemistry/Core/vtkOpenQubeElectronicData.cxx similarity index 100% rename from Chemistry/vtkOpenQubeElectronicData.cxx rename to Chemistry/Core/vtkOpenQubeElectronicData.cxx diff --git a/Chemistry/vtkOpenQubeElectronicData.h b/Chemistry/Core/vtkOpenQubeElectronicData.h similarity index 100% rename from Chemistry/vtkOpenQubeElectronicData.h rename to Chemistry/Core/vtkOpenQubeElectronicData.h diff --git a/Chemistry/vtkOpenQubeMoleculeSource.cxx b/Chemistry/Core/vtkOpenQubeMoleculeSource.cxx similarity index 100% rename from Chemistry/vtkOpenQubeMoleculeSource.cxx rename to Chemistry/Core/vtkOpenQubeMoleculeSource.cxx diff --git a/Chemistry/vtkOpenQubeMoleculeSource.h b/Chemistry/Core/vtkOpenQubeMoleculeSource.h similarity index 100% rename from Chemistry/vtkOpenQubeMoleculeSource.h rename to Chemistry/Core/vtkOpenQubeMoleculeSource.h diff --git a/Chemistry/vtkPeriodicTable.cxx b/Chemistry/Core/vtkPeriodicTable.cxx similarity index 100% rename from Chemistry/vtkPeriodicTable.cxx rename to Chemistry/Core/vtkPeriodicTable.cxx diff --git a/Chemistry/vtkPeriodicTable.h b/Chemistry/Core/vtkPeriodicTable.h similarity index 100% rename from Chemistry/vtkPeriodicTable.h rename to Chemistry/Core/vtkPeriodicTable.h diff --git a/Chemistry/vtkProgrammableElectronicData.cxx b/Chemistry/Core/vtkProgrammableElectronicData.cxx similarity index 100% rename from Chemistry/vtkProgrammableElectronicData.cxx rename to Chemistry/Core/vtkProgrammableElectronicData.cxx diff --git a/Chemistry/vtkProgrammableElectronicData.h b/Chemistry/Core/vtkProgrammableElectronicData.h similarity index 100% rename from Chemistry/vtkProgrammableElectronicData.h rename to Chemistry/Core/vtkProgrammableElectronicData.h diff --git a/Chemistry/vtkSimpleBondPerceiver.cxx b/Chemistry/Core/vtkSimpleBondPerceiver.cxx similarity index 100% rename from Chemistry/vtkSimpleBondPerceiver.cxx rename to Chemistry/Core/vtkSimpleBondPerceiver.cxx diff --git a/Chemistry/vtkSimpleBondPerceiver.h b/Chemistry/Core/vtkSimpleBondPerceiver.h similarity index 100% rename from Chemistry/vtkSimpleBondPerceiver.h rename to Chemistry/Core/vtkSimpleBondPerceiver.h diff --git a/Filtering/Testing/Tcl/CSpline.tcl b/Common/ComputationalGeometry/Testing/Tcl/CSpline.tcl similarity index 100% rename from Filtering/Testing/Tcl/CSpline.tcl rename to Common/ComputationalGeometry/Testing/Tcl/CSpline.tcl diff --git a/Filtering/Testing/Tcl/KSpline.tcl b/Common/ComputationalGeometry/Testing/Tcl/KSpline.tcl similarity index 100% rename from Filtering/Testing/Tcl/KSpline.tcl rename to Common/ComputationalGeometry/Testing/Tcl/KSpline.tcl diff --git a/Filtering/Testing/Tcl/closedSplines.tcl b/Common/ComputationalGeometry/Testing/Tcl/closedSplines.tcl similarity index 100% rename from Filtering/Testing/Tcl/closedSplines.tcl rename to Common/ComputationalGeometry/Testing/Tcl/closedSplines.tcl diff --git a/Filtering/vtkCardinalSpline.cxx b/Common/ComputationalGeometry/vtkCardinalSpline.cxx similarity index 100% rename from Filtering/vtkCardinalSpline.cxx rename to Common/ComputationalGeometry/vtkCardinalSpline.cxx diff --git a/Filtering/vtkCardinalSpline.h b/Common/ComputationalGeometry/vtkCardinalSpline.h similarity index 100% rename from Filtering/vtkCardinalSpline.h rename to Common/ComputationalGeometry/vtkCardinalSpline.h diff --git a/Filtering/vtkKochanekSpline.cxx b/Common/ComputationalGeometry/vtkKochanekSpline.cxx similarity index 100% rename from Filtering/vtkKochanekSpline.cxx rename to Common/ComputationalGeometry/vtkKochanekSpline.cxx diff --git a/Filtering/vtkKochanekSpline.h b/Common/ComputationalGeometry/vtkKochanekSpline.h similarity index 100% rename from Filtering/vtkKochanekSpline.h rename to Common/ComputationalGeometry/vtkKochanekSpline.h diff --git a/Common/vtkParametricBoy.cxx b/Common/ComputationalGeometry/vtkParametricBoy.cxx similarity index 100% rename from Common/vtkParametricBoy.cxx rename to Common/ComputationalGeometry/vtkParametricBoy.cxx diff --git a/Common/vtkParametricBoy.h b/Common/ComputationalGeometry/vtkParametricBoy.h similarity index 100% rename from Common/vtkParametricBoy.h rename to Common/ComputationalGeometry/vtkParametricBoy.h diff --git a/Common/vtkParametricConicSpiral.cxx b/Common/ComputationalGeometry/vtkParametricConicSpiral.cxx similarity index 100% rename from Common/vtkParametricConicSpiral.cxx rename to Common/ComputationalGeometry/vtkParametricConicSpiral.cxx diff --git a/Common/vtkParametricConicSpiral.h b/Common/ComputationalGeometry/vtkParametricConicSpiral.h similarity index 100% rename from Common/vtkParametricConicSpiral.h rename to Common/ComputationalGeometry/vtkParametricConicSpiral.h diff --git a/Common/vtkParametricCrossCap.cxx b/Common/ComputationalGeometry/vtkParametricCrossCap.cxx similarity index 100% rename from Common/vtkParametricCrossCap.cxx rename to Common/ComputationalGeometry/vtkParametricCrossCap.cxx diff --git a/Common/vtkParametricCrossCap.h b/Common/ComputationalGeometry/vtkParametricCrossCap.h similarity index 100% rename from Common/vtkParametricCrossCap.h rename to Common/ComputationalGeometry/vtkParametricCrossCap.h diff --git a/Common/vtkParametricDini.cxx b/Common/ComputationalGeometry/vtkParametricDini.cxx similarity index 100% rename from Common/vtkParametricDini.cxx rename to Common/ComputationalGeometry/vtkParametricDini.cxx diff --git a/Common/vtkParametricDini.h b/Common/ComputationalGeometry/vtkParametricDini.h similarity index 100% rename from Common/vtkParametricDini.h rename to Common/ComputationalGeometry/vtkParametricDini.h diff --git a/Common/vtkParametricEllipsoid.cxx b/Common/ComputationalGeometry/vtkParametricEllipsoid.cxx similarity index 100% rename from Common/vtkParametricEllipsoid.cxx rename to Common/ComputationalGeometry/vtkParametricEllipsoid.cxx diff --git a/Common/vtkParametricEllipsoid.h b/Common/ComputationalGeometry/vtkParametricEllipsoid.h similarity index 100% rename from Common/vtkParametricEllipsoid.h rename to Common/ComputationalGeometry/vtkParametricEllipsoid.h diff --git a/Common/vtkParametricEnneper.cxx b/Common/ComputationalGeometry/vtkParametricEnneper.cxx similarity index 100% rename from Common/vtkParametricEnneper.cxx rename to Common/ComputationalGeometry/vtkParametricEnneper.cxx diff --git a/Common/vtkParametricEnneper.h b/Common/ComputationalGeometry/vtkParametricEnneper.h similarity index 100% rename from Common/vtkParametricEnneper.h rename to Common/ComputationalGeometry/vtkParametricEnneper.h diff --git a/Common/vtkParametricFigure8Klein.cxx b/Common/ComputationalGeometry/vtkParametricFigure8Klein.cxx similarity index 100% rename from Common/vtkParametricFigure8Klein.cxx rename to Common/ComputationalGeometry/vtkParametricFigure8Klein.cxx diff --git a/Common/vtkParametricFigure8Klein.h b/Common/ComputationalGeometry/vtkParametricFigure8Klein.h similarity index 100% rename from Common/vtkParametricFigure8Klein.h rename to Common/ComputationalGeometry/vtkParametricFigure8Klein.h diff --git a/Common/vtkParametricFunction.cxx b/Common/ComputationalGeometry/vtkParametricFunction.cxx similarity index 100% rename from Common/vtkParametricFunction.cxx rename to Common/ComputationalGeometry/vtkParametricFunction.cxx diff --git a/Common/vtkParametricFunction.h b/Common/ComputationalGeometry/vtkParametricFunction.h similarity index 100% rename from Common/vtkParametricFunction.h rename to Common/ComputationalGeometry/vtkParametricFunction.h diff --git a/Common/vtkParametricKlein.cxx b/Common/ComputationalGeometry/vtkParametricKlein.cxx similarity index 100% rename from Common/vtkParametricKlein.cxx rename to Common/ComputationalGeometry/vtkParametricKlein.cxx diff --git a/Common/vtkParametricKlein.h b/Common/ComputationalGeometry/vtkParametricKlein.h similarity index 100% rename from Common/vtkParametricKlein.h rename to Common/ComputationalGeometry/vtkParametricKlein.h diff --git a/Common/vtkParametricMobius.cxx b/Common/ComputationalGeometry/vtkParametricMobius.cxx similarity index 100% rename from Common/vtkParametricMobius.cxx rename to Common/ComputationalGeometry/vtkParametricMobius.cxx diff --git a/Common/vtkParametricMobius.h b/Common/ComputationalGeometry/vtkParametricMobius.h similarity index 100% rename from Common/vtkParametricMobius.h rename to Common/ComputationalGeometry/vtkParametricMobius.h diff --git a/Common/vtkParametricRandomHills.cxx b/Common/ComputationalGeometry/vtkParametricRandomHills.cxx similarity index 100% rename from Common/vtkParametricRandomHills.cxx rename to Common/ComputationalGeometry/vtkParametricRandomHills.cxx diff --git a/Common/vtkParametricRandomHills.h b/Common/ComputationalGeometry/vtkParametricRandomHills.h similarity index 100% rename from Common/vtkParametricRandomHills.h rename to Common/ComputationalGeometry/vtkParametricRandomHills.h diff --git a/Common/vtkParametricRoman.cxx b/Common/ComputationalGeometry/vtkParametricRoman.cxx similarity index 100% rename from Common/vtkParametricRoman.cxx rename to Common/ComputationalGeometry/vtkParametricRoman.cxx diff --git a/Common/vtkParametricRoman.h b/Common/ComputationalGeometry/vtkParametricRoman.h similarity index 100% rename from Common/vtkParametricRoman.h rename to Common/ComputationalGeometry/vtkParametricRoman.h diff --git a/Filtering/vtkParametricSpline.cxx b/Common/ComputationalGeometry/vtkParametricSpline.cxx similarity index 100% rename from Filtering/vtkParametricSpline.cxx rename to Common/ComputationalGeometry/vtkParametricSpline.cxx diff --git a/Filtering/vtkParametricSpline.h b/Common/ComputationalGeometry/vtkParametricSpline.h similarity index 100% rename from Filtering/vtkParametricSpline.h rename to Common/ComputationalGeometry/vtkParametricSpline.h diff --git a/Common/vtkParametricSuperEllipsoid.cxx b/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.cxx similarity index 100% rename from Common/vtkParametricSuperEllipsoid.cxx rename to Common/ComputationalGeometry/vtkParametricSuperEllipsoid.cxx diff --git a/Common/vtkParametricSuperEllipsoid.h b/Common/ComputationalGeometry/vtkParametricSuperEllipsoid.h similarity index 100% rename from Common/vtkParametricSuperEllipsoid.h rename to Common/ComputationalGeometry/vtkParametricSuperEllipsoid.h diff --git a/Common/vtkParametricSuperToroid.cxx b/Common/ComputationalGeometry/vtkParametricSuperToroid.cxx similarity index 100% rename from Common/vtkParametricSuperToroid.cxx rename to Common/ComputationalGeometry/vtkParametricSuperToroid.cxx diff --git a/Common/vtkParametricSuperToroid.h b/Common/ComputationalGeometry/vtkParametricSuperToroid.h similarity index 100% rename from Common/vtkParametricSuperToroid.h rename to Common/ComputationalGeometry/vtkParametricSuperToroid.h diff --git a/Common/vtkParametricTorus.cxx b/Common/ComputationalGeometry/vtkParametricTorus.cxx similarity index 100% rename from Common/vtkParametricTorus.cxx rename to Common/ComputationalGeometry/vtkParametricTorus.cxx diff --git a/Common/vtkParametricTorus.h b/Common/ComputationalGeometry/vtkParametricTorus.h similarity index 100% rename from Common/vtkParametricTorus.h rename to Common/ComputationalGeometry/vtkParametricTorus.h diff --git a/Common/CMakeLists.txt b/Common/Core/CMakeLists.txt similarity index 100% rename from Common/CMakeLists.txt rename to Common/Core/CMakeLists.txt diff --git a/Common/CaseFolding.txt b/Common/Core/CaseFolding.txt similarity index 100% rename from Common/CaseFolding.txt rename to Common/Core/CaseFolding.txt diff --git a/Common/Testing/Cxx/CMakeLists.txt b/Common/Core/Testing/Cxx/CMakeLists.txt similarity index 100% rename from Common/Testing/Cxx/CMakeLists.txt rename to Common/Core/Testing/Cxx/CMakeLists.txt diff --git a/Common/Testing/Cxx/SystemInformation-cygcheck.sh b/Common/Core/Testing/Cxx/SystemInformation-cygcheck.sh similarity index 100% rename from Common/Testing/Cxx/SystemInformation-cygcheck.sh rename to Common/Core/Testing/Cxx/SystemInformation-cygcheck.sh diff --git a/Common/Testing/Cxx/SystemInformation.h.in b/Common/Core/Testing/Cxx/SystemInformation.h.in similarity index 100% rename from Common/Testing/Cxx/SystemInformation.h.in rename to Common/Core/Testing/Cxx/SystemInformation.h.in diff --git a/Common/Testing/Cxx/TestArrayAPI.cxx b/Common/Core/Testing/Cxx/TestArrayAPI.cxx similarity index 100% rename from Common/Testing/Cxx/TestArrayAPI.cxx rename to Common/Core/Testing/Cxx/TestArrayAPI.cxx diff --git a/Common/Testing/Cxx/TestArrayAPIConvenience.cxx b/Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx similarity index 100% rename from Common/Testing/Cxx/TestArrayAPIConvenience.cxx rename to Common/Core/Testing/Cxx/TestArrayAPIConvenience.cxx diff --git a/Common/Testing/Cxx/TestArrayAPIDense.cxx b/Common/Core/Testing/Cxx/TestArrayAPIDense.cxx similarity index 100% rename from Common/Testing/Cxx/TestArrayAPIDense.cxx rename to Common/Core/Testing/Cxx/TestArrayAPIDense.cxx diff --git a/Common/Testing/Cxx/TestArrayAPISparse.cxx b/Common/Core/Testing/Cxx/TestArrayAPISparse.cxx similarity index 100% rename from Common/Testing/Cxx/TestArrayAPISparse.cxx rename to Common/Core/Testing/Cxx/TestArrayAPISparse.cxx diff --git a/Common/Testing/Cxx/TestArrayBool.cxx b/Common/Core/Testing/Cxx/TestArrayBool.cxx similarity index 100% rename from Common/Testing/Cxx/TestArrayBool.cxx rename to Common/Core/Testing/Cxx/TestArrayBool.cxx diff --git a/Common/Testing/Cxx/TestArrayCasting.cxx b/Common/Core/Testing/Cxx/TestArrayCasting.cxx similarity index 100% rename from Common/Testing/Cxx/TestArrayCasting.cxx rename to Common/Core/Testing/Cxx/TestArrayCasting.cxx diff --git a/Common/Testing/Cxx/TestArrayExtents.cxx b/Common/Core/Testing/Cxx/TestArrayExtents.cxx similarity index 100% rename from Common/Testing/Cxx/TestArrayExtents.cxx rename to Common/Core/Testing/Cxx/TestArrayExtents.cxx diff --git a/Common/Testing/Cxx/TestArrayInterpolationDense.cxx b/Common/Core/Testing/Cxx/TestArrayInterpolationDense.cxx similarity index 100% rename from Common/Testing/Cxx/TestArrayInterpolationDense.cxx rename to Common/Core/Testing/Cxx/TestArrayInterpolationDense.cxx diff --git a/Common/Testing/Cxx/TestArrayLookup.cxx b/Common/Core/Testing/Cxx/TestArrayLookup.cxx similarity index 100% rename from Common/Testing/Cxx/TestArrayLookup.cxx rename to Common/Core/Testing/Cxx/TestArrayLookup.cxx diff --git a/Common/Testing/Cxx/TestArrayNullValues.cxx b/Common/Core/Testing/Cxx/TestArrayNullValues.cxx similarity index 100% rename from Common/Testing/Cxx/TestArrayNullValues.cxx rename to Common/Core/Testing/Cxx/TestArrayNullValues.cxx diff --git a/Common/Testing/Cxx/TestArraySize.cxx b/Common/Core/Testing/Cxx/TestArraySize.cxx similarity index 100% rename from Common/Testing/Cxx/TestArraySize.cxx rename to Common/Core/Testing/Cxx/TestArraySize.cxx diff --git a/Common/Testing/Cxx/TestArrayUserTypes.cxx b/Common/Core/Testing/Cxx/TestArrayUserTypes.cxx similarity index 100% rename from Common/Testing/Cxx/TestArrayUserTypes.cxx rename to Common/Core/Testing/Cxx/TestArrayUserTypes.cxx diff --git a/Common/Testing/Cxx/TestArrayVariants.cxx b/Common/Core/Testing/Cxx/TestArrayVariants.cxx similarity index 100% rename from Common/Testing/Cxx/TestArrayVariants.cxx rename to Common/Core/Testing/Cxx/TestArrayVariants.cxx diff --git a/Common/Testing/Cxx/TestConditionVariable.cxx b/Common/Core/Testing/Cxx/TestConditionVariable.cxx similarity index 100% rename from Common/Testing/Cxx/TestConditionVariable.cxx rename to Common/Core/Testing/Cxx/TestConditionVariable.cxx diff --git a/Common/Testing/Cxx/TestCxxFeatures.cxx b/Common/Core/Testing/Cxx/TestCxxFeatures.cxx similarity index 100% rename from Common/Testing/Cxx/TestCxxFeatures.cxx rename to Common/Core/Testing/Cxx/TestCxxFeatures.cxx diff --git a/Common/Testing/Cxx/TestDataArray.cxx b/Common/Core/Testing/Cxx/TestDataArray.cxx similarity index 100% rename from Common/Testing/Cxx/TestDataArray.cxx rename to Common/Core/Testing/Cxx/TestDataArray.cxx diff --git a/Common/Testing/Cxx/TestDataArrayComponentNames.cxx b/Common/Core/Testing/Cxx/TestDataArrayComponentNames.cxx similarity index 100% rename from Common/Testing/Cxx/TestDataArrayComponentNames.cxx rename to Common/Core/Testing/Cxx/TestDataArrayComponentNames.cxx diff --git a/Common/Testing/Cxx/TestGarbageCollector.cxx b/Common/Core/Testing/Cxx/TestGarbageCollector.cxx similarity index 100% rename from Common/Testing/Cxx/TestGarbageCollector.cxx rename to Common/Core/Testing/Cxx/TestGarbageCollector.cxx diff --git a/Common/Testing/Cxx/TestInstantiator.cxx b/Common/Core/Testing/Cxx/TestInstantiator.cxx similarity index 100% rename from Common/Testing/Cxx/TestInstantiator.cxx rename to Common/Core/Testing/Cxx/TestInstantiator.cxx diff --git a/Common/Testing/Cxx/TestMath.cxx b/Common/Core/Testing/Cxx/TestMath.cxx similarity index 100% rename from Common/Testing/Cxx/TestMath.cxx rename to Common/Core/Testing/Cxx/TestMath.cxx diff --git a/Common/Testing/Cxx/TestMinimalStandardRandomSequence.cxx b/Common/Core/Testing/Cxx/TestMinimalStandardRandomSequence.cxx similarity index 100% rename from Common/Testing/Cxx/TestMinimalStandardRandomSequence.cxx rename to Common/Core/Testing/Cxx/TestMinimalStandardRandomSequence.cxx diff --git a/Common/Testing/Cxx/TestNew.cxx b/Common/Core/Testing/Cxx/TestNew.cxx similarity index 100% rename from Common/Testing/Cxx/TestNew.cxx rename to Common/Core/Testing/Cxx/TestNew.cxx diff --git a/Common/Testing/Cxx/TestObjectFactory.cxx b/Common/Core/Testing/Cxx/TestObjectFactory.cxx similarity index 100% rename from Common/Testing/Cxx/TestObjectFactory.cxx rename to Common/Core/Testing/Cxx/TestObjectFactory.cxx diff --git a/Common/Testing/Cxx/TestObservers.cxx b/Common/Core/Testing/Cxx/TestObservers.cxx similarity index 100% rename from Common/Testing/Cxx/TestObservers.cxx rename to Common/Core/Testing/Cxx/TestObservers.cxx diff --git a/Common/Testing/Cxx/TestSmartPointer.cxx b/Common/Core/Testing/Cxx/TestSmartPointer.cxx similarity index 100% rename from Common/Testing/Cxx/TestSmartPointer.cxx rename to Common/Core/Testing/Cxx/TestSmartPointer.cxx diff --git a/Common/Testing/Cxx/TestSortDataArray.cxx b/Common/Core/Testing/Cxx/TestSortDataArray.cxx similarity index 100% rename from Common/Testing/Cxx/TestSortDataArray.cxx rename to Common/Core/Testing/Cxx/TestSortDataArray.cxx diff --git a/Common/Testing/Cxx/TestSparseArrayValidation.cxx b/Common/Core/Testing/Cxx/TestSparseArrayValidation.cxx similarity index 100% rename from Common/Testing/Cxx/TestSparseArrayValidation.cxx rename to Common/Core/Testing/Cxx/TestSparseArrayValidation.cxx diff --git a/Common/Testing/Cxx/TestSystemInformation.cxx b/Common/Core/Testing/Cxx/TestSystemInformation.cxx similarity index 100% rename from Common/Testing/Cxx/TestSystemInformation.cxx rename to Common/Core/Testing/Cxx/TestSystemInformation.cxx diff --git a/Common/Testing/Cxx/TestUnicodeStringAPI.cxx b/Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx similarity index 100% rename from Common/Testing/Cxx/TestUnicodeStringAPI.cxx rename to Common/Core/Testing/Cxx/TestUnicodeStringAPI.cxx diff --git a/Common/Testing/Cxx/TestUnicodeStringArrayAPI.cxx b/Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx similarity index 100% rename from Common/Testing/Cxx/TestUnicodeStringArrayAPI.cxx rename to Common/Core/Testing/Cxx/TestUnicodeStringArrayAPI.cxx diff --git a/Infovis/Testing/Cxx/TestVariant.cxx b/Common/Core/Testing/Cxx/TestVariant.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestVariant.cxx rename to Common/Core/Testing/Cxx/TestVariant.cxx diff --git a/Infovis/Testing/Cxx/TestVariantArray.cxx b/Common/Core/Testing/Cxx/TestVariantArray.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestVariantArray.cxx rename to Common/Core/Testing/Cxx/TestVariantArray.cxx diff --git a/Common/Testing/Cxx/TestVariantComparison.cxx b/Common/Core/Testing/Cxx/TestVariantComparison.cxx similarity index 100% rename from Common/Testing/Cxx/TestVariantComparison.cxx rename to Common/Core/Testing/Cxx/TestVariantComparison.cxx diff --git a/Common/Testing/Cxx/TestWeakPointer.cxx b/Common/Core/Testing/Cxx/TestWeakPointer.cxx similarity index 100% rename from Common/Testing/Cxx/TestWeakPointer.cxx rename to Common/Core/Testing/Cxx/TestWeakPointer.cxx diff --git a/Common/Testing/Cxx/otherArrays.cxx b/Common/Core/Testing/Cxx/otherArrays.cxx similarity index 100% rename from Common/Testing/Cxx/otherArrays.cxx rename to Common/Core/Testing/Cxx/otherArrays.cxx diff --git a/Common/Testing/Cxx/otherByteSwap.cxx b/Common/Core/Testing/Cxx/otherByteSwap.cxx similarity index 100% rename from Common/Testing/Cxx/otherByteSwap.cxx rename to Common/Core/Testing/Cxx/otherByteSwap.cxx diff --git a/Common/Testing/Cxx/otherStringArray.cxx b/Common/Core/Testing/Cxx/otherStringArray.cxx similarity index 100% rename from Common/Testing/Cxx/otherStringArray.cxx rename to Common/Core/Testing/Cxx/otherStringArray.cxx diff --git a/Common/Testing/Cxx/vtkTestNewVar.cxx b/Common/Core/Testing/Cxx/vtkTestNewVar.cxx similarity index 100% rename from Common/Testing/Cxx/vtkTestNewVar.cxx rename to Common/Core/Testing/Cxx/vtkTestNewVar.cxx diff --git a/Common/Testing/Cxx/vtkTestNewVar.h b/Common/Core/Testing/Cxx/vtkTestNewVar.h similarity index 100% rename from Common/Testing/Cxx/vtkTestNewVar.h rename to Common/Core/Testing/Cxx/vtkTestNewVar.h diff --git a/Common/Testing/Python/PythonSmoke.py b/Common/Core/Testing/Python/PythonSmoke.py similarity index 100% rename from Common/Testing/Python/PythonSmoke.py rename to Common/Core/Testing/Python/PythonSmoke.py diff --git a/Common/Testing/Python/TestArrayArguments.py b/Common/Core/Testing/Python/TestArrayArguments.py similarity index 100% rename from Common/Testing/Python/TestArrayArguments.py rename to Common/Core/Testing/Python/TestArrayArguments.py diff --git a/Common/Testing/Python/TestCommand.py b/Common/Core/Testing/Python/TestCommand.py similarity index 100% rename from Common/Testing/Python/TestCommand.py rename to Common/Core/Testing/Python/TestCommand.py diff --git a/Common/Testing/Python/TestExecuteMethodFinalizeCrash.py b/Common/Core/Testing/Python/TestExecuteMethodFinalizeCrash.py similarity index 100% rename from Common/Testing/Python/TestExecuteMethodFinalizeCrash.py rename to Common/Core/Testing/Python/TestExecuteMethodFinalizeCrash.py diff --git a/Common/Testing/Python/TestGhost.py b/Common/Core/Testing/Python/TestGhost.py similarity index 100% rename from Common/Testing/Python/TestGhost.py rename to Common/Core/Testing/Python/TestGhost.py diff --git a/Common/Testing/Python/TestIgnoreBTX.py b/Common/Core/Testing/Python/TestIgnoreBTX.py similarity index 100% rename from Common/Testing/Python/TestIgnoreBTX.py rename to Common/Core/Testing/Python/TestIgnoreBTX.py diff --git a/Common/Testing/Python/TestMutable.py b/Common/Core/Testing/Python/TestMutable.py similarity index 100% rename from Common/Testing/Python/TestMutable.py rename to Common/Core/Testing/Python/TestMutable.py diff --git a/Common/Testing/Python/TestNumpySupport.py b/Common/Core/Testing/Python/TestNumpySupport.py similarity index 100% rename from Common/Testing/Python/TestNumpySupport.py rename to Common/Core/Testing/Python/TestNumpySupport.py diff --git a/Common/Testing/Python/TestOperators.py b/Common/Core/Testing/Python/TestOperators.py similarity index 100% rename from Common/Testing/Python/TestOperators.py rename to Common/Core/Testing/Python/TestOperators.py diff --git a/Common/Testing/Python/TestStrings.py b/Common/Core/Testing/Python/TestStrings.py similarity index 100% rename from Common/Testing/Python/TestStrings.py rename to Common/Core/Testing/Python/TestStrings.py diff --git a/Common/Testing/Python/TestSubClass.py b/Common/Core/Testing/Python/TestSubClass.py similarity index 100% rename from Common/Testing/Python/TestSubClass.py rename to Common/Core/Testing/Python/TestSubClass.py diff --git a/Common/Testing/Python/TestTerminationCrash.py b/Common/Core/Testing/Python/TestTerminationCrash.py similarity index 100% rename from Common/Testing/Python/TestTerminationCrash.py rename to Common/Core/Testing/Python/TestTerminationCrash.py diff --git a/Common/Testing/Python/TestVariant.py b/Common/Core/Testing/Python/TestVariant.py similarity index 100% rename from Common/Testing/Python/TestVariant.py rename to Common/Core/Testing/Python/TestVariant.py diff --git a/Common/Testing/Python/TestWeakref.py b/Common/Core/Testing/Python/TestWeakref.py similarity index 100% rename from Common/Testing/Python/TestWeakref.py rename to Common/Core/Testing/Python/TestWeakref.py diff --git a/Common/Testing/Tcl/FindString.tcl b/Common/Core/Testing/Tcl/FindString.tcl similarity index 100% rename from Common/Testing/Tcl/FindString.tcl rename to Common/Core/Testing/Tcl/FindString.tcl diff --git a/Common/Testing/Tcl/PrintSelfCheck.tcl b/Common/Core/Testing/Tcl/PrintSelfCheck.tcl similarity index 100% rename from Common/Testing/Tcl/PrintSelfCheck.tcl rename to Common/Core/Testing/Tcl/PrintSelfCheck.tcl diff --git a/Common/Testing/Tcl/TestArrays.tcl b/Common/Core/Testing/Tcl/TestArrays.tcl similarity index 100% rename from Common/Testing/Tcl/TestArrays.tcl rename to Common/Core/Testing/Tcl/TestArrays.tcl diff --git a/Common/Testing/Tcl/TestEmptyInput.tcl b/Common/Core/Testing/Tcl/TestEmptyInput.tcl similarity index 100% rename from Common/Testing/Tcl/TestEmptyInput.tcl rename to Common/Core/Testing/Tcl/TestEmptyInput.tcl diff --git a/Common/Testing/Tcl/TestIgnoreBTX.tcl b/Common/Core/Testing/Tcl/TestIgnoreBTX.tcl similarity index 100% rename from Common/Testing/Tcl/TestIgnoreBTX.tcl rename to Common/Core/Testing/Tcl/TestIgnoreBTX.tcl diff --git a/Common/Testing/Tcl/TestSetGet.tcl b/Common/Core/Testing/Tcl/TestSetGet.tcl similarity index 100% rename from Common/Testing/Tcl/TestSetGet.tcl rename to Common/Core/Testing/Tcl/TestSetGet.tcl diff --git a/Common/Testing/Tcl/TestString.tcl b/Common/Core/Testing/Tcl/TestString.tcl similarity index 100% rename from Common/Testing/Tcl/TestString.tcl rename to Common/Core/Testing/Tcl/TestString.tcl diff --git a/Common/Testing/Tcl/otherInterp.tcl b/Common/Core/Testing/Tcl/otherInterp.tcl similarity index 100% rename from Common/Testing/Tcl/otherInterp.tcl rename to Common/Core/Testing/Tcl/otherInterp.tcl diff --git a/Common/Testing/Tcl/otherPrint.tcl b/Common/Core/Testing/Tcl/otherPrint.tcl similarity index 100% rename from Common/Testing/Tcl/otherPrint.tcl rename to Common/Core/Testing/Tcl/otherPrint.tcl diff --git a/Common/vtkABI.h b/Common/Core/vtkABI.h similarity index 100% rename from Common/vtkABI.h rename to Common/Core/vtkABI.h diff --git a/Common/vtkAbstractArray.cxx b/Common/Core/vtkAbstractArray.cxx similarity index 100% rename from Common/vtkAbstractArray.cxx rename to Common/Core/vtkAbstractArray.cxx diff --git a/Common/vtkAbstractArray.h b/Common/Core/vtkAbstractArray.h similarity index 100% rename from Common/vtkAbstractArray.h rename to Common/Core/vtkAbstractArray.h diff --git a/Common/vtkAnimationCue.cxx b/Common/Core/vtkAnimationCue.cxx similarity index 100% rename from Common/vtkAnimationCue.cxx rename to Common/Core/vtkAnimationCue.cxx diff --git a/Common/vtkAnimationCue.h b/Common/Core/vtkAnimationCue.h similarity index 100% rename from Common/vtkAnimationCue.h rename to Common/Core/vtkAnimationCue.h diff --git a/Common/vtkArray.cxx b/Common/Core/vtkArray.cxx similarity index 100% rename from Common/vtkArray.cxx rename to Common/Core/vtkArray.cxx diff --git a/Common/vtkArray.h b/Common/Core/vtkArray.h similarity index 100% rename from Common/vtkArray.h rename to Common/Core/vtkArray.h diff --git a/Common/vtkArrayCoordinates.cxx b/Common/Core/vtkArrayCoordinates.cxx similarity index 100% rename from Common/vtkArrayCoordinates.cxx rename to Common/Core/vtkArrayCoordinates.cxx diff --git a/Common/vtkArrayCoordinates.h b/Common/Core/vtkArrayCoordinates.h similarity index 100% rename from Common/vtkArrayCoordinates.h rename to Common/Core/vtkArrayCoordinates.h diff --git a/Common/vtkArrayExtents.cxx b/Common/Core/vtkArrayExtents.cxx similarity index 100% rename from Common/vtkArrayExtents.cxx rename to Common/Core/vtkArrayExtents.cxx diff --git a/Common/vtkArrayExtents.h b/Common/Core/vtkArrayExtents.h similarity index 100% rename from Common/vtkArrayExtents.h rename to Common/Core/vtkArrayExtents.h diff --git a/Common/vtkArrayExtentsList.cxx b/Common/Core/vtkArrayExtentsList.cxx similarity index 100% rename from Common/vtkArrayExtentsList.cxx rename to Common/Core/vtkArrayExtentsList.cxx diff --git a/Common/vtkArrayExtentsList.h b/Common/Core/vtkArrayExtentsList.h similarity index 100% rename from Common/vtkArrayExtentsList.h rename to Common/Core/vtkArrayExtentsList.h diff --git a/Common/vtkArrayInterpolate.h b/Common/Core/vtkArrayInterpolate.h similarity index 100% rename from Common/vtkArrayInterpolate.h rename to Common/Core/vtkArrayInterpolate.h diff --git a/Common/vtkArrayInterpolate.txx b/Common/Core/vtkArrayInterpolate.txx similarity index 100% rename from Common/vtkArrayInterpolate.txx rename to Common/Core/vtkArrayInterpolate.txx diff --git a/Common/vtkArrayIterator.cxx b/Common/Core/vtkArrayIterator.cxx similarity index 100% rename from Common/vtkArrayIterator.cxx rename to Common/Core/vtkArrayIterator.cxx diff --git a/Common/vtkArrayIterator.h b/Common/Core/vtkArrayIterator.h similarity index 100% rename from Common/vtkArrayIterator.h rename to Common/Core/vtkArrayIterator.h diff --git a/Common/vtkArrayIteratorIncludes.h b/Common/Core/vtkArrayIteratorIncludes.h similarity index 100% rename from Common/vtkArrayIteratorIncludes.h rename to Common/Core/vtkArrayIteratorIncludes.h diff --git a/Common/vtkArrayIteratorTemplate.h b/Common/Core/vtkArrayIteratorTemplate.h similarity index 100% rename from Common/vtkArrayIteratorTemplate.h rename to Common/Core/vtkArrayIteratorTemplate.h diff --git a/Common/vtkArrayIteratorTemplate.txx b/Common/Core/vtkArrayIteratorTemplate.txx similarity index 100% rename from Common/vtkArrayIteratorTemplate.txx rename to Common/Core/vtkArrayIteratorTemplate.txx diff --git a/Common/vtkArrayIteratorTemplateImplicit.txx b/Common/Core/vtkArrayIteratorTemplateImplicit.txx similarity index 100% rename from Common/vtkArrayIteratorTemplateImplicit.txx rename to Common/Core/vtkArrayIteratorTemplateImplicit.txx diff --git a/Common/vtkArrayPrint.h b/Common/Core/vtkArrayPrint.h similarity index 100% rename from Common/vtkArrayPrint.h rename to Common/Core/vtkArrayPrint.h diff --git a/Common/vtkArrayPrint.txx b/Common/Core/vtkArrayPrint.txx similarity index 100% rename from Common/vtkArrayPrint.txx rename to Common/Core/vtkArrayPrint.txx diff --git a/Common/vtkArrayRange.cxx b/Common/Core/vtkArrayRange.cxx similarity index 100% rename from Common/vtkArrayRange.cxx rename to Common/Core/vtkArrayRange.cxx diff --git a/Common/vtkArrayRange.h b/Common/Core/vtkArrayRange.h similarity index 100% rename from Common/vtkArrayRange.h rename to Common/Core/vtkArrayRange.h diff --git a/Common/vtkArraySort.cxx b/Common/Core/vtkArraySort.cxx similarity index 100% rename from Common/vtkArraySort.cxx rename to Common/Core/vtkArraySort.cxx diff --git a/Common/vtkArraySort.h b/Common/Core/vtkArraySort.h similarity index 100% rename from Common/vtkArraySort.h rename to Common/Core/vtkArraySort.h diff --git a/Common/vtkArrayWeights.cxx b/Common/Core/vtkArrayWeights.cxx similarity index 100% rename from Common/vtkArrayWeights.cxx rename to Common/Core/vtkArrayWeights.cxx diff --git a/Common/vtkArrayWeights.h b/Common/Core/vtkArrayWeights.h similarity index 100% rename from Common/vtkArrayWeights.h rename to Common/Core/vtkArrayWeights.h diff --git a/Common/vtkBitArray.cxx b/Common/Core/vtkBitArray.cxx similarity index 100% rename from Common/vtkBitArray.cxx rename to Common/Core/vtkBitArray.cxx diff --git a/Common/vtkBitArray.h b/Common/Core/vtkBitArray.h similarity index 100% rename from Common/vtkBitArray.h rename to Common/Core/vtkBitArray.h diff --git a/Common/vtkBitArrayIterator.cxx b/Common/Core/vtkBitArrayIterator.cxx similarity index 100% rename from Common/vtkBitArrayIterator.cxx rename to Common/Core/vtkBitArrayIterator.cxx diff --git a/Common/vtkBitArrayIterator.h b/Common/Core/vtkBitArrayIterator.h similarity index 100% rename from Common/vtkBitArrayIterator.h rename to Common/Core/vtkBitArrayIterator.h diff --git a/Common/vtkBoxMuellerRandomSequence.cxx b/Common/Core/vtkBoxMuellerRandomSequence.cxx similarity index 100% rename from Common/vtkBoxMuellerRandomSequence.cxx rename to Common/Core/vtkBoxMuellerRandomSequence.cxx diff --git a/Common/vtkBoxMuellerRandomSequence.h b/Common/Core/vtkBoxMuellerRandomSequence.h similarity index 100% rename from Common/vtkBoxMuellerRandomSequence.h rename to Common/Core/vtkBoxMuellerRandomSequence.h diff --git a/Common/vtkBreakPoint.cxx b/Common/Core/vtkBreakPoint.cxx similarity index 100% rename from Common/vtkBreakPoint.cxx rename to Common/Core/vtkBreakPoint.cxx diff --git a/Common/vtkBreakPoint.h b/Common/Core/vtkBreakPoint.h similarity index 100% rename from Common/vtkBreakPoint.h rename to Common/Core/vtkBreakPoint.h diff --git a/Common/vtkByteSwap.cxx b/Common/Core/vtkByteSwap.cxx similarity index 100% rename from Common/vtkByteSwap.cxx rename to Common/Core/vtkByteSwap.cxx diff --git a/Common/vtkByteSwap.h b/Common/Core/vtkByteSwap.h similarity index 100% rename from Common/vtkByteSwap.h rename to Common/Core/vtkByteSwap.h diff --git a/Common/vtkCallbackCommand.cxx b/Common/Core/vtkCallbackCommand.cxx similarity index 100% rename from Common/vtkCallbackCommand.cxx rename to Common/Core/vtkCallbackCommand.cxx diff --git a/Common/vtkCallbackCommand.h b/Common/Core/vtkCallbackCommand.h similarity index 100% rename from Common/vtkCallbackCommand.h rename to Common/Core/vtkCallbackCommand.h diff --git a/Common/vtkCharArray.cxx b/Common/Core/vtkCharArray.cxx similarity index 100% rename from Common/vtkCharArray.cxx rename to Common/Core/vtkCharArray.cxx diff --git a/Common/vtkCharArray.h b/Common/Core/vtkCharArray.h similarity index 100% rename from Common/vtkCharArray.h rename to Common/Core/vtkCharArray.h diff --git a/Common/vtkCollection.cxx b/Common/Core/vtkCollection.cxx similarity index 100% rename from Common/vtkCollection.cxx rename to Common/Core/vtkCollection.cxx diff --git a/Common/vtkCollection.h b/Common/Core/vtkCollection.h similarity index 100% rename from Common/vtkCollection.h rename to Common/Core/vtkCollection.h diff --git a/Common/vtkCollectionIterator.cxx b/Common/Core/vtkCollectionIterator.cxx similarity index 100% rename from Common/vtkCollectionIterator.cxx rename to Common/Core/vtkCollectionIterator.cxx diff --git a/Common/vtkCollectionIterator.h b/Common/Core/vtkCollectionIterator.h similarity index 100% rename from Common/vtkCollectionIterator.h rename to Common/Core/vtkCollectionIterator.h diff --git a/Common/vtkCommand.cxx b/Common/Core/vtkCommand.cxx similarity index 100% rename from Common/vtkCommand.cxx rename to Common/Core/vtkCommand.cxx diff --git a/Common/vtkCommand.h b/Common/Core/vtkCommand.h similarity index 100% rename from Common/vtkCommand.h rename to Common/Core/vtkCommand.h diff --git a/Common/vtkCommonInformationKeyManager.cxx b/Common/Core/vtkCommonInformationKeyManager.cxx similarity index 100% rename from Common/vtkCommonInformationKeyManager.cxx rename to Common/Core/vtkCommonInformationKeyManager.cxx diff --git a/Common/vtkCommonInformationKeyManager.h b/Common/Core/vtkCommonInformationKeyManager.h similarity index 100% rename from Common/vtkCommonInformationKeyManager.h rename to Common/Core/vtkCommonInformationKeyManager.h diff --git a/Common/vtkConditionVariable.cxx b/Common/Core/vtkConditionVariable.cxx similarity index 100% rename from Common/vtkConditionVariable.cxx rename to Common/Core/vtkConditionVariable.cxx diff --git a/Common/vtkConditionVariable.h b/Common/Core/vtkConditionVariable.h similarity index 100% rename from Common/vtkConditionVariable.h rename to Common/Core/vtkConditionVariable.h diff --git a/vtkConfigure.h.in b/Common/Core/vtkConfigure.h.in similarity index 100% rename from vtkConfigure.h.in rename to Common/Core/vtkConfigure.h.in diff --git a/Common/vtkCriticalSection.cxx b/Common/Core/vtkCriticalSection.cxx similarity index 100% rename from Common/vtkCriticalSection.cxx rename to Common/Core/vtkCriticalSection.cxx diff --git a/Common/vtkCriticalSection.h b/Common/Core/vtkCriticalSection.h similarity index 100% rename from Common/vtkCriticalSection.h rename to Common/Core/vtkCriticalSection.h diff --git a/Common/vtkDataArray.cxx b/Common/Core/vtkDataArray.cxx similarity index 100% rename from Common/vtkDataArray.cxx rename to Common/Core/vtkDataArray.cxx diff --git a/Common/vtkDataArray.h b/Common/Core/vtkDataArray.h similarity index 100% rename from Common/vtkDataArray.h rename to Common/Core/vtkDataArray.h diff --git a/Common/vtkDataArrayCollection.cxx b/Common/Core/vtkDataArrayCollection.cxx similarity index 100% rename from Common/vtkDataArrayCollection.cxx rename to Common/Core/vtkDataArrayCollection.cxx diff --git a/Common/vtkDataArrayCollection.h b/Common/Core/vtkDataArrayCollection.h similarity index 100% rename from Common/vtkDataArrayCollection.h rename to Common/Core/vtkDataArrayCollection.h diff --git a/Common/vtkDataArrayCollectionIterator.cxx b/Common/Core/vtkDataArrayCollectionIterator.cxx similarity index 100% rename from Common/vtkDataArrayCollectionIterator.cxx rename to Common/Core/vtkDataArrayCollectionIterator.cxx diff --git a/Common/vtkDataArrayCollectionIterator.h b/Common/Core/vtkDataArrayCollectionIterator.h similarity index 100% rename from Common/vtkDataArrayCollectionIterator.h rename to Common/Core/vtkDataArrayCollectionIterator.h diff --git a/Common/vtkDataArraySelection.cxx b/Common/Core/vtkDataArraySelection.cxx similarity index 100% rename from Common/vtkDataArraySelection.cxx rename to Common/Core/vtkDataArraySelection.cxx diff --git a/Common/vtkDataArraySelection.h b/Common/Core/vtkDataArraySelection.h similarity index 100% rename from Common/vtkDataArraySelection.h rename to Common/Core/vtkDataArraySelection.h diff --git a/Common/vtkDataArrayTemplate.h b/Common/Core/vtkDataArrayTemplate.h similarity index 100% rename from Common/vtkDataArrayTemplate.h rename to Common/Core/vtkDataArrayTemplate.h diff --git a/Common/vtkDataArrayTemplate.txx b/Common/Core/vtkDataArrayTemplate.txx similarity index 100% rename from Common/vtkDataArrayTemplate.txx rename to Common/Core/vtkDataArrayTemplate.txx diff --git a/Common/vtkDataArrayTemplateImplicit.txx b/Common/Core/vtkDataArrayTemplateImplicit.txx similarity index 100% rename from Common/vtkDataArrayTemplateImplicit.txx rename to Common/Core/vtkDataArrayTemplateImplicit.txx diff --git a/Common/vtkDebugLeaks.cxx b/Common/Core/vtkDebugLeaks.cxx similarity index 100% rename from Common/vtkDebugLeaks.cxx rename to Common/Core/vtkDebugLeaks.cxx diff --git a/Common/vtkDebugLeaks.h b/Common/Core/vtkDebugLeaks.h similarity index 100% rename from Common/vtkDebugLeaks.h rename to Common/Core/vtkDebugLeaks.h diff --git a/Common/vtkDebugLeaksManager.cxx b/Common/Core/vtkDebugLeaksManager.cxx similarity index 100% rename from Common/vtkDebugLeaksManager.cxx rename to Common/Core/vtkDebugLeaksManager.cxx diff --git a/Common/vtkDebugLeaksManager.h b/Common/Core/vtkDebugLeaksManager.h similarity index 100% rename from Common/vtkDebugLeaksManager.h rename to Common/Core/vtkDebugLeaksManager.h diff --git a/Common/vtkDenseArray.h b/Common/Core/vtkDenseArray.h similarity index 100% rename from Common/vtkDenseArray.h rename to Common/Core/vtkDenseArray.h diff --git a/Common/vtkDenseArray.txx b/Common/Core/vtkDenseArray.txx similarity index 100% rename from Common/vtkDenseArray.txx rename to Common/Core/vtkDenseArray.txx diff --git a/Common/vtkDoubleArray.cxx b/Common/Core/vtkDoubleArray.cxx similarity index 100% rename from Common/vtkDoubleArray.cxx rename to Common/Core/vtkDoubleArray.cxx diff --git a/Common/vtkDoubleArray.h b/Common/Core/vtkDoubleArray.h similarity index 100% rename from Common/vtkDoubleArray.h rename to Common/Core/vtkDoubleArray.h diff --git a/Common/vtkDynamicLoader.cxx b/Common/Core/vtkDynamicLoader.cxx similarity index 100% rename from Common/vtkDynamicLoader.cxx rename to Common/Core/vtkDynamicLoader.cxx diff --git a/Common/vtkDynamicLoader.h b/Common/Core/vtkDynamicLoader.h similarity index 100% rename from Common/vtkDynamicLoader.h rename to Common/Core/vtkDynamicLoader.h diff --git a/Common/vtkEventForwarderCommand.cxx b/Common/Core/vtkEventForwarderCommand.cxx similarity index 100% rename from Common/vtkEventForwarderCommand.cxx rename to Common/Core/vtkEventForwarderCommand.cxx diff --git a/Common/vtkEventForwarderCommand.h b/Common/Core/vtkEventForwarderCommand.h similarity index 100% rename from Common/vtkEventForwarderCommand.h rename to Common/Core/vtkEventForwarderCommand.h diff --git a/Common/vtkFileOutputWindow.cxx b/Common/Core/vtkFileOutputWindow.cxx similarity index 100% rename from Common/vtkFileOutputWindow.cxx rename to Common/Core/vtkFileOutputWindow.cxx diff --git a/Common/vtkFileOutputWindow.h b/Common/Core/vtkFileOutputWindow.h similarity index 100% rename from Common/vtkFileOutputWindow.h rename to Common/Core/vtkFileOutputWindow.h diff --git a/Common/vtkFloatArray.cxx b/Common/Core/vtkFloatArray.cxx similarity index 100% rename from Common/vtkFloatArray.cxx rename to Common/Core/vtkFloatArray.cxx diff --git a/Common/vtkFloatArray.h b/Common/Core/vtkFloatArray.h similarity index 100% rename from Common/vtkFloatArray.h rename to Common/Core/vtkFloatArray.h diff --git a/Common/vtkFloatingPointExceptions.cxx b/Common/Core/vtkFloatingPointExceptions.cxx similarity index 100% rename from Common/vtkFloatingPointExceptions.cxx rename to Common/Core/vtkFloatingPointExceptions.cxx diff --git a/Common/vtkFloatingPointExceptions.h b/Common/Core/vtkFloatingPointExceptions.h similarity index 100% rename from Common/vtkFloatingPointExceptions.h rename to Common/Core/vtkFloatingPointExceptions.h diff --git a/Common/vtkFloatingPointExceptionsConfigure.h.in b/Common/Core/vtkFloatingPointExceptionsConfigure.h.in similarity index 100% rename from Common/vtkFloatingPointExceptionsConfigure.h.in rename to Common/Core/vtkFloatingPointExceptionsConfigure.h.in diff --git a/Common/vtkGarbageCollector.cxx b/Common/Core/vtkGarbageCollector.cxx similarity index 100% rename from Common/vtkGarbageCollector.cxx rename to Common/Core/vtkGarbageCollector.cxx diff --git a/Common/vtkGarbageCollector.h b/Common/Core/vtkGarbageCollector.h similarity index 100% rename from Common/vtkGarbageCollector.h rename to Common/Core/vtkGarbageCollector.h diff --git a/Common/vtkGarbageCollectorManager.cxx b/Common/Core/vtkGarbageCollectorManager.cxx similarity index 100% rename from Common/vtkGarbageCollectorManager.cxx rename to Common/Core/vtkGarbageCollectorManager.cxx diff --git a/Common/vtkGarbageCollectorManager.h b/Common/Core/vtkGarbageCollectorManager.h similarity index 100% rename from Common/vtkGarbageCollectorManager.h rename to Common/Core/vtkGarbageCollectorManager.h diff --git a/Common/vtkGaussianRandomSequence.cxx b/Common/Core/vtkGaussianRandomSequence.cxx similarity index 100% rename from Common/vtkGaussianRandomSequence.cxx rename to Common/Core/vtkGaussianRandomSequence.cxx diff --git a/Common/vtkGaussianRandomSequence.h b/Common/Core/vtkGaussianRandomSequence.h similarity index 100% rename from Common/vtkGaussianRandomSequence.h rename to Common/Core/vtkGaussianRandomSequence.h diff --git a/Common/vtkIOStream.cxx b/Common/Core/vtkIOStream.cxx similarity index 100% rename from Common/vtkIOStream.cxx rename to Common/Core/vtkIOStream.cxx diff --git a/Common/vtkIOStream.h b/Common/Core/vtkIOStream.h similarity index 100% rename from Common/vtkIOStream.h rename to Common/Core/vtkIOStream.h diff --git a/Common/vtkIOStreamFwd.h b/Common/Core/vtkIOStreamFwd.h similarity index 100% rename from Common/vtkIOStreamFwd.h rename to Common/Core/vtkIOStreamFwd.h diff --git a/Common/vtkIdList.cxx b/Common/Core/vtkIdList.cxx similarity index 100% rename from Common/vtkIdList.cxx rename to Common/Core/vtkIdList.cxx diff --git a/Common/vtkIdList.h b/Common/Core/vtkIdList.h similarity index 100% rename from Common/vtkIdList.h rename to Common/Core/vtkIdList.h diff --git a/Common/vtkIdListCollection.cxx b/Common/Core/vtkIdListCollection.cxx similarity index 100% rename from Common/vtkIdListCollection.cxx rename to Common/Core/vtkIdListCollection.cxx diff --git a/Common/vtkIdListCollection.h b/Common/Core/vtkIdListCollection.h similarity index 100% rename from Common/vtkIdListCollection.h rename to Common/Core/vtkIdListCollection.h diff --git a/Common/vtkIdTypeArray.cxx b/Common/Core/vtkIdTypeArray.cxx similarity index 100% rename from Common/vtkIdTypeArray.cxx rename to Common/Core/vtkIdTypeArray.cxx diff --git a/Common/vtkIdTypeArray.h b/Common/Core/vtkIdTypeArray.h similarity index 100% rename from Common/vtkIdTypeArray.h rename to Common/Core/vtkIdTypeArray.h diff --git a/Common/vtkIndent.cxx b/Common/Core/vtkIndent.cxx similarity index 100% rename from Common/vtkIndent.cxx rename to Common/Core/vtkIndent.cxx diff --git a/Common/vtkIndent.h b/Common/Core/vtkIndent.h similarity index 100% rename from Common/vtkIndent.h rename to Common/Core/vtkIndent.h diff --git a/Common/vtkInformation.cxx b/Common/Core/vtkInformation.cxx similarity index 100% rename from Common/vtkInformation.cxx rename to Common/Core/vtkInformation.cxx diff --git a/Common/vtkInformation.h b/Common/Core/vtkInformation.h similarity index 100% rename from Common/vtkInformation.h rename to Common/Core/vtkInformation.h diff --git a/Common/vtkInformationDataObjectKey.cxx b/Common/Core/vtkInformationDataObjectKey.cxx similarity index 100% rename from Common/vtkInformationDataObjectKey.cxx rename to Common/Core/vtkInformationDataObjectKey.cxx diff --git a/Common/vtkInformationDataObjectKey.h b/Common/Core/vtkInformationDataObjectKey.h similarity index 100% rename from Common/vtkInformationDataObjectKey.h rename to Common/Core/vtkInformationDataObjectKey.h diff --git a/Common/vtkInformationDoubleKey.cxx b/Common/Core/vtkInformationDoubleKey.cxx similarity index 100% rename from Common/vtkInformationDoubleKey.cxx rename to Common/Core/vtkInformationDoubleKey.cxx diff --git a/Common/vtkInformationDoubleKey.h b/Common/Core/vtkInformationDoubleKey.h similarity index 100% rename from Common/vtkInformationDoubleKey.h rename to Common/Core/vtkInformationDoubleKey.h diff --git a/Common/vtkInformationDoubleVectorKey.cxx b/Common/Core/vtkInformationDoubleVectorKey.cxx similarity index 100% rename from Common/vtkInformationDoubleVectorKey.cxx rename to Common/Core/vtkInformationDoubleVectorKey.cxx diff --git a/Common/vtkInformationDoubleVectorKey.h b/Common/Core/vtkInformationDoubleVectorKey.h similarity index 100% rename from Common/vtkInformationDoubleVectorKey.h rename to Common/Core/vtkInformationDoubleVectorKey.h diff --git a/Common/vtkInformationIdTypeKey.cxx b/Common/Core/vtkInformationIdTypeKey.cxx similarity index 100% rename from Common/vtkInformationIdTypeKey.cxx rename to Common/Core/vtkInformationIdTypeKey.cxx diff --git a/Common/vtkInformationIdTypeKey.h b/Common/Core/vtkInformationIdTypeKey.h similarity index 100% rename from Common/vtkInformationIdTypeKey.h rename to Common/Core/vtkInformationIdTypeKey.h diff --git a/Common/vtkInformationInformationKey.cxx b/Common/Core/vtkInformationInformationKey.cxx similarity index 100% rename from Common/vtkInformationInformationKey.cxx rename to Common/Core/vtkInformationInformationKey.cxx diff --git a/Common/vtkInformationInformationKey.h b/Common/Core/vtkInformationInformationKey.h similarity index 100% rename from Common/vtkInformationInformationKey.h rename to Common/Core/vtkInformationInformationKey.h diff --git a/Common/vtkInformationInformationVectorKey.cxx b/Common/Core/vtkInformationInformationVectorKey.cxx similarity index 100% rename from Common/vtkInformationInformationVectorKey.cxx rename to Common/Core/vtkInformationInformationVectorKey.cxx diff --git a/Common/vtkInformationInformationVectorKey.h b/Common/Core/vtkInformationInformationVectorKey.h similarity index 100% rename from Common/vtkInformationInformationVectorKey.h rename to Common/Core/vtkInformationInformationVectorKey.h diff --git a/Common/vtkInformationIntegerKey.cxx b/Common/Core/vtkInformationIntegerKey.cxx similarity index 100% rename from Common/vtkInformationIntegerKey.cxx rename to Common/Core/vtkInformationIntegerKey.cxx diff --git a/Common/vtkInformationIntegerKey.h b/Common/Core/vtkInformationIntegerKey.h similarity index 100% rename from Common/vtkInformationIntegerKey.h rename to Common/Core/vtkInformationIntegerKey.h diff --git a/Common/vtkInformationIntegerPointerKey.cxx b/Common/Core/vtkInformationIntegerPointerKey.cxx similarity index 100% rename from Common/vtkInformationIntegerPointerKey.cxx rename to Common/Core/vtkInformationIntegerPointerKey.cxx diff --git a/Common/vtkInformationIntegerPointerKey.h b/Common/Core/vtkInformationIntegerPointerKey.h similarity index 100% rename from Common/vtkInformationIntegerPointerKey.h rename to Common/Core/vtkInformationIntegerPointerKey.h diff --git a/Common/vtkInformationIntegerVectorKey.cxx b/Common/Core/vtkInformationIntegerVectorKey.cxx similarity index 100% rename from Common/vtkInformationIntegerVectorKey.cxx rename to Common/Core/vtkInformationIntegerVectorKey.cxx diff --git a/Common/vtkInformationIntegerVectorKey.h b/Common/Core/vtkInformationIntegerVectorKey.h similarity index 100% rename from Common/vtkInformationIntegerVectorKey.h rename to Common/Core/vtkInformationIntegerVectorKey.h diff --git a/Common/vtkInformationInternals.h b/Common/Core/vtkInformationInternals.h similarity index 100% rename from Common/vtkInformationInternals.h rename to Common/Core/vtkInformationInternals.h diff --git a/Common/vtkInformationIterator.cxx b/Common/Core/vtkInformationIterator.cxx similarity index 100% rename from Common/vtkInformationIterator.cxx rename to Common/Core/vtkInformationIterator.cxx diff --git a/Common/vtkInformationIterator.h b/Common/Core/vtkInformationIterator.h similarity index 100% rename from Common/vtkInformationIterator.h rename to Common/Core/vtkInformationIterator.h diff --git a/Common/vtkInformationKey.cxx b/Common/Core/vtkInformationKey.cxx similarity index 100% rename from Common/vtkInformationKey.cxx rename to Common/Core/vtkInformationKey.cxx diff --git a/Common/vtkInformationKey.h b/Common/Core/vtkInformationKey.h similarity index 100% rename from Common/vtkInformationKey.h rename to Common/Core/vtkInformationKey.h diff --git a/Common/vtkInformationKeyVectorKey.cxx b/Common/Core/vtkInformationKeyVectorKey.cxx similarity index 100% rename from Common/vtkInformationKeyVectorKey.cxx rename to Common/Core/vtkInformationKeyVectorKey.cxx diff --git a/Common/vtkInformationKeyVectorKey.h b/Common/Core/vtkInformationKeyVectorKey.h similarity index 100% rename from Common/vtkInformationKeyVectorKey.h rename to Common/Core/vtkInformationKeyVectorKey.h diff --git a/Common/vtkInformationObjectBaseKey.cxx b/Common/Core/vtkInformationObjectBaseKey.cxx similarity index 100% rename from Common/vtkInformationObjectBaseKey.cxx rename to Common/Core/vtkInformationObjectBaseKey.cxx diff --git a/Common/vtkInformationObjectBaseKey.h b/Common/Core/vtkInformationObjectBaseKey.h similarity index 100% rename from Common/vtkInformationObjectBaseKey.h rename to Common/Core/vtkInformationObjectBaseKey.h diff --git a/Common/vtkInformationObjectBaseVectorKey.cxx b/Common/Core/vtkInformationObjectBaseVectorKey.cxx similarity index 100% rename from Common/vtkInformationObjectBaseVectorKey.cxx rename to Common/Core/vtkInformationObjectBaseVectorKey.cxx diff --git a/Common/vtkInformationObjectBaseVectorKey.h b/Common/Core/vtkInformationObjectBaseVectorKey.h similarity index 100% rename from Common/vtkInformationObjectBaseVectorKey.h rename to Common/Core/vtkInformationObjectBaseVectorKey.h diff --git a/Common/vtkInformationRequestKey.cxx b/Common/Core/vtkInformationRequestKey.cxx similarity index 100% rename from Common/vtkInformationRequestKey.cxx rename to Common/Core/vtkInformationRequestKey.cxx diff --git a/Common/vtkInformationRequestKey.h b/Common/Core/vtkInformationRequestKey.h similarity index 100% rename from Common/vtkInformationRequestKey.h rename to Common/Core/vtkInformationRequestKey.h diff --git a/Common/vtkInformationStringKey.cxx b/Common/Core/vtkInformationStringKey.cxx similarity index 100% rename from Common/vtkInformationStringKey.cxx rename to Common/Core/vtkInformationStringKey.cxx diff --git a/Common/vtkInformationStringKey.h b/Common/Core/vtkInformationStringKey.h similarity index 100% rename from Common/vtkInformationStringKey.h rename to Common/Core/vtkInformationStringKey.h diff --git a/Common/vtkInformationStringVectorKey.cxx b/Common/Core/vtkInformationStringVectorKey.cxx similarity index 100% rename from Common/vtkInformationStringVectorKey.cxx rename to Common/Core/vtkInformationStringVectorKey.cxx diff --git a/Common/vtkInformationStringVectorKey.h b/Common/Core/vtkInformationStringVectorKey.h similarity index 100% rename from Common/vtkInformationStringVectorKey.h rename to Common/Core/vtkInformationStringVectorKey.h diff --git a/Common/vtkInformationUnsignedLongKey.cxx b/Common/Core/vtkInformationUnsignedLongKey.cxx similarity index 100% rename from Common/vtkInformationUnsignedLongKey.cxx rename to Common/Core/vtkInformationUnsignedLongKey.cxx diff --git a/Common/vtkInformationUnsignedLongKey.h b/Common/Core/vtkInformationUnsignedLongKey.h similarity index 100% rename from Common/vtkInformationUnsignedLongKey.h rename to Common/Core/vtkInformationUnsignedLongKey.h diff --git a/Common/vtkInformationVector.cxx b/Common/Core/vtkInformationVector.cxx similarity index 100% rename from Common/vtkInformationVector.cxx rename to Common/Core/vtkInformationVector.cxx diff --git a/Common/vtkInformationVector.h b/Common/Core/vtkInformationVector.h similarity index 100% rename from Common/vtkInformationVector.h rename to Common/Core/vtkInformationVector.h diff --git a/Common/vtkInstantiator.cxx b/Common/Core/vtkInstantiator.cxx similarity index 100% rename from Common/vtkInstantiator.cxx rename to Common/Core/vtkInstantiator.cxx diff --git a/Common/vtkInstantiator.h b/Common/Core/vtkInstantiator.h similarity index 100% rename from Common/vtkInstantiator.h rename to Common/Core/vtkInstantiator.h diff --git a/Common/vtkIntArray.cxx b/Common/Core/vtkIntArray.cxx similarity index 100% rename from Common/vtkIntArray.cxx rename to Common/Core/vtkIntArray.cxx diff --git a/Common/vtkIntArray.h b/Common/Core/vtkIntArray.h similarity index 100% rename from Common/vtkIntArray.h rename to Common/Core/vtkIntArray.h diff --git a/Common/vtkLargeInteger.cxx b/Common/Core/vtkLargeInteger.cxx similarity index 100% rename from Common/vtkLargeInteger.cxx rename to Common/Core/vtkLargeInteger.cxx diff --git a/Common/vtkLargeInteger.h b/Common/Core/vtkLargeInteger.h similarity index 100% rename from Common/vtkLargeInteger.h rename to Common/Core/vtkLargeInteger.h diff --git a/Common/vtkLongArray.cxx b/Common/Core/vtkLongArray.cxx similarity index 100% rename from Common/vtkLongArray.cxx rename to Common/Core/vtkLongArray.cxx diff --git a/Common/vtkLongArray.h b/Common/Core/vtkLongArray.h similarity index 100% rename from Common/vtkLongArray.h rename to Common/Core/vtkLongArray.h diff --git a/Common/vtkLongLongArray.cxx b/Common/Core/vtkLongLongArray.cxx similarity index 100% rename from Common/vtkLongLongArray.cxx rename to Common/Core/vtkLongLongArray.cxx diff --git a/Common/vtkLongLongArray.h b/Common/Core/vtkLongLongArray.h similarity index 100% rename from Common/vtkLongLongArray.h rename to Common/Core/vtkLongLongArray.h diff --git a/Common/vtkLookupTable.cxx b/Common/Core/vtkLookupTable.cxx similarity index 100% rename from Common/vtkLookupTable.cxx rename to Common/Core/vtkLookupTable.cxx diff --git a/Common/vtkLookupTable.h b/Common/Core/vtkLookupTable.h similarity index 100% rename from Common/vtkLookupTable.h rename to Common/Core/vtkLookupTable.h diff --git a/Common/vtkMath.cxx b/Common/Core/vtkMath.cxx similarity index 100% rename from Common/vtkMath.cxx rename to Common/Core/vtkMath.cxx diff --git a/Common/vtkMath.h b/Common/Core/vtkMath.h similarity index 100% rename from Common/vtkMath.h rename to Common/Core/vtkMath.h diff --git a/Common/vtkMathConfigure.h.in b/Common/Core/vtkMathConfigure.h.in similarity index 100% rename from Common/vtkMathConfigure.h.in rename to Common/Core/vtkMathConfigure.h.in diff --git a/Common/vtkMathUtilities.h b/Common/Core/vtkMathUtilities.h similarity index 100% rename from Common/vtkMathUtilities.h rename to Common/Core/vtkMathUtilities.h diff --git a/Common/vtkMinimalStandardRandomSequence.cxx b/Common/Core/vtkMinimalStandardRandomSequence.cxx similarity index 100% rename from Common/vtkMinimalStandardRandomSequence.cxx rename to Common/Core/vtkMinimalStandardRandomSequence.cxx diff --git a/Common/vtkMinimalStandardRandomSequence.h b/Common/Core/vtkMinimalStandardRandomSequence.h similarity index 100% rename from Common/vtkMinimalStandardRandomSequence.h rename to Common/Core/vtkMinimalStandardRandomSequence.h diff --git a/Common/vtkMultiThreader.cxx b/Common/Core/vtkMultiThreader.cxx similarity index 100% rename from Common/vtkMultiThreader.cxx rename to Common/Core/vtkMultiThreader.cxx diff --git a/Common/vtkMultiThreader.h b/Common/Core/vtkMultiThreader.h similarity index 100% rename from Common/vtkMultiThreader.h rename to Common/Core/vtkMultiThreader.h diff --git a/Common/vtkMutexLock.cxx b/Common/Core/vtkMutexLock.cxx similarity index 100% rename from Common/vtkMutexLock.cxx rename to Common/Core/vtkMutexLock.cxx diff --git a/Common/vtkMutexLock.h b/Common/Core/vtkMutexLock.h similarity index 100% rename from Common/vtkMutexLock.h rename to Common/Core/vtkMutexLock.h diff --git a/Common/vtkNew.h b/Common/Core/vtkNew.h similarity index 100% rename from Common/vtkNew.h rename to Common/Core/vtkNew.h diff --git a/Common/vtkOStrStreamWrapper.cxx b/Common/Core/vtkOStrStreamWrapper.cxx similarity index 100% rename from Common/vtkOStrStreamWrapper.cxx rename to Common/Core/vtkOStrStreamWrapper.cxx diff --git a/Common/vtkOStrStreamWrapper.h b/Common/Core/vtkOStrStreamWrapper.h similarity index 100% rename from Common/vtkOStrStreamWrapper.h rename to Common/Core/vtkOStrStreamWrapper.h diff --git a/Common/vtkOStreamWrapper.cxx b/Common/Core/vtkOStreamWrapper.cxx similarity index 100% rename from Common/vtkOStreamWrapper.cxx rename to Common/Core/vtkOStreamWrapper.cxx diff --git a/Common/vtkOStreamWrapper.h b/Common/Core/vtkOStreamWrapper.h similarity index 100% rename from Common/vtkOStreamWrapper.h rename to Common/Core/vtkOStreamWrapper.h diff --git a/Common/vtkObject.cxx b/Common/Core/vtkObject.cxx similarity index 100% rename from Common/vtkObject.cxx rename to Common/Core/vtkObject.cxx diff --git a/Common/vtkObject.h b/Common/Core/vtkObject.h similarity index 100% rename from Common/vtkObject.h rename to Common/Core/vtkObject.h diff --git a/Common/vtkObjectBase.cxx b/Common/Core/vtkObjectBase.cxx similarity index 100% rename from Common/vtkObjectBase.cxx rename to Common/Core/vtkObjectBase.cxx diff --git a/Common/vtkObjectBase.h b/Common/Core/vtkObjectBase.h similarity index 100% rename from Common/vtkObjectBase.h rename to Common/Core/vtkObjectBase.h diff --git a/Common/vtkObjectFactory.cxx b/Common/Core/vtkObjectFactory.cxx similarity index 100% rename from Common/vtkObjectFactory.cxx rename to Common/Core/vtkObjectFactory.cxx diff --git a/Common/vtkObjectFactory.h b/Common/Core/vtkObjectFactory.h similarity index 100% rename from Common/vtkObjectFactory.h rename to Common/Core/vtkObjectFactory.h diff --git a/Common/vtkObjectFactoryCollection.cxx b/Common/Core/vtkObjectFactoryCollection.cxx similarity index 100% rename from Common/vtkObjectFactoryCollection.cxx rename to Common/Core/vtkObjectFactoryCollection.cxx diff --git a/Common/vtkObjectFactoryCollection.h b/Common/Core/vtkObjectFactoryCollection.h similarity index 100% rename from Common/vtkObjectFactoryCollection.h rename to Common/Core/vtkObjectFactoryCollection.h diff --git a/Common/vtkOldStyleCallbackCommand.cxx b/Common/Core/vtkOldStyleCallbackCommand.cxx similarity index 100% rename from Common/vtkOldStyleCallbackCommand.cxx rename to Common/Core/vtkOldStyleCallbackCommand.cxx diff --git a/Common/vtkOldStyleCallbackCommand.h b/Common/Core/vtkOldStyleCallbackCommand.h similarity index 100% rename from Common/vtkOldStyleCallbackCommand.h rename to Common/Core/vtkOldStyleCallbackCommand.h diff --git a/Common/vtkOutputWindow.cxx b/Common/Core/vtkOutputWindow.cxx similarity index 100% rename from Common/vtkOutputWindow.cxx rename to Common/Core/vtkOutputWindow.cxx diff --git a/Common/vtkOutputWindow.h b/Common/Core/vtkOutputWindow.h similarity index 100% rename from Common/vtkOutputWindow.h rename to Common/Core/vtkOutputWindow.h diff --git a/Common/vtkOverrideInformation.cxx b/Common/Core/vtkOverrideInformation.cxx similarity index 100% rename from Common/vtkOverrideInformation.cxx rename to Common/Core/vtkOverrideInformation.cxx diff --git a/Common/vtkOverrideInformation.h b/Common/Core/vtkOverrideInformation.h similarity index 100% rename from Common/vtkOverrideInformation.h rename to Common/Core/vtkOverrideInformation.h diff --git a/Common/vtkOverrideInformationCollection.cxx b/Common/Core/vtkOverrideInformationCollection.cxx similarity index 100% rename from Common/vtkOverrideInformationCollection.cxx rename to Common/Core/vtkOverrideInformationCollection.cxx diff --git a/Common/vtkOverrideInformationCollection.h b/Common/Core/vtkOverrideInformationCollection.h similarity index 100% rename from Common/vtkOverrideInformationCollection.h rename to Common/Core/vtkOverrideInformationCollection.h diff --git a/Common/vtkPointAccumulator.hxx b/Common/Core/vtkPointAccumulator.hxx similarity index 100% rename from Common/vtkPointAccumulator.hxx rename to Common/Core/vtkPointAccumulator.hxx diff --git a/Common/vtkPoints.cxx b/Common/Core/vtkPoints.cxx similarity index 100% rename from Common/vtkPoints.cxx rename to Common/Core/vtkPoints.cxx diff --git a/Common/vtkPoints.h b/Common/Core/vtkPoints.h similarity index 100% rename from Common/vtkPoints.h rename to Common/Core/vtkPoints.h diff --git a/Common/vtkPoints2D.cxx b/Common/Core/vtkPoints2D.cxx similarity index 100% rename from Common/vtkPoints2D.cxx rename to Common/Core/vtkPoints2D.cxx diff --git a/Common/vtkPoints2D.h b/Common/Core/vtkPoints2D.h similarity index 100% rename from Common/vtkPoints2D.h rename to Common/Core/vtkPoints2D.h diff --git a/Common/vtkPriorityQueue.cxx b/Common/Core/vtkPriorityQueue.cxx similarity index 100% rename from Common/vtkPriorityQueue.cxx rename to Common/Core/vtkPriorityQueue.cxx diff --git a/Common/vtkPriorityQueue.h b/Common/Core/vtkPriorityQueue.h similarity index 100% rename from Common/vtkPriorityQueue.h rename to Common/Core/vtkPriorityQueue.h diff --git a/Common/vtkPythonCommand.cxx b/Common/Core/vtkPythonCommand.cxx similarity index 100% rename from Common/vtkPythonCommand.cxx rename to Common/Core/vtkPythonCommand.cxx diff --git a/Common/vtkPythonCommand.h b/Common/Core/vtkPythonCommand.h similarity index 100% rename from Common/vtkPythonCommand.h rename to Common/Core/vtkPythonCommand.h diff --git a/Common/vtkRandomSequence.cxx b/Common/Core/vtkRandomSequence.cxx similarity index 100% rename from Common/vtkRandomSequence.cxx rename to Common/Core/vtkRandomSequence.cxx diff --git a/Common/vtkRandomSequence.h b/Common/Core/vtkRandomSequence.h similarity index 100% rename from Common/vtkRandomSequence.h rename to Common/Core/vtkRandomSequence.h diff --git a/Common/vtkReferenceCount.cxx b/Common/Core/vtkReferenceCount.cxx similarity index 100% rename from Common/vtkReferenceCount.cxx rename to Common/Core/vtkReferenceCount.cxx diff --git a/Common/vtkReferenceCount.h b/Common/Core/vtkReferenceCount.h similarity index 100% rename from Common/vtkReferenceCount.h rename to Common/Core/vtkReferenceCount.h diff --git a/Common/vtkScalarsToColors.cxx b/Common/Core/vtkScalarsToColors.cxx similarity index 100% rename from Common/vtkScalarsToColors.cxx rename to Common/Core/vtkScalarsToColors.cxx diff --git a/Common/vtkScalarsToColors.h b/Common/Core/vtkScalarsToColors.h similarity index 100% rename from Common/vtkScalarsToColors.h rename to Common/Core/vtkScalarsToColors.h diff --git a/Common/vtkSetGet.h b/Common/Core/vtkSetGet.h similarity index 100% rename from Common/vtkSetGet.h rename to Common/Core/vtkSetGet.h diff --git a/Common/vtkShortArray.cxx b/Common/Core/vtkShortArray.cxx similarity index 100% rename from Common/vtkShortArray.cxx rename to Common/Core/vtkShortArray.cxx diff --git a/Common/vtkShortArray.h b/Common/Core/vtkShortArray.h similarity index 100% rename from Common/vtkShortArray.h rename to Common/Core/vtkShortArray.h diff --git a/Common/vtkSignedCharArray.cxx b/Common/Core/vtkSignedCharArray.cxx similarity index 100% rename from Common/vtkSignedCharArray.cxx rename to Common/Core/vtkSignedCharArray.cxx diff --git a/Common/vtkSignedCharArray.h b/Common/Core/vtkSignedCharArray.h similarity index 100% rename from Common/vtkSignedCharArray.h rename to Common/Core/vtkSignedCharArray.h diff --git a/Common/vtkSmartPointer.h b/Common/Core/vtkSmartPointer.h similarity index 100% rename from Common/vtkSmartPointer.h rename to Common/Core/vtkSmartPointer.h diff --git a/Common/vtkSmartPointerBase.cxx b/Common/Core/vtkSmartPointerBase.cxx similarity index 100% rename from Common/vtkSmartPointerBase.cxx rename to Common/Core/vtkSmartPointerBase.cxx diff --git a/Common/vtkSmartPointerBase.h b/Common/Core/vtkSmartPointerBase.h similarity index 100% rename from Common/vtkSmartPointerBase.h rename to Common/Core/vtkSmartPointerBase.h diff --git a/Common/vtkSortDataArray.cxx b/Common/Core/vtkSortDataArray.cxx similarity index 100% rename from Common/vtkSortDataArray.cxx rename to Common/Core/vtkSortDataArray.cxx diff --git a/Common/vtkSortDataArray.h b/Common/Core/vtkSortDataArray.h similarity index 100% rename from Common/vtkSortDataArray.h rename to Common/Core/vtkSortDataArray.h diff --git a/Common/vtkSparseArray.h b/Common/Core/vtkSparseArray.h similarity index 100% rename from Common/vtkSparseArray.h rename to Common/Core/vtkSparseArray.h diff --git a/Common/vtkSparseArray.txx b/Common/Core/vtkSparseArray.txx similarity index 100% rename from Common/vtkSparseArray.txx rename to Common/Core/vtkSparseArray.txx diff --git a/Common/vtkStdString.cxx b/Common/Core/vtkStdString.cxx similarity index 100% rename from Common/vtkStdString.cxx rename to Common/Core/vtkStdString.cxx diff --git a/Common/vtkStdString.h b/Common/Core/vtkStdString.h similarity index 100% rename from Common/vtkStdString.h rename to Common/Core/vtkStdString.h diff --git a/Common/vtkStringArray.cxx b/Common/Core/vtkStringArray.cxx similarity index 100% rename from Common/vtkStringArray.cxx rename to Common/Core/vtkStringArray.cxx diff --git a/Common/vtkStringArray.h b/Common/Core/vtkStringArray.h similarity index 100% rename from Common/vtkStringArray.h rename to Common/Core/vtkStringArray.h diff --git a/Common/vtkSystemIncludes.h b/Common/Core/vtkSystemIncludes.h similarity index 100% rename from Common/vtkSystemIncludes.h rename to Common/Core/vtkSystemIncludes.h diff --git a/Common/vtkTemplateAliasMacro.h b/Common/Core/vtkTemplateAliasMacro.h similarity index 100% rename from Common/vtkTemplateAliasMacro.h rename to Common/Core/vtkTemplateAliasMacro.h diff --git a/Common/vtkTimePointUtility.cxx b/Common/Core/vtkTimePointUtility.cxx similarity index 100% rename from Common/vtkTimePointUtility.cxx rename to Common/Core/vtkTimePointUtility.cxx diff --git a/Common/vtkTimePointUtility.h b/Common/Core/vtkTimePointUtility.h similarity index 100% rename from Common/vtkTimePointUtility.h rename to Common/Core/vtkTimePointUtility.h diff --git a/Common/vtkTimeStamp.cxx b/Common/Core/vtkTimeStamp.cxx similarity index 100% rename from Common/vtkTimeStamp.cxx rename to Common/Core/vtkTimeStamp.cxx diff --git a/Common/vtkTimeStamp.h b/Common/Core/vtkTimeStamp.h similarity index 100% rename from Common/vtkTimeStamp.h rename to Common/Core/vtkTimeStamp.h diff --git a/vtkToolkits.h.in b/Common/Core/vtkToolkits.h.in similarity index 100% rename from vtkToolkits.h.in rename to Common/Core/vtkToolkits.h.in diff --git a/Common/vtkType.h b/Common/Core/vtkType.h similarity index 100% rename from Common/vtkType.h rename to Common/Core/vtkType.h diff --git a/Common/vtkTypeTemplate.h b/Common/Core/vtkTypeTemplate.h similarity index 100% rename from Common/vtkTypeTemplate.h rename to Common/Core/vtkTypeTemplate.h diff --git a/Common/vtkTypeTraits.h b/Common/Core/vtkTypeTraits.h similarity index 100% rename from Common/vtkTypeTraits.h rename to Common/Core/vtkTypeTraits.h diff --git a/Common/vtkTypedArray.cxx.in b/Common/Core/vtkTypedArray.cxx.in similarity index 100% rename from Common/vtkTypedArray.cxx.in rename to Common/Core/vtkTypedArray.cxx.in diff --git a/Common/vtkTypedArray.h b/Common/Core/vtkTypedArray.h similarity index 100% rename from Common/vtkTypedArray.h rename to Common/Core/vtkTypedArray.h diff --git a/Common/vtkTypedArray.h.in b/Common/Core/vtkTypedArray.h.in similarity index 100% rename from Common/vtkTypedArray.h.in rename to Common/Core/vtkTypedArray.h.in diff --git a/Common/vtkTypedArray.txx b/Common/Core/vtkTypedArray.txx similarity index 100% rename from Common/vtkTypedArray.txx rename to Common/Core/vtkTypedArray.txx diff --git a/Common/vtkUnicodeString.cmake.in b/Common/Core/vtkUnicodeString.cmake.in similarity index 100% rename from Common/vtkUnicodeString.cmake.in rename to Common/Core/vtkUnicodeString.cmake.in diff --git a/Common/vtkUnicodeString.cxx b/Common/Core/vtkUnicodeString.cxx similarity index 100% rename from Common/vtkUnicodeString.cxx rename to Common/Core/vtkUnicodeString.cxx diff --git a/Common/vtkUnicodeString.h b/Common/Core/vtkUnicodeString.h similarity index 100% rename from Common/vtkUnicodeString.h rename to Common/Core/vtkUnicodeString.h diff --git a/Common/vtkUnicodeStringArray.cxx b/Common/Core/vtkUnicodeStringArray.cxx similarity index 100% rename from Common/vtkUnicodeStringArray.cxx rename to Common/Core/vtkUnicodeStringArray.cxx diff --git a/Common/vtkUnicodeStringArray.h b/Common/Core/vtkUnicodeStringArray.h similarity index 100% rename from Common/vtkUnicodeStringArray.h rename to Common/Core/vtkUnicodeStringArray.h diff --git a/Common/vtkUnsignedCharArray.cxx b/Common/Core/vtkUnsignedCharArray.cxx similarity index 100% rename from Common/vtkUnsignedCharArray.cxx rename to Common/Core/vtkUnsignedCharArray.cxx diff --git a/Common/vtkUnsignedCharArray.h b/Common/Core/vtkUnsignedCharArray.h similarity index 100% rename from Common/vtkUnsignedCharArray.h rename to Common/Core/vtkUnsignedCharArray.h diff --git a/Common/vtkUnsignedIntArray.cxx b/Common/Core/vtkUnsignedIntArray.cxx similarity index 100% rename from Common/vtkUnsignedIntArray.cxx rename to Common/Core/vtkUnsignedIntArray.cxx diff --git a/Common/vtkUnsignedIntArray.h b/Common/Core/vtkUnsignedIntArray.h similarity index 100% rename from Common/vtkUnsignedIntArray.h rename to Common/Core/vtkUnsignedIntArray.h diff --git a/Common/vtkUnsignedLongArray.cxx b/Common/Core/vtkUnsignedLongArray.cxx similarity index 100% rename from Common/vtkUnsignedLongArray.cxx rename to Common/Core/vtkUnsignedLongArray.cxx diff --git a/Common/vtkUnsignedLongArray.h b/Common/Core/vtkUnsignedLongArray.h similarity index 100% rename from Common/vtkUnsignedLongArray.h rename to Common/Core/vtkUnsignedLongArray.h diff --git a/Common/vtkUnsignedLongLongArray.cxx b/Common/Core/vtkUnsignedLongLongArray.cxx similarity index 100% rename from Common/vtkUnsignedLongLongArray.cxx rename to Common/Core/vtkUnsignedLongLongArray.cxx diff --git a/Common/vtkUnsignedLongLongArray.h b/Common/Core/vtkUnsignedLongLongArray.h similarity index 100% rename from Common/vtkUnsignedLongLongArray.h rename to Common/Core/vtkUnsignedLongLongArray.h diff --git a/Common/vtkUnsignedShortArray.cxx b/Common/Core/vtkUnsignedShortArray.cxx similarity index 100% rename from Common/vtkUnsignedShortArray.cxx rename to Common/Core/vtkUnsignedShortArray.cxx diff --git a/Common/vtkUnsignedShortArray.h b/Common/Core/vtkUnsignedShortArray.h similarity index 100% rename from Common/vtkUnsignedShortArray.h rename to Common/Core/vtkUnsignedShortArray.h diff --git a/Common/vtkUnsigned__Int64Array.cxx b/Common/Core/vtkUnsigned__Int64Array.cxx similarity index 100% rename from Common/vtkUnsigned__Int64Array.cxx rename to Common/Core/vtkUnsigned__Int64Array.cxx diff --git a/Common/vtkUnsigned__Int64Array.h b/Common/Core/vtkUnsigned__Int64Array.h similarity index 100% rename from Common/vtkUnsigned__Int64Array.h rename to Common/Core/vtkUnsigned__Int64Array.h diff --git a/Common/vtkVariant.cxx b/Common/Core/vtkVariant.cxx similarity index 100% rename from Common/vtkVariant.cxx rename to Common/Core/vtkVariant.cxx diff --git a/Common/vtkVariant.h b/Common/Core/vtkVariant.h similarity index 100% rename from Common/vtkVariant.h rename to Common/Core/vtkVariant.h diff --git a/Common/vtkVariantArray.cxx b/Common/Core/vtkVariantArray.cxx similarity index 100% rename from Common/vtkVariantArray.cxx rename to Common/Core/vtkVariantArray.cxx diff --git a/Common/vtkVariantArray.h b/Common/Core/vtkVariantArray.h similarity index 100% rename from Common/vtkVariantArray.h rename to Common/Core/vtkVariantArray.h diff --git a/Common/vtkVariantCast.h b/Common/Core/vtkVariantCast.h similarity index 100% rename from Common/vtkVariantCast.h rename to Common/Core/vtkVariantCast.h diff --git a/Common/vtkVariantCreate.h b/Common/Core/vtkVariantCreate.h similarity index 100% rename from Common/vtkVariantCreate.h rename to Common/Core/vtkVariantCreate.h diff --git a/Common/vtkVariantExtract.h b/Common/Core/vtkVariantExtract.h similarity index 100% rename from Common/vtkVariantExtract.h rename to Common/Core/vtkVariantExtract.h diff --git a/Common/vtkVariantInlineOperators.h b/Common/Core/vtkVariantInlineOperators.h similarity index 100% rename from Common/vtkVariantInlineOperators.h rename to Common/Core/vtkVariantInlineOperators.h diff --git a/Common/vtkVariantToNumeric.cxx b/Common/Core/vtkVariantToNumeric.cxx similarity index 100% rename from Common/vtkVariantToNumeric.cxx rename to Common/Core/vtkVariantToNumeric.cxx diff --git a/Common/vtkVersion.cxx b/Common/Core/vtkVersion.cxx similarity index 100% rename from Common/vtkVersion.cxx rename to Common/Core/vtkVersion.cxx diff --git a/Common/vtkVersion.h b/Common/Core/vtkVersion.h similarity index 100% rename from Common/vtkVersion.h rename to Common/Core/vtkVersion.h diff --git a/Common/vtkVoidArray.cxx b/Common/Core/vtkVoidArray.cxx similarity index 100% rename from Common/vtkVoidArray.cxx rename to Common/Core/vtkVoidArray.cxx diff --git a/Common/vtkVoidArray.h b/Common/Core/vtkVoidArray.h similarity index 100% rename from Common/vtkVoidArray.h rename to Common/Core/vtkVoidArray.h diff --git a/Common/vtkWeakPointer.h b/Common/Core/vtkWeakPointer.h similarity index 100% rename from Common/vtkWeakPointer.h rename to Common/Core/vtkWeakPointer.h diff --git a/Common/vtkWeakPointerBase.cxx b/Common/Core/vtkWeakPointerBase.cxx similarity index 100% rename from Common/vtkWeakPointerBase.cxx rename to Common/Core/vtkWeakPointerBase.cxx diff --git a/Common/vtkWeakPointerBase.h b/Common/Core/vtkWeakPointerBase.h similarity index 100% rename from Common/vtkWeakPointerBase.h rename to Common/Core/vtkWeakPointerBase.h diff --git a/Common/vtkWin32Header.h b/Common/Core/vtkWin32Header.h similarity index 100% rename from Common/vtkWin32Header.h rename to Common/Core/vtkWin32Header.h diff --git a/Common/vtkWin32OutputWindow.cxx b/Common/Core/vtkWin32OutputWindow.cxx similarity index 100% rename from Common/vtkWin32OutputWindow.cxx rename to Common/Core/vtkWin32OutputWindow.cxx diff --git a/Common/vtkWin32OutputWindow.h b/Common/Core/vtkWin32OutputWindow.h similarity index 100% rename from Common/vtkWin32OutputWindow.h rename to Common/Core/vtkWin32OutputWindow.h diff --git a/Common/vtkWin32OutputWindowProcessEncoded.c b/Common/Core/vtkWin32OutputWindowProcessEncoded.c similarity index 100% rename from Common/vtkWin32OutputWindowProcessEncoded.c rename to Common/Core/vtkWin32OutputWindowProcessEncoded.c diff --git a/Common/vtkWin32ProcessOutputWindow.cxx b/Common/Core/vtkWin32ProcessOutputWindow.cxx similarity index 100% rename from Common/vtkWin32ProcessOutputWindow.cxx rename to Common/Core/vtkWin32ProcessOutputWindow.cxx diff --git a/Common/vtkWin32ProcessOutputWindow.h b/Common/Core/vtkWin32ProcessOutputWindow.h similarity index 100% rename from Common/vtkWin32ProcessOutputWindow.h rename to Common/Core/vtkWin32ProcessOutputWindow.h diff --git a/Common/vtkWindow.cxx b/Common/Core/vtkWindow.cxx similarity index 100% rename from Common/vtkWindow.cxx rename to Common/Core/vtkWindow.cxx diff --git a/Common/vtkWindow.h b/Common/Core/vtkWindow.h similarity index 100% rename from Common/vtkWindow.h rename to Common/Core/vtkWindow.h diff --git a/Common/vtkWindows.h b/Common/Core/vtkWindows.h similarity index 100% rename from Common/vtkWindows.h rename to Common/Core/vtkWindows.h diff --git a/Common/vtkXMLFileOutputWindow.cxx b/Common/Core/vtkXMLFileOutputWindow.cxx similarity index 100% rename from Common/vtkXMLFileOutputWindow.cxx rename to Common/Core/vtkXMLFileOutputWindow.cxx diff --git a/Common/vtkXMLFileOutputWindow.h b/Common/Core/vtkXMLFileOutputWindow.h similarity index 100% rename from Common/vtkXMLFileOutputWindow.h rename to Common/Core/vtkXMLFileOutputWindow.h diff --git a/Common/vtk__Int64Array.cxx b/Common/Core/vtk__Int64Array.cxx similarity index 100% rename from Common/vtk__Int64Array.cxx rename to Common/Core/vtk__Int64Array.cxx diff --git a/Common/vtk__Int64Array.h b/Common/Core/vtk__Int64Array.h similarity index 100% rename from Common/vtk__Int64Array.h rename to Common/Core/vtk__Int64Array.h diff --git a/Graphics/Testing/Cxx/CellLocator.cxx b/Common/DataModel/Testing/Cxx/CellLocator.cxx similarity index 100% rename from Graphics/Testing/Cxx/CellLocator.cxx rename to Common/DataModel/Testing/Cxx/CellLocator.cxx diff --git a/Filtering/Testing/Cxx/CellLocator2.cxx b/Common/DataModel/Testing/Cxx/CellLocator2.cxx similarity index 100% rename from Filtering/Testing/Cxx/CellLocator2.cxx rename to Common/DataModel/Testing/Cxx/CellLocator2.cxx diff --git a/Graphics/Testing/Cxx/PointLocator.cxx b/Common/DataModel/Testing/Cxx/PointLocator.cxx similarity index 100% rename from Graphics/Testing/Cxx/PointLocator.cxx rename to Common/DataModel/Testing/Cxx/PointLocator.cxx diff --git a/Filtering/Testing/Cxx/TestAMRBlanking.cxx b/Common/DataModel/Testing/Cxx/TestAMRBlanking.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestAMRBlanking.cxx rename to Common/DataModel/Testing/Cxx/TestAMRBlanking.cxx diff --git a/Filtering/Testing/Cxx/TestAMRBox.cxx b/Common/DataModel/Testing/Cxx/TestAMRBox.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestAMRBox.cxx rename to Common/DataModel/Testing/Cxx/TestAMRBox.cxx diff --git a/Filtering/Testing/Cxx/TestAMRIterator.cxx b/Common/DataModel/Testing/Cxx/TestAMRIterator.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestAMRIterator.cxx rename to Common/DataModel/Testing/Cxx/TestAMRIterator.cxx diff --git a/Common/Testing/Cxx/TestBoundingBox.cxx b/Common/DataModel/Testing/Cxx/TestBoundingBox.cxx similarity index 100% rename from Common/Testing/Cxx/TestBoundingBox.cxx rename to Common/DataModel/Testing/Cxx/TestBoundingBox.cxx diff --git a/Filtering/Testing/Cxx/TestGenericCell.cxx b/Common/DataModel/Testing/Cxx/TestGenericCell.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestGenericCell.cxx rename to Common/DataModel/Testing/Cxx/TestGenericCell.cxx diff --git a/Infovis/Testing/Cxx/TestGraph.cxx b/Common/DataModel/Testing/Cxx/TestGraph.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestGraph.cxx rename to Common/DataModel/Testing/Cxx/TestGraph.cxx diff --git a/Filtering/Testing/Cxx/TestGraph2.cxx b/Common/DataModel/Testing/Cxx/TestGraph2.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestGraph2.cxx rename to Common/DataModel/Testing/Cxx/TestGraph2.cxx diff --git a/Infovis/Testing/Cxx/TestGraphAttributes.cxx b/Common/DataModel/Testing/Cxx/TestGraphAttributes.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestGraphAttributes.cxx rename to Common/DataModel/Testing/Cxx/TestGraphAttributes.cxx diff --git a/Filtering/Testing/Cxx/TestHigherOrderCell.cxx b/Common/DataModel/Testing/Cxx/TestHigherOrderCell.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestHigherOrderCell.cxx rename to Common/DataModel/Testing/Cxx/TestHigherOrderCell.cxx diff --git a/Filtering/Testing/Cxx/TestImageDataFindCell.cxx b/Common/DataModel/Testing/Cxx/TestImageDataFindCell.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestImageDataFindCell.cxx rename to Common/DataModel/Testing/Cxx/TestImageDataFindCell.cxx diff --git a/Filtering/Testing/Cxx/TestImageDataInterpolation.cxx b/Common/DataModel/Testing/Cxx/TestImageDataInterpolation.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestImageDataInterpolation.cxx rename to Common/DataModel/Testing/Cxx/TestImageDataInterpolation.cxx diff --git a/Filtering/Testing/Cxx/TestImageIterator.cxx b/Common/DataModel/Testing/Cxx/TestImageIterator.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestImageIterator.cxx rename to Common/DataModel/Testing/Cxx/TestImageIterator.cxx diff --git a/Filtering/Testing/Cxx/TestInterpolationDerivs.cxx b/Common/DataModel/Testing/Cxx/TestInterpolationDerivs.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestInterpolationDerivs.cxx rename to Common/DataModel/Testing/Cxx/TestInterpolationDerivs.cxx diff --git a/Filtering/Testing/Cxx/TestInterpolationFunctions.cxx b/Common/DataModel/Testing/Cxx/TestInterpolationFunctions.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestInterpolationFunctions.cxx rename to Common/DataModel/Testing/Cxx/TestInterpolationFunctions.cxx diff --git a/Graphics/Testing/Cxx/TestMeanValueCoordinatesInterpolation1.cxx b/Common/DataModel/Testing/Cxx/TestMeanValueCoordinatesInterpolation1.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestMeanValueCoordinatesInterpolation1.cxx rename to Common/DataModel/Testing/Cxx/TestMeanValueCoordinatesInterpolation1.cxx diff --git a/Graphics/Testing/Cxx/TestMeanValueCoordinatesInterpolation2.cxx b/Common/DataModel/Testing/Cxx/TestMeanValueCoordinatesInterpolation2.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestMeanValueCoordinatesInterpolation2.cxx rename to Common/DataModel/Testing/Cxx/TestMeanValueCoordinatesInterpolation2.cxx diff --git a/Common/Testing/Cxx/TestPlane.cxx b/Common/DataModel/Testing/Cxx/TestPlane.cxx similarity index 100% rename from Common/Testing/Cxx/TestPlane.cxx rename to Common/DataModel/Testing/Cxx/TestPlane.cxx diff --git a/Filtering/Testing/Cxx/TestPointLocators.cxx b/Common/DataModel/Testing/Cxx/TestPointLocators.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestPointLocators.cxx rename to Common/DataModel/Testing/Cxx/TestPointLocators.cxx diff --git a/Filtering/Testing/Cxx/TestPolyDataRemoveCell.cxx b/Common/DataModel/Testing/Cxx/TestPolyDataRemoveCell.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestPolyDataRemoveCell.cxx rename to Common/DataModel/Testing/Cxx/TestPolyDataRemoveCell.cxx diff --git a/Filtering/Testing/Cxx/TestPolygon.cxx b/Common/DataModel/Testing/Cxx/TestPolygon.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestPolygon.cxx rename to Common/DataModel/Testing/Cxx/TestPolygon.cxx diff --git a/Graphics/Testing/Cxx/TestPolyhedron0.cxx b/Common/DataModel/Testing/Cxx/TestPolyhedron0.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestPolyhedron0.cxx rename to Common/DataModel/Testing/Cxx/TestPolyhedron0.cxx diff --git a/Graphics/Testing/Cxx/TestPolyhedron1.cxx b/Common/DataModel/Testing/Cxx/TestPolyhedron1.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestPolyhedron1.cxx rename to Common/DataModel/Testing/Cxx/TestPolyhedron1.cxx diff --git a/Filtering/Testing/Cxx/TestSelectionSubtract.cxx b/Common/DataModel/Testing/Cxx/TestSelectionSubtract.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestSelectionSubtract.cxx rename to Common/DataModel/Testing/Cxx/TestSelectionSubtract.cxx diff --git a/GenericFiltering/Testing/Cxx/TestSmoothErrorMetric.cxx b/Common/DataModel/Testing/Cxx/TestSmoothErrorMetric.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/TestSmoothErrorMetric.cxx rename to Common/DataModel/Testing/Cxx/TestSmoothErrorMetric.cxx diff --git a/Common/Testing/Cxx/TestStructuredData.cxx b/Common/DataModel/Testing/Cxx/TestStructuredData.cxx similarity index 100% rename from Common/Testing/Cxx/TestStructuredData.cxx rename to Common/DataModel/Testing/Cxx/TestStructuredData.cxx diff --git a/Infovis/Testing/Cxx/TestTable.cxx b/Common/DataModel/Testing/Cxx/TestTable.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestTable.cxx rename to Common/DataModel/Testing/Cxx/TestTable.cxx diff --git a/Filtering/Testing/Cxx/TestTreeBFSIterator.cxx b/Common/DataModel/Testing/Cxx/TestTreeBFSIterator.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestTreeBFSIterator.cxx rename to Common/DataModel/Testing/Cxx/TestTreeBFSIterator.cxx diff --git a/Filtering/Testing/Cxx/TestTreeDFSIterator.cxx b/Common/DataModel/Testing/Cxx/TestTreeDFSIterator.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestTreeDFSIterator.cxx rename to Common/DataModel/Testing/Cxx/TestTreeDFSIterator.cxx diff --git a/Filtering/Testing/Cxx/TestTriangle.cxx b/Common/DataModel/Testing/Cxx/TestTriangle.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestTriangle.cxx rename to Common/DataModel/Testing/Cxx/TestTriangle.cxx diff --git a/Common/Testing/Cxx/TestVector.cxx b/Common/DataModel/Testing/Cxx/TestVector.cxx similarity index 100% rename from Common/Testing/Cxx/TestVector.cxx rename to Common/DataModel/Testing/Cxx/TestVector.cxx diff --git a/Common/Testing/Cxx/TestVectorOperators.cxx b/Common/DataModel/Testing/Cxx/TestVectorOperators.cxx similarity index 100% rename from Common/Testing/Cxx/TestVectorOperators.cxx rename to Common/DataModel/Testing/Cxx/TestVectorOperators.cxx diff --git a/Filtering/Testing/Cxx/otherCellArray.cxx b/Common/DataModel/Testing/Cxx/otherCellArray.cxx similarity index 100% rename from Filtering/Testing/Cxx/otherCellArray.cxx rename to Common/DataModel/Testing/Cxx/otherCellArray.cxx diff --git a/Filtering/Testing/Cxx/otherCellBoundaries.cxx b/Common/DataModel/Testing/Cxx/otherCellBoundaries.cxx similarity index 100% rename from Filtering/Testing/Cxx/otherCellBoundaries.cxx rename to Common/DataModel/Testing/Cxx/otherCellBoundaries.cxx diff --git a/Filtering/Testing/Cxx/otherCellPosition.cxx b/Common/DataModel/Testing/Cxx/otherCellPosition.cxx similarity index 100% rename from Filtering/Testing/Cxx/otherCellPosition.cxx rename to Common/DataModel/Testing/Cxx/otherCellPosition.cxx diff --git a/Filtering/Testing/Cxx/otherCellTypes.cxx b/Common/DataModel/Testing/Cxx/otherCellTypes.cxx similarity index 100% rename from Filtering/Testing/Cxx/otherCellTypes.cxx rename to Common/DataModel/Testing/Cxx/otherCellTypes.cxx diff --git a/Filtering/Testing/Cxx/otherColorTransferFunction.cxx b/Common/DataModel/Testing/Cxx/otherColorTransferFunction.cxx similarity index 100% rename from Filtering/Testing/Cxx/otherColorTransferFunction.cxx rename to Common/DataModel/Testing/Cxx/otherColorTransferFunction.cxx diff --git a/Filtering/Testing/Cxx/otherEmptyCell.cxx b/Common/DataModel/Testing/Cxx/otherEmptyCell.cxx similarity index 100% rename from Filtering/Testing/Cxx/otherEmptyCell.cxx rename to Common/DataModel/Testing/Cxx/otherEmptyCell.cxx diff --git a/Filtering/Testing/Cxx/otherFieldData.cxx b/Common/DataModel/Testing/Cxx/otherFieldData.cxx similarity index 100% rename from Filtering/Testing/Cxx/otherFieldData.cxx rename to Common/DataModel/Testing/Cxx/otherFieldData.cxx diff --git a/Filtering/Testing/Cxx/otherRectilinearGrid.cxx b/Common/DataModel/Testing/Cxx/otherRectilinearGrid.cxx similarity index 100% rename from Filtering/Testing/Cxx/otherRectilinearGrid.cxx rename to Common/DataModel/Testing/Cxx/otherRectilinearGrid.cxx diff --git a/Filtering/Testing/Cxx/otherStructuredGrid.cxx b/Common/DataModel/Testing/Cxx/otherStructuredGrid.cxx similarity index 100% rename from Filtering/Testing/Cxx/otherStructuredGrid.cxx rename to Common/DataModel/Testing/Cxx/otherStructuredGrid.cxx diff --git a/Filtering/Testing/Cxx/quadCellConsistency.cxx b/Common/DataModel/Testing/Cxx/quadCellConsistency.cxx similarity index 100% rename from Filtering/Testing/Cxx/quadCellConsistency.cxx rename to Common/DataModel/Testing/Cxx/quadCellConsistency.cxx diff --git a/Filtering/Testing/Cxx/quadraticEvaluation.cxx b/Common/DataModel/Testing/Cxx/quadraticEvaluation.cxx similarity index 100% rename from Filtering/Testing/Cxx/quadraticEvaluation.cxx rename to Common/DataModel/Testing/Cxx/quadraticEvaluation.cxx diff --git a/Imaging/Testing/Python/TestNumericArrayImageData.py b/Common/DataModel/Testing/Python/TestNumericArrayImageData.py similarity index 100% rename from Imaging/Testing/Python/TestNumericArrayImageData.py rename to Common/DataModel/Testing/Python/TestNumericArrayImageData.py diff --git a/Common/Testing/Python/TestTemplates.py b/Common/DataModel/Testing/Python/TestTemplates.py similarity index 100% rename from Common/Testing/Python/TestTemplates.py rename to Common/DataModel/Testing/Python/TestTemplates.py diff --git a/Filtering/Testing/Tcl/ImplicitSum.tcl b/Common/DataModel/Testing/Tcl/ImplicitSum.tcl similarity index 100% rename from Filtering/Testing/Tcl/ImplicitSum.tcl rename to Common/DataModel/Testing/Tcl/ImplicitSum.tcl diff --git a/Graphics/Testing/Tcl/LineIntersectQuadraticCells.tcl b/Common/DataModel/Testing/Tcl/LineIntersectQuadraticCells.tcl similarity index 100% rename from Graphics/Testing/Tcl/LineIntersectQuadraticCells.tcl rename to Common/DataModel/Testing/Tcl/LineIntersectQuadraticCells.tcl diff --git a/Filtering/Testing/Tcl/PerlinNoise.tcl b/Common/DataModel/Testing/Tcl/PerlinNoise.tcl similarity index 100% rename from Filtering/Testing/Tcl/PerlinNoise.tcl rename to Common/DataModel/Testing/Tcl/PerlinNoise.tcl diff --git a/Filtering/Testing/Tcl/SelectionLoop.tcl b/Common/DataModel/Testing/Tcl/SelectionLoop.tcl similarity index 100% rename from Filtering/Testing/Tcl/SelectionLoop.tcl rename to Common/DataModel/Testing/Tcl/SelectionLoop.tcl diff --git a/Graphics/Testing/Tcl/TestConvexPointSet.tcl b/Common/DataModel/Testing/Tcl/TestConvexPointSet.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestConvexPointSet.tcl rename to Common/DataModel/Testing/Tcl/TestConvexPointSet.tcl diff --git a/Hybrid/Testing/Tcl/TestICPTransform.tcl b/Common/DataModel/Testing/Tcl/TestICPTransform.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestICPTransform.tcl rename to Common/DataModel/Testing/Tcl/TestICPTransform.tcl diff --git a/Graphics/Testing/Tcl/TestQuadricClustering.tcl b/Common/DataModel/Testing/Tcl/TestQuadricClustering.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestQuadricClustering.tcl rename to Common/DataModel/Testing/Tcl/TestQuadricClustering.tcl diff --git a/Graphics/Testing/Tcl/TestStructuredGrid.tcl b/Common/DataModel/Testing/Tcl/TestStructuredGrid.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestStructuredGrid.tcl rename to Common/DataModel/Testing/Tcl/TestStructuredGrid.tcl diff --git a/Graphics/Testing/Tcl/headBone.tcl b/Common/DataModel/Testing/Tcl/headBone.tcl similarity index 100% rename from Graphics/Testing/Tcl/headBone.tcl rename to Common/DataModel/Testing/Tcl/headBone.tcl diff --git a/Filtering/Testing/Tcl/otherDataSetAttributes.tcl b/Common/DataModel/Testing/Tcl/otherDataSetAttributes.tcl similarity index 100% rename from Filtering/Testing/Tcl/otherDataSetAttributes.tcl rename to Common/DataModel/Testing/Tcl/otherDataSetAttributes.tcl diff --git a/Graphics/Testing/Tcl/quadricCut.tcl b/Common/DataModel/Testing/Tcl/quadricCut.tcl similarity index 100% rename from Graphics/Testing/Tcl/quadricCut.tcl rename to Common/DataModel/Testing/Tcl/quadricCut.tcl diff --git a/Graphics/Testing/Tcl/scalarColors.tcl b/Common/DataModel/Testing/Tcl/scalarColors.tcl similarity index 100% rename from Graphics/Testing/Tcl/scalarColors.tcl rename to Common/DataModel/Testing/Tcl/scalarColors.tcl diff --git a/Graphics/Testing/Tcl/scalarConn.tcl b/Common/DataModel/Testing/Tcl/scalarConn.tcl similarity index 100% rename from Graphics/Testing/Tcl/scalarConn.tcl rename to Common/DataModel/Testing/Tcl/scalarConn.tcl diff --git a/Filtering/vtkAMRBox.cxx b/Common/DataModel/vtkAMRBox.cxx similarity index 100% rename from Filtering/vtkAMRBox.cxx rename to Common/DataModel/vtkAMRBox.cxx diff --git a/Filtering/vtkAMRBox.h b/Common/DataModel/vtkAMRBox.h similarity index 100% rename from Filtering/vtkAMRBox.h rename to Common/DataModel/vtkAMRBox.h diff --git a/Filtering/vtkAbstractCellLocator.cxx b/Common/DataModel/vtkAbstractCellLocator.cxx similarity index 100% rename from Filtering/vtkAbstractCellLocator.cxx rename to Common/DataModel/vtkAbstractCellLocator.cxx diff --git a/Filtering/vtkAbstractCellLocator.h b/Common/DataModel/vtkAbstractCellLocator.h similarity index 100% rename from Filtering/vtkAbstractCellLocator.h rename to Common/DataModel/vtkAbstractCellLocator.h diff --git a/Chemistry/vtkAbstractElectronicData.cxx b/Common/DataModel/vtkAbstractElectronicData.cxx similarity index 100% rename from Chemistry/vtkAbstractElectronicData.cxx rename to Common/DataModel/vtkAbstractElectronicData.cxx diff --git a/Chemistry/vtkAbstractElectronicData.h b/Common/DataModel/vtkAbstractElectronicData.h similarity index 100% rename from Chemistry/vtkAbstractElectronicData.h rename to Common/DataModel/vtkAbstractElectronicData.h diff --git a/Filtering/vtkAbstractInterpolatedVelocityField.cxx b/Common/DataModel/vtkAbstractInterpolatedVelocityField.cxx similarity index 100% rename from Filtering/vtkAbstractInterpolatedVelocityField.cxx rename to Common/DataModel/vtkAbstractInterpolatedVelocityField.cxx diff --git a/Filtering/vtkAbstractInterpolatedVelocityField.h b/Common/DataModel/vtkAbstractInterpolatedVelocityField.h similarity index 100% rename from Filtering/vtkAbstractInterpolatedVelocityField.h rename to Common/DataModel/vtkAbstractInterpolatedVelocityField.h diff --git a/Filtering/vtkAbstractPointLocator.cxx b/Common/DataModel/vtkAbstractPointLocator.cxx similarity index 100% rename from Filtering/vtkAbstractPointLocator.cxx rename to Common/DataModel/vtkAbstractPointLocator.cxx diff --git a/Filtering/vtkAbstractPointLocator.h b/Common/DataModel/vtkAbstractPointLocator.h similarity index 100% rename from Filtering/vtkAbstractPointLocator.h rename to Common/DataModel/vtkAbstractPointLocator.h diff --git a/Filtering/vtkAdjacentVertexIterator.cxx b/Common/DataModel/vtkAdjacentVertexIterator.cxx similarity index 100% rename from Filtering/vtkAdjacentVertexIterator.cxx rename to Common/DataModel/vtkAdjacentVertexIterator.cxx diff --git a/Filtering/vtkAdjacentVertexIterator.h b/Common/DataModel/vtkAdjacentVertexIterator.h similarity index 100% rename from Filtering/vtkAdjacentVertexIterator.h rename to Common/DataModel/vtkAdjacentVertexIterator.h diff --git a/Common/vtkAnimationScene.cxx b/Common/DataModel/vtkAnimationScene.cxx similarity index 100% rename from Common/vtkAnimationScene.cxx rename to Common/DataModel/vtkAnimationScene.cxx diff --git a/Common/vtkAnimationScene.h b/Common/DataModel/vtkAnimationScene.h similarity index 100% rename from Common/vtkAnimationScene.h rename to Common/DataModel/vtkAnimationScene.h diff --git a/Filtering/vtkAnnotation.cxx b/Common/DataModel/vtkAnnotation.cxx similarity index 100% rename from Filtering/vtkAnnotation.cxx rename to Common/DataModel/vtkAnnotation.cxx diff --git a/Filtering/vtkAnnotation.h b/Common/DataModel/vtkAnnotation.h similarity index 100% rename from Filtering/vtkAnnotation.h rename to Common/DataModel/vtkAnnotation.h diff --git a/Filtering/vtkAnnotationLayers.cxx b/Common/DataModel/vtkAnnotationLayers.cxx similarity index 100% rename from Filtering/vtkAnnotationLayers.cxx rename to Common/DataModel/vtkAnnotationLayers.cxx diff --git a/Filtering/vtkAnnotationLayers.h b/Common/DataModel/vtkAnnotationLayers.h similarity index 100% rename from Filtering/vtkAnnotationLayers.h rename to Common/DataModel/vtkAnnotationLayers.h diff --git a/Filtering/vtkArrayData.cxx b/Common/DataModel/vtkArrayData.cxx similarity index 100% rename from Filtering/vtkArrayData.cxx rename to Common/DataModel/vtkArrayData.cxx diff --git a/Filtering/vtkArrayData.h b/Common/DataModel/vtkArrayData.h similarity index 100% rename from Filtering/vtkArrayData.h rename to Common/DataModel/vtkArrayData.h diff --git a/Filtering/vtkAtom.cxx b/Common/DataModel/vtkAtom.cxx similarity index 100% rename from Filtering/vtkAtom.cxx rename to Common/DataModel/vtkAtom.cxx diff --git a/Filtering/vtkAtom.h b/Common/DataModel/vtkAtom.h similarity index 100% rename from Filtering/vtkAtom.h rename to Common/DataModel/vtkAtom.h diff --git a/Filtering/vtkAttributesErrorMetric.cxx b/Common/DataModel/vtkAttributesErrorMetric.cxx similarity index 100% rename from Filtering/vtkAttributesErrorMetric.cxx rename to Common/DataModel/vtkAttributesErrorMetric.cxx diff --git a/Filtering/vtkAttributesErrorMetric.h b/Common/DataModel/vtkAttributesErrorMetric.h similarity index 100% rename from Filtering/vtkAttributesErrorMetric.h rename to Common/DataModel/vtkAttributesErrorMetric.h diff --git a/Filtering/vtkBSPCuts.cxx b/Common/DataModel/vtkBSPCuts.cxx similarity index 100% rename from Filtering/vtkBSPCuts.cxx rename to Common/DataModel/vtkBSPCuts.cxx diff --git a/Filtering/vtkBSPCuts.h b/Common/DataModel/vtkBSPCuts.h similarity index 100% rename from Filtering/vtkBSPCuts.h rename to Common/DataModel/vtkBSPCuts.h diff --git a/Filtering/vtkBSPIntersections.cxx b/Common/DataModel/vtkBSPIntersections.cxx similarity index 100% rename from Filtering/vtkBSPIntersections.cxx rename to Common/DataModel/vtkBSPIntersections.cxx diff --git a/Filtering/vtkBSPIntersections.h b/Common/DataModel/vtkBSPIntersections.h similarity index 100% rename from Filtering/vtkBSPIntersections.h rename to Common/DataModel/vtkBSPIntersections.h diff --git a/Filtering/vtkBiQuadraticQuad.cxx b/Common/DataModel/vtkBiQuadraticQuad.cxx similarity index 100% rename from Filtering/vtkBiQuadraticQuad.cxx rename to Common/DataModel/vtkBiQuadraticQuad.cxx diff --git a/Filtering/vtkBiQuadraticQuad.h b/Common/DataModel/vtkBiQuadraticQuad.h similarity index 100% rename from Filtering/vtkBiQuadraticQuad.h rename to Common/DataModel/vtkBiQuadraticQuad.h diff --git a/Filtering/vtkBiQuadraticQuadraticHexahedron.cxx b/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.cxx similarity index 100% rename from Filtering/vtkBiQuadraticQuadraticHexahedron.cxx rename to Common/DataModel/vtkBiQuadraticQuadraticHexahedron.cxx diff --git a/Filtering/vtkBiQuadraticQuadraticHexahedron.h b/Common/DataModel/vtkBiQuadraticQuadraticHexahedron.h similarity index 100% rename from Filtering/vtkBiQuadraticQuadraticHexahedron.h rename to Common/DataModel/vtkBiQuadraticQuadraticHexahedron.h diff --git a/Filtering/vtkBiQuadraticQuadraticWedge.cxx b/Common/DataModel/vtkBiQuadraticQuadraticWedge.cxx similarity index 100% rename from Filtering/vtkBiQuadraticQuadraticWedge.cxx rename to Common/DataModel/vtkBiQuadraticQuadraticWedge.cxx diff --git a/Filtering/vtkBiQuadraticQuadraticWedge.h b/Common/DataModel/vtkBiQuadraticQuadraticWedge.h similarity index 100% rename from Filtering/vtkBiQuadraticQuadraticWedge.h rename to Common/DataModel/vtkBiQuadraticQuadraticWedge.h diff --git a/Filtering/vtkBiQuadraticTriangle.cxx b/Common/DataModel/vtkBiQuadraticTriangle.cxx similarity index 100% rename from Filtering/vtkBiQuadraticTriangle.cxx rename to Common/DataModel/vtkBiQuadraticTriangle.cxx diff --git a/Filtering/vtkBiQuadraticTriangle.h b/Common/DataModel/vtkBiQuadraticTriangle.h similarity index 100% rename from Filtering/vtkBiQuadraticTriangle.h rename to Common/DataModel/vtkBiQuadraticTriangle.h diff --git a/Filtering/vtkBond.cxx b/Common/DataModel/vtkBond.cxx similarity index 100% rename from Filtering/vtkBond.cxx rename to Common/DataModel/vtkBond.cxx diff --git a/Filtering/vtkBond.h b/Common/DataModel/vtkBond.h similarity index 100% rename from Filtering/vtkBond.h rename to Common/DataModel/vtkBond.h diff --git a/Common/vtkBoundingBox.cxx b/Common/DataModel/vtkBoundingBox.cxx similarity index 100% rename from Common/vtkBoundingBox.cxx rename to Common/DataModel/vtkBoundingBox.cxx diff --git a/Common/vtkBoundingBox.h b/Common/DataModel/vtkBoundingBox.h similarity index 100% rename from Common/vtkBoundingBox.h rename to Common/DataModel/vtkBoundingBox.h diff --git a/Common/vtkBox.cxx b/Common/DataModel/vtkBox.cxx similarity index 100% rename from Common/vtkBox.cxx rename to Common/DataModel/vtkBox.cxx diff --git a/Common/vtkBox.h b/Common/DataModel/vtkBox.h similarity index 100% rename from Common/vtkBox.h rename to Common/DataModel/vtkBox.h diff --git a/Filtering/vtkCell.cxx b/Common/DataModel/vtkCell.cxx similarity index 100% rename from Filtering/vtkCell.cxx rename to Common/DataModel/vtkCell.cxx diff --git a/Filtering/vtkCell.h b/Common/DataModel/vtkCell.h similarity index 100% rename from Filtering/vtkCell.h rename to Common/DataModel/vtkCell.h diff --git a/Filtering/vtkCell3D.cxx b/Common/DataModel/vtkCell3D.cxx similarity index 100% rename from Filtering/vtkCell3D.cxx rename to Common/DataModel/vtkCell3D.cxx diff --git a/Filtering/vtkCell3D.h b/Common/DataModel/vtkCell3D.h similarity index 100% rename from Filtering/vtkCell3D.h rename to Common/DataModel/vtkCell3D.h diff --git a/Filtering/vtkCellArray.cxx b/Common/DataModel/vtkCellArray.cxx similarity index 100% rename from Filtering/vtkCellArray.cxx rename to Common/DataModel/vtkCellArray.cxx diff --git a/Filtering/vtkCellArray.h b/Common/DataModel/vtkCellArray.h similarity index 100% rename from Filtering/vtkCellArray.h rename to Common/DataModel/vtkCellArray.h diff --git a/Filtering/vtkCellData.cxx b/Common/DataModel/vtkCellData.cxx similarity index 100% rename from Filtering/vtkCellData.cxx rename to Common/DataModel/vtkCellData.cxx diff --git a/Filtering/vtkCellData.h b/Common/DataModel/vtkCellData.h similarity index 100% rename from Filtering/vtkCellData.h rename to Common/DataModel/vtkCellData.h diff --git a/Filtering/vtkCellLinks.cxx b/Common/DataModel/vtkCellLinks.cxx similarity index 100% rename from Filtering/vtkCellLinks.cxx rename to Common/DataModel/vtkCellLinks.cxx diff --git a/Filtering/vtkCellLinks.h b/Common/DataModel/vtkCellLinks.h similarity index 100% rename from Filtering/vtkCellLinks.h rename to Common/DataModel/vtkCellLinks.h diff --git a/Filtering/vtkCellLocator.cxx b/Common/DataModel/vtkCellLocator.cxx similarity index 100% rename from Filtering/vtkCellLocator.cxx rename to Common/DataModel/vtkCellLocator.cxx diff --git a/Filtering/vtkCellLocator.h b/Common/DataModel/vtkCellLocator.h similarity index 100% rename from Filtering/vtkCellLocator.h rename to Common/DataModel/vtkCellLocator.h diff --git a/Filtering/vtkCellType.h b/Common/DataModel/vtkCellType.h similarity index 100% rename from Filtering/vtkCellType.h rename to Common/DataModel/vtkCellType.h diff --git a/Filtering/vtkCellTypes.cxx b/Common/DataModel/vtkCellTypes.cxx similarity index 100% rename from Filtering/vtkCellTypes.cxx rename to Common/DataModel/vtkCellTypes.cxx diff --git a/Filtering/vtkCellTypes.h b/Common/DataModel/vtkCellTypes.h similarity index 100% rename from Filtering/vtkCellTypes.h rename to Common/DataModel/vtkCellTypes.h diff --git a/Common/vtkColor.h b/Common/DataModel/vtkColor.h similarity index 100% rename from Common/vtkColor.h rename to Common/DataModel/vtkColor.h diff --git a/Filtering/vtkCompositeDataIterator.cxx b/Common/DataModel/vtkCompositeDataIterator.cxx similarity index 100% rename from Filtering/vtkCompositeDataIterator.cxx rename to Common/DataModel/vtkCompositeDataIterator.cxx diff --git a/Filtering/vtkCompositeDataIterator.h b/Common/DataModel/vtkCompositeDataIterator.h similarity index 100% rename from Filtering/vtkCompositeDataIterator.h rename to Common/DataModel/vtkCompositeDataIterator.h diff --git a/Filtering/vtkCompositeDataSet.cxx b/Common/DataModel/vtkCompositeDataSet.cxx similarity index 100% rename from Filtering/vtkCompositeDataSet.cxx rename to Common/DataModel/vtkCompositeDataSet.cxx diff --git a/Filtering/vtkCompositeDataSet.h b/Common/DataModel/vtkCompositeDataSet.h similarity index 100% rename from Filtering/vtkCompositeDataSet.h rename to Common/DataModel/vtkCompositeDataSet.h diff --git a/Filtering/vtkCompositeDataSetInternals.h b/Common/DataModel/vtkCompositeDataSetInternals.h similarity index 100% rename from Filtering/vtkCompositeDataSetInternals.h rename to Common/DataModel/vtkCompositeDataSetInternals.h diff --git a/Filtering/vtkCone.cxx b/Common/DataModel/vtkCone.cxx similarity index 100% rename from Filtering/vtkCone.cxx rename to Common/DataModel/vtkCone.cxx diff --git a/Filtering/vtkCone.h b/Common/DataModel/vtkCone.h similarity index 100% rename from Filtering/vtkCone.h rename to Common/DataModel/vtkCone.h diff --git a/Filtering/vtkConvexPointSet.cxx b/Common/DataModel/vtkConvexPointSet.cxx similarity index 100% rename from Filtering/vtkConvexPointSet.cxx rename to Common/DataModel/vtkConvexPointSet.cxx diff --git a/Filtering/vtkConvexPointSet.h b/Common/DataModel/vtkConvexPointSet.h similarity index 100% rename from Filtering/vtkConvexPointSet.h rename to Common/DataModel/vtkConvexPointSet.h diff --git a/Filtering/vtkCubicLine.cxx b/Common/DataModel/vtkCubicLine.cxx similarity index 100% rename from Filtering/vtkCubicLine.cxx rename to Common/DataModel/vtkCubicLine.cxx diff --git a/Filtering/vtkCubicLine.h b/Common/DataModel/vtkCubicLine.h similarity index 100% rename from Filtering/vtkCubicLine.h rename to Common/DataModel/vtkCubicLine.h diff --git a/Filtering/vtkCylinder.cxx b/Common/DataModel/vtkCylinder.cxx similarity index 100% rename from Filtering/vtkCylinder.cxx rename to Common/DataModel/vtkCylinder.cxx diff --git a/Filtering/vtkCylinder.h b/Common/DataModel/vtkCylinder.h similarity index 100% rename from Filtering/vtkCylinder.h rename to Common/DataModel/vtkCylinder.h diff --git a/Filtering/vtkDataObject.cxx b/Common/DataModel/vtkDataObject.cxx similarity index 100% rename from Filtering/vtkDataObject.cxx rename to Common/DataModel/vtkDataObject.cxx diff --git a/Filtering/vtkDataObject.h b/Common/DataModel/vtkDataObject.h similarity index 100% rename from Filtering/vtkDataObject.h rename to Common/DataModel/vtkDataObject.h diff --git a/Filtering/vtkDataObjectCollection.cxx b/Common/DataModel/vtkDataObjectCollection.cxx similarity index 100% rename from Filtering/vtkDataObjectCollection.cxx rename to Common/DataModel/vtkDataObjectCollection.cxx diff --git a/Filtering/vtkDataObjectCollection.h b/Common/DataModel/vtkDataObjectCollection.h similarity index 100% rename from Filtering/vtkDataObjectCollection.h rename to Common/DataModel/vtkDataObjectCollection.h diff --git a/Filtering/vtkDataObjectTypes.cxx b/Common/DataModel/vtkDataObjectTypes.cxx similarity index 100% rename from Filtering/vtkDataObjectTypes.cxx rename to Common/DataModel/vtkDataObjectTypes.cxx diff --git a/Filtering/vtkDataObjectTypes.h b/Common/DataModel/vtkDataObjectTypes.h similarity index 100% rename from Filtering/vtkDataObjectTypes.h rename to Common/DataModel/vtkDataObjectTypes.h diff --git a/Filtering/vtkDataSet.cxx b/Common/DataModel/vtkDataSet.cxx similarity index 100% rename from Filtering/vtkDataSet.cxx rename to Common/DataModel/vtkDataSet.cxx diff --git a/Filtering/vtkDataSet.h b/Common/DataModel/vtkDataSet.h similarity index 100% rename from Filtering/vtkDataSet.h rename to Common/DataModel/vtkDataSet.h diff --git a/Filtering/vtkDataSetAttributes.cxx b/Common/DataModel/vtkDataSetAttributes.cxx similarity index 100% rename from Filtering/vtkDataSetAttributes.cxx rename to Common/DataModel/vtkDataSetAttributes.cxx diff --git a/Filtering/vtkDataSetAttributes.h b/Common/DataModel/vtkDataSetAttributes.h similarity index 100% rename from Filtering/vtkDataSetAttributes.h rename to Common/DataModel/vtkDataSetAttributes.h diff --git a/Filtering/vtkDataSetCollection.cxx b/Common/DataModel/vtkDataSetCollection.cxx similarity index 100% rename from Filtering/vtkDataSetCollection.cxx rename to Common/DataModel/vtkDataSetCollection.cxx diff --git a/Filtering/vtkDataSetCollection.h b/Common/DataModel/vtkDataSetCollection.h similarity index 100% rename from Filtering/vtkDataSetCollection.h rename to Common/DataModel/vtkDataSetCollection.h diff --git a/Filtering/vtkDirectedAcyclicGraph.cxx b/Common/DataModel/vtkDirectedAcyclicGraph.cxx similarity index 100% rename from Filtering/vtkDirectedAcyclicGraph.cxx rename to Common/DataModel/vtkDirectedAcyclicGraph.cxx diff --git a/Filtering/vtkDirectedAcyclicGraph.h b/Common/DataModel/vtkDirectedAcyclicGraph.h similarity index 100% rename from Filtering/vtkDirectedAcyclicGraph.h rename to Common/DataModel/vtkDirectedAcyclicGraph.h diff --git a/Filtering/vtkDirectedGraph.cxx b/Common/DataModel/vtkDirectedGraph.cxx similarity index 100% rename from Filtering/vtkDirectedGraph.cxx rename to Common/DataModel/vtkDirectedGraph.cxx diff --git a/Filtering/vtkDirectedGraph.h b/Common/DataModel/vtkDirectedGraph.h similarity index 100% rename from Filtering/vtkDirectedGraph.h rename to Common/DataModel/vtkDirectedGraph.h diff --git a/Filtering/vtkDistributedGraphHelper.cxx b/Common/DataModel/vtkDistributedGraphHelper.cxx similarity index 100% rename from Filtering/vtkDistributedGraphHelper.cxx rename to Common/DataModel/vtkDistributedGraphHelper.cxx diff --git a/Filtering/vtkDistributedGraphHelper.h b/Common/DataModel/vtkDistributedGraphHelper.h similarity index 100% rename from Filtering/vtkDistributedGraphHelper.h rename to Common/DataModel/vtkDistributedGraphHelper.h diff --git a/Filtering/vtkEdgeListIterator.cxx b/Common/DataModel/vtkEdgeListIterator.cxx similarity index 100% rename from Filtering/vtkEdgeListIterator.cxx rename to Common/DataModel/vtkEdgeListIterator.cxx diff --git a/Filtering/vtkEdgeListIterator.h b/Common/DataModel/vtkEdgeListIterator.h similarity index 100% rename from Filtering/vtkEdgeListIterator.h rename to Common/DataModel/vtkEdgeListIterator.h diff --git a/Common/vtkEdgeTable.cxx b/Common/DataModel/vtkEdgeTable.cxx similarity index 100% rename from Common/vtkEdgeTable.cxx rename to Common/DataModel/vtkEdgeTable.cxx diff --git a/Common/vtkEdgeTable.h b/Common/DataModel/vtkEdgeTable.h similarity index 100% rename from Common/vtkEdgeTable.h rename to Common/DataModel/vtkEdgeTable.h diff --git a/Filtering/vtkEmptyCell.cxx b/Common/DataModel/vtkEmptyCell.cxx similarity index 100% rename from Filtering/vtkEmptyCell.cxx rename to Common/DataModel/vtkEmptyCell.cxx diff --git a/Filtering/vtkEmptyCell.h b/Common/DataModel/vtkEmptyCell.h similarity index 100% rename from Filtering/vtkEmptyCell.h rename to Common/DataModel/vtkEmptyCell.h diff --git a/Filtering/vtkExplicitCell.cxx b/Common/DataModel/vtkExplicitCell.cxx similarity index 100% rename from Filtering/vtkExplicitCell.cxx rename to Common/DataModel/vtkExplicitCell.cxx diff --git a/Filtering/vtkExplicitCell.h b/Common/DataModel/vtkExplicitCell.h similarity index 100% rename from Filtering/vtkExplicitCell.h rename to Common/DataModel/vtkExplicitCell.h diff --git a/Filtering/vtkFieldData.cxx b/Common/DataModel/vtkFieldData.cxx similarity index 100% rename from Filtering/vtkFieldData.cxx rename to Common/DataModel/vtkFieldData.cxx diff --git a/Filtering/vtkFieldData.h b/Common/DataModel/vtkFieldData.h similarity index 100% rename from Filtering/vtkFieldData.h rename to Common/DataModel/vtkFieldData.h diff --git a/Filtering/vtkGenericAdaptorCell.cxx b/Common/DataModel/vtkGenericAdaptorCell.cxx similarity index 100% rename from Filtering/vtkGenericAdaptorCell.cxx rename to Common/DataModel/vtkGenericAdaptorCell.cxx diff --git a/Filtering/vtkGenericAdaptorCell.h b/Common/DataModel/vtkGenericAdaptorCell.h similarity index 100% rename from Filtering/vtkGenericAdaptorCell.h rename to Common/DataModel/vtkGenericAdaptorCell.h diff --git a/Filtering/vtkGenericAttribute.cxx b/Common/DataModel/vtkGenericAttribute.cxx similarity index 100% rename from Filtering/vtkGenericAttribute.cxx rename to Common/DataModel/vtkGenericAttribute.cxx diff --git a/Filtering/vtkGenericAttribute.h b/Common/DataModel/vtkGenericAttribute.h similarity index 100% rename from Filtering/vtkGenericAttribute.h rename to Common/DataModel/vtkGenericAttribute.h diff --git a/Filtering/vtkGenericAttributeCollection.cxx b/Common/DataModel/vtkGenericAttributeCollection.cxx similarity index 100% rename from Filtering/vtkGenericAttributeCollection.cxx rename to Common/DataModel/vtkGenericAttributeCollection.cxx diff --git a/Filtering/vtkGenericAttributeCollection.h b/Common/DataModel/vtkGenericAttributeCollection.h similarity index 100% rename from Filtering/vtkGenericAttributeCollection.h rename to Common/DataModel/vtkGenericAttributeCollection.h diff --git a/Filtering/vtkGenericCell.cxx b/Common/DataModel/vtkGenericCell.cxx similarity index 100% rename from Filtering/vtkGenericCell.cxx rename to Common/DataModel/vtkGenericCell.cxx diff --git a/Filtering/vtkGenericCell.h b/Common/DataModel/vtkGenericCell.h similarity index 100% rename from Filtering/vtkGenericCell.h rename to Common/DataModel/vtkGenericCell.h diff --git a/Filtering/vtkGenericCellIterator.cxx b/Common/DataModel/vtkGenericCellIterator.cxx similarity index 100% rename from Filtering/vtkGenericCellIterator.cxx rename to Common/DataModel/vtkGenericCellIterator.cxx diff --git a/Filtering/vtkGenericCellIterator.h b/Common/DataModel/vtkGenericCellIterator.h similarity index 100% rename from Filtering/vtkGenericCellIterator.h rename to Common/DataModel/vtkGenericCellIterator.h diff --git a/Filtering/vtkGenericCellTessellator.cxx b/Common/DataModel/vtkGenericCellTessellator.cxx similarity index 100% rename from Filtering/vtkGenericCellTessellator.cxx rename to Common/DataModel/vtkGenericCellTessellator.cxx diff --git a/Filtering/vtkGenericCellTessellator.h b/Common/DataModel/vtkGenericCellTessellator.h similarity index 100% rename from Filtering/vtkGenericCellTessellator.h rename to Common/DataModel/vtkGenericCellTessellator.h diff --git a/Filtering/vtkGenericDataSet.cxx b/Common/DataModel/vtkGenericDataSet.cxx similarity index 100% rename from Filtering/vtkGenericDataSet.cxx rename to Common/DataModel/vtkGenericDataSet.cxx diff --git a/Filtering/vtkGenericDataSet.h b/Common/DataModel/vtkGenericDataSet.h similarity index 100% rename from Filtering/vtkGenericDataSet.h rename to Common/DataModel/vtkGenericDataSet.h diff --git a/Filtering/vtkGenericEdgeTable.cxx b/Common/DataModel/vtkGenericEdgeTable.cxx similarity index 100% rename from Filtering/vtkGenericEdgeTable.cxx rename to Common/DataModel/vtkGenericEdgeTable.cxx diff --git a/Filtering/vtkGenericEdgeTable.h b/Common/DataModel/vtkGenericEdgeTable.h similarity index 100% rename from Filtering/vtkGenericEdgeTable.h rename to Common/DataModel/vtkGenericEdgeTable.h diff --git a/Filtering/vtkGenericInterpolatedVelocityField.cxx b/Common/DataModel/vtkGenericInterpolatedVelocityField.cxx similarity index 100% rename from Filtering/vtkGenericInterpolatedVelocityField.cxx rename to Common/DataModel/vtkGenericInterpolatedVelocityField.cxx diff --git a/Filtering/vtkGenericInterpolatedVelocityField.h b/Common/DataModel/vtkGenericInterpolatedVelocityField.h similarity index 100% rename from Filtering/vtkGenericInterpolatedVelocityField.h rename to Common/DataModel/vtkGenericInterpolatedVelocityField.h diff --git a/Filtering/vtkGenericPointIterator.cxx b/Common/DataModel/vtkGenericPointIterator.cxx similarity index 100% rename from Filtering/vtkGenericPointIterator.cxx rename to Common/DataModel/vtkGenericPointIterator.cxx diff --git a/Filtering/vtkGenericPointIterator.h b/Common/DataModel/vtkGenericPointIterator.h similarity index 100% rename from Filtering/vtkGenericPointIterator.h rename to Common/DataModel/vtkGenericPointIterator.h diff --git a/Filtering/vtkGenericSubdivisionErrorMetric.cxx b/Common/DataModel/vtkGenericSubdivisionErrorMetric.cxx similarity index 100% rename from Filtering/vtkGenericSubdivisionErrorMetric.cxx rename to Common/DataModel/vtkGenericSubdivisionErrorMetric.cxx diff --git a/Filtering/vtkGenericSubdivisionErrorMetric.h b/Common/DataModel/vtkGenericSubdivisionErrorMetric.h similarity index 100% rename from Filtering/vtkGenericSubdivisionErrorMetric.h rename to Common/DataModel/vtkGenericSubdivisionErrorMetric.h diff --git a/Filtering/vtkGeometricErrorMetric.cxx b/Common/DataModel/vtkGeometricErrorMetric.cxx similarity index 100% rename from Filtering/vtkGeometricErrorMetric.cxx rename to Common/DataModel/vtkGeometricErrorMetric.cxx diff --git a/Filtering/vtkGeometricErrorMetric.h b/Common/DataModel/vtkGeometricErrorMetric.h similarity index 100% rename from Filtering/vtkGeometricErrorMetric.h rename to Common/DataModel/vtkGeometricErrorMetric.h diff --git a/Filtering/vtkGraph.cxx b/Common/DataModel/vtkGraph.cxx similarity index 100% rename from Filtering/vtkGraph.cxx rename to Common/DataModel/vtkGraph.cxx diff --git a/Filtering/vtkGraph.h b/Common/DataModel/vtkGraph.h similarity index 100% rename from Filtering/vtkGraph.h rename to Common/DataModel/vtkGraph.h diff --git a/Filtering/vtkGraphEdge.cxx b/Common/DataModel/vtkGraphEdge.cxx similarity index 100% rename from Filtering/vtkGraphEdge.cxx rename to Common/DataModel/vtkGraphEdge.cxx diff --git a/Filtering/vtkGraphEdge.h b/Common/DataModel/vtkGraphEdge.h similarity index 100% rename from Filtering/vtkGraphEdge.h rename to Common/DataModel/vtkGraphEdge.h diff --git a/Filtering/vtkGraphInternals.cxx b/Common/DataModel/vtkGraphInternals.cxx similarity index 100% rename from Filtering/vtkGraphInternals.cxx rename to Common/DataModel/vtkGraphInternals.cxx diff --git a/Filtering/vtkGraphInternals.h b/Common/DataModel/vtkGraphInternals.h similarity index 100% rename from Filtering/vtkGraphInternals.h rename to Common/DataModel/vtkGraphInternals.h diff --git a/Filtering/vtkHexagonalPrism.cxx b/Common/DataModel/vtkHexagonalPrism.cxx similarity index 100% rename from Filtering/vtkHexagonalPrism.cxx rename to Common/DataModel/vtkHexagonalPrism.cxx diff --git a/Filtering/vtkHexagonalPrism.h b/Common/DataModel/vtkHexagonalPrism.h similarity index 100% rename from Filtering/vtkHexagonalPrism.h rename to Common/DataModel/vtkHexagonalPrism.h diff --git a/Filtering/vtkHexahedron.cxx b/Common/DataModel/vtkHexahedron.cxx similarity index 100% rename from Filtering/vtkHexahedron.cxx rename to Common/DataModel/vtkHexahedron.cxx diff --git a/Filtering/vtkHexahedron.h b/Common/DataModel/vtkHexahedron.h similarity index 100% rename from Filtering/vtkHexahedron.h rename to Common/DataModel/vtkHexahedron.h diff --git a/Filtering/vtkHierarchicalBoxDataIterator.cxx b/Common/DataModel/vtkHierarchicalBoxDataIterator.cxx similarity index 100% rename from Filtering/vtkHierarchicalBoxDataIterator.cxx rename to Common/DataModel/vtkHierarchicalBoxDataIterator.cxx diff --git a/Filtering/vtkHierarchicalBoxDataIterator.h b/Common/DataModel/vtkHierarchicalBoxDataIterator.h similarity index 100% rename from Filtering/vtkHierarchicalBoxDataIterator.h rename to Common/DataModel/vtkHierarchicalBoxDataIterator.h diff --git a/Filtering/vtkHierarchicalBoxDataSet.cxx b/Common/DataModel/vtkHierarchicalBoxDataSet.cxx similarity index 100% rename from Filtering/vtkHierarchicalBoxDataSet.cxx rename to Common/DataModel/vtkHierarchicalBoxDataSet.cxx diff --git a/Filtering/vtkHierarchicalBoxDataSet.h b/Common/DataModel/vtkHierarchicalBoxDataSet.h similarity index 100% rename from Filtering/vtkHierarchicalBoxDataSet.h rename to Common/DataModel/vtkHierarchicalBoxDataSet.h diff --git a/Filtering/vtkHyperOctree.cxx b/Common/DataModel/vtkHyperOctree.cxx similarity index 100% rename from Filtering/vtkHyperOctree.cxx rename to Common/DataModel/vtkHyperOctree.cxx diff --git a/Filtering/vtkHyperOctree.h b/Common/DataModel/vtkHyperOctree.h similarity index 100% rename from Filtering/vtkHyperOctree.h rename to Common/DataModel/vtkHyperOctree.h diff --git a/Filtering/vtkHyperOctreeCursor.cxx b/Common/DataModel/vtkHyperOctreeCursor.cxx similarity index 100% rename from Filtering/vtkHyperOctreeCursor.cxx rename to Common/DataModel/vtkHyperOctreeCursor.cxx diff --git a/Filtering/vtkHyperOctreeCursor.h b/Common/DataModel/vtkHyperOctreeCursor.h similarity index 100% rename from Filtering/vtkHyperOctreeCursor.h rename to Common/DataModel/vtkHyperOctreeCursor.h diff --git a/Filtering/vtkHyperOctreePointsGrabber.cxx b/Common/DataModel/vtkHyperOctreePointsGrabber.cxx similarity index 100% rename from Filtering/vtkHyperOctreePointsGrabber.cxx rename to Common/DataModel/vtkHyperOctreePointsGrabber.cxx diff --git a/Filtering/vtkHyperOctreePointsGrabber.h b/Common/DataModel/vtkHyperOctreePointsGrabber.h similarity index 100% rename from Filtering/vtkHyperOctreePointsGrabber.h rename to Common/DataModel/vtkHyperOctreePointsGrabber.h diff --git a/Filtering/vtkImageData.cxx b/Common/DataModel/vtkImageData.cxx similarity index 100% rename from Filtering/vtkImageData.cxx rename to Common/DataModel/vtkImageData.cxx diff --git a/Filtering/vtkImageData.h b/Common/DataModel/vtkImageData.h similarity index 100% rename from Filtering/vtkImageData.h rename to Common/DataModel/vtkImageData.h diff --git a/Filtering/vtkImageIterator.cxx b/Common/DataModel/vtkImageIterator.cxx similarity index 100% rename from Filtering/vtkImageIterator.cxx rename to Common/DataModel/vtkImageIterator.cxx diff --git a/Filtering/vtkImageIterator.h b/Common/DataModel/vtkImageIterator.h similarity index 100% rename from Filtering/vtkImageIterator.h rename to Common/DataModel/vtkImageIterator.h diff --git a/Filtering/vtkImageIterator.txx b/Common/DataModel/vtkImageIterator.txx similarity index 100% rename from Filtering/vtkImageIterator.txx rename to Common/DataModel/vtkImageIterator.txx diff --git a/Filtering/vtkImplicitBoolean.cxx b/Common/DataModel/vtkImplicitBoolean.cxx similarity index 100% rename from Filtering/vtkImplicitBoolean.cxx rename to Common/DataModel/vtkImplicitBoolean.cxx diff --git a/Filtering/vtkImplicitBoolean.h b/Common/DataModel/vtkImplicitBoolean.h similarity index 100% rename from Filtering/vtkImplicitBoolean.h rename to Common/DataModel/vtkImplicitBoolean.h diff --git a/Filtering/vtkImplicitDataSet.cxx b/Common/DataModel/vtkImplicitDataSet.cxx similarity index 100% rename from Filtering/vtkImplicitDataSet.cxx rename to Common/DataModel/vtkImplicitDataSet.cxx diff --git a/Filtering/vtkImplicitDataSet.h b/Common/DataModel/vtkImplicitDataSet.h similarity index 100% rename from Filtering/vtkImplicitDataSet.h rename to Common/DataModel/vtkImplicitDataSet.h diff --git a/Common/vtkImplicitFunction.cxx b/Common/DataModel/vtkImplicitFunction.cxx similarity index 100% rename from Common/vtkImplicitFunction.cxx rename to Common/DataModel/vtkImplicitFunction.cxx diff --git a/Common/vtkImplicitFunction.h b/Common/DataModel/vtkImplicitFunction.h similarity index 100% rename from Common/vtkImplicitFunction.h rename to Common/DataModel/vtkImplicitFunction.h diff --git a/Common/vtkImplicitFunctionCollection.cxx b/Common/DataModel/vtkImplicitFunctionCollection.cxx similarity index 100% rename from Common/vtkImplicitFunctionCollection.cxx rename to Common/DataModel/vtkImplicitFunctionCollection.cxx diff --git a/Common/vtkImplicitFunctionCollection.h b/Common/DataModel/vtkImplicitFunctionCollection.h similarity index 100% rename from Common/vtkImplicitFunctionCollection.h rename to Common/DataModel/vtkImplicitFunctionCollection.h diff --git a/Filtering/vtkImplicitHalo.cxx b/Common/DataModel/vtkImplicitHalo.cxx similarity index 100% rename from Filtering/vtkImplicitHalo.cxx rename to Common/DataModel/vtkImplicitHalo.cxx diff --git a/Filtering/vtkImplicitHalo.h b/Common/DataModel/vtkImplicitHalo.h similarity index 100% rename from Filtering/vtkImplicitHalo.h rename to Common/DataModel/vtkImplicitHalo.h diff --git a/Filtering/vtkImplicitSelectionLoop.cxx b/Common/DataModel/vtkImplicitSelectionLoop.cxx similarity index 100% rename from Filtering/vtkImplicitSelectionLoop.cxx rename to Common/DataModel/vtkImplicitSelectionLoop.cxx diff --git a/Filtering/vtkImplicitSelectionLoop.h b/Common/DataModel/vtkImplicitSelectionLoop.h similarity index 100% rename from Filtering/vtkImplicitSelectionLoop.h rename to Common/DataModel/vtkImplicitSelectionLoop.h diff --git a/Filtering/vtkImplicitSum.cxx b/Common/DataModel/vtkImplicitSum.cxx similarity index 100% rename from Filtering/vtkImplicitSum.cxx rename to Common/DataModel/vtkImplicitSum.cxx diff --git a/Filtering/vtkImplicitSum.h b/Common/DataModel/vtkImplicitSum.h similarity index 100% rename from Filtering/vtkImplicitSum.h rename to Common/DataModel/vtkImplicitSum.h diff --git a/Filtering/vtkImplicitVolume.cxx b/Common/DataModel/vtkImplicitVolume.cxx similarity index 100% rename from Filtering/vtkImplicitVolume.cxx rename to Common/DataModel/vtkImplicitVolume.cxx diff --git a/Filtering/vtkImplicitVolume.h b/Common/DataModel/vtkImplicitVolume.h similarity index 100% rename from Filtering/vtkImplicitVolume.h rename to Common/DataModel/vtkImplicitVolume.h diff --git a/Filtering/vtkImplicitWindowFunction.cxx b/Common/DataModel/vtkImplicitWindowFunction.cxx similarity index 100% rename from Filtering/vtkImplicitWindowFunction.cxx rename to Common/DataModel/vtkImplicitWindowFunction.cxx diff --git a/Filtering/vtkImplicitWindowFunction.h b/Common/DataModel/vtkImplicitWindowFunction.h similarity index 100% rename from Filtering/vtkImplicitWindowFunction.h rename to Common/DataModel/vtkImplicitWindowFunction.h diff --git a/Filtering/vtkInEdgeIterator.cxx b/Common/DataModel/vtkInEdgeIterator.cxx similarity index 100% rename from Filtering/vtkInEdgeIterator.cxx rename to Common/DataModel/vtkInEdgeIterator.cxx diff --git a/Filtering/vtkInEdgeIterator.h b/Common/DataModel/vtkInEdgeIterator.h similarity index 100% rename from Filtering/vtkInEdgeIterator.h rename to Common/DataModel/vtkInEdgeIterator.h diff --git a/Filtering/vtkIncrementalOctreeNode.cxx b/Common/DataModel/vtkIncrementalOctreeNode.cxx similarity index 100% rename from Filtering/vtkIncrementalOctreeNode.cxx rename to Common/DataModel/vtkIncrementalOctreeNode.cxx diff --git a/Filtering/vtkIncrementalOctreeNode.h b/Common/DataModel/vtkIncrementalOctreeNode.h similarity index 100% rename from Filtering/vtkIncrementalOctreeNode.h rename to Common/DataModel/vtkIncrementalOctreeNode.h diff --git a/Filtering/vtkIncrementalOctreePointLocator.cxx b/Common/DataModel/vtkIncrementalOctreePointLocator.cxx similarity index 100% rename from Filtering/vtkIncrementalOctreePointLocator.cxx rename to Common/DataModel/vtkIncrementalOctreePointLocator.cxx diff --git a/Filtering/vtkIncrementalOctreePointLocator.h b/Common/DataModel/vtkIncrementalOctreePointLocator.h similarity index 100% rename from Filtering/vtkIncrementalOctreePointLocator.h rename to Common/DataModel/vtkIncrementalOctreePointLocator.h diff --git a/Filtering/vtkIncrementalPointLocator.cxx b/Common/DataModel/vtkIncrementalPointLocator.cxx similarity index 100% rename from Filtering/vtkIncrementalPointLocator.cxx rename to Common/DataModel/vtkIncrementalPointLocator.cxx diff --git a/Filtering/vtkIncrementalPointLocator.h b/Common/DataModel/vtkIncrementalPointLocator.h similarity index 100% rename from Filtering/vtkIncrementalPointLocator.h rename to Common/DataModel/vtkIncrementalPointLocator.h diff --git a/Common/vtkInformationQuadratureSchemeDefinitionVectorKey.cxx b/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.cxx similarity index 100% rename from Common/vtkInformationQuadratureSchemeDefinitionVectorKey.cxx rename to Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.cxx diff --git a/Common/vtkInformationQuadratureSchemeDefinitionVectorKey.h b/Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.h similarity index 100% rename from Common/vtkInformationQuadratureSchemeDefinitionVectorKey.h rename to Common/DataModel/vtkInformationQuadratureSchemeDefinitionVectorKey.h diff --git a/Filtering/vtkInterpolatedVelocityField.cxx b/Common/DataModel/vtkInterpolatedVelocityField.cxx similarity index 100% rename from Filtering/vtkInterpolatedVelocityField.cxx rename to Common/DataModel/vtkInterpolatedVelocityField.cxx diff --git a/Filtering/vtkInterpolatedVelocityField.h b/Common/DataModel/vtkInterpolatedVelocityField.h similarity index 100% rename from Filtering/vtkInterpolatedVelocityField.h rename to Common/DataModel/vtkInterpolatedVelocityField.h diff --git a/Hybrid/vtkIterativeClosestPointTransform.cxx b/Common/DataModel/vtkIterativeClosestPointTransform.cxx similarity index 100% rename from Hybrid/vtkIterativeClosestPointTransform.cxx rename to Common/DataModel/vtkIterativeClosestPointTransform.cxx diff --git a/Hybrid/vtkIterativeClosestPointTransform.h b/Common/DataModel/vtkIterativeClosestPointTransform.h similarity index 100% rename from Hybrid/vtkIterativeClosestPointTransform.h rename to Common/DataModel/vtkIterativeClosestPointTransform.h diff --git a/Filtering/vtkKdNode.cxx b/Common/DataModel/vtkKdNode.cxx similarity index 100% rename from Filtering/vtkKdNode.cxx rename to Common/DataModel/vtkKdNode.cxx diff --git a/Filtering/vtkKdNode.h b/Common/DataModel/vtkKdNode.h similarity index 100% rename from Filtering/vtkKdNode.h rename to Common/DataModel/vtkKdNode.h diff --git a/Filtering/vtkKdTree.cxx b/Common/DataModel/vtkKdTree.cxx similarity index 100% rename from Filtering/vtkKdTree.cxx rename to Common/DataModel/vtkKdTree.cxx diff --git a/Filtering/vtkKdTree.h b/Common/DataModel/vtkKdTree.h similarity index 100% rename from Filtering/vtkKdTree.h rename to Common/DataModel/vtkKdTree.h diff --git a/Filtering/vtkKdTreePointLocator.cxx b/Common/DataModel/vtkKdTreePointLocator.cxx similarity index 100% rename from Filtering/vtkKdTreePointLocator.cxx rename to Common/DataModel/vtkKdTreePointLocator.cxx diff --git a/Filtering/vtkKdTreePointLocator.h b/Common/DataModel/vtkKdTreePointLocator.h similarity index 100% rename from Filtering/vtkKdTreePointLocator.h rename to Common/DataModel/vtkKdTreePointLocator.h diff --git a/Filtering/vtkLine.cxx b/Common/DataModel/vtkLine.cxx similarity index 100% rename from Filtering/vtkLine.cxx rename to Common/DataModel/vtkLine.cxx diff --git a/Filtering/vtkLine.h b/Common/DataModel/vtkLine.h similarity index 100% rename from Filtering/vtkLine.h rename to Common/DataModel/vtkLine.h diff --git a/Filtering/vtkLocator.cxx b/Common/DataModel/vtkLocator.cxx similarity index 100% rename from Filtering/vtkLocator.cxx rename to Common/DataModel/vtkLocator.cxx diff --git a/Filtering/vtkLocator.h b/Common/DataModel/vtkLocator.h similarity index 100% rename from Filtering/vtkLocator.h rename to Common/DataModel/vtkLocator.h diff --git a/Filtering/vtkMarchingCubesCases.h b/Common/DataModel/vtkMarchingCubesCases.h similarity index 100% rename from Filtering/vtkMarchingCubesCases.h rename to Common/DataModel/vtkMarchingCubesCases.h diff --git a/Filtering/vtkMarchingCubesTriangleCases.cxx b/Common/DataModel/vtkMarchingCubesTriangleCases.cxx similarity index 100% rename from Filtering/vtkMarchingCubesTriangleCases.cxx rename to Common/DataModel/vtkMarchingCubesTriangleCases.cxx diff --git a/Filtering/vtkMarchingCubesTriangleCases.h b/Common/DataModel/vtkMarchingCubesTriangleCases.h similarity index 100% rename from Filtering/vtkMarchingCubesTriangleCases.h rename to Common/DataModel/vtkMarchingCubesTriangleCases.h diff --git a/Filtering/vtkMarchingSquaresCases.h b/Common/DataModel/vtkMarchingSquaresCases.h similarity index 100% rename from Filtering/vtkMarchingSquaresCases.h rename to Common/DataModel/vtkMarchingSquaresCases.h diff --git a/Filtering/vtkMarchingSquaresLineCases.cxx b/Common/DataModel/vtkMarchingSquaresLineCases.cxx similarity index 100% rename from Filtering/vtkMarchingSquaresLineCases.cxx rename to Common/DataModel/vtkMarchingSquaresLineCases.cxx diff --git a/Filtering/vtkMarchingSquaresLineCases.h b/Common/DataModel/vtkMarchingSquaresLineCases.h similarity index 100% rename from Filtering/vtkMarchingSquaresLineCases.h rename to Common/DataModel/vtkMarchingSquaresLineCases.h diff --git a/Filtering/vtkMeanValueCoordinatesInterpolator.cxx b/Common/DataModel/vtkMeanValueCoordinatesInterpolator.cxx similarity index 100% rename from Filtering/vtkMeanValueCoordinatesInterpolator.cxx rename to Common/DataModel/vtkMeanValueCoordinatesInterpolator.cxx diff --git a/Filtering/vtkMeanValueCoordinatesInterpolator.h b/Common/DataModel/vtkMeanValueCoordinatesInterpolator.h similarity index 100% rename from Filtering/vtkMeanValueCoordinatesInterpolator.h rename to Common/DataModel/vtkMeanValueCoordinatesInterpolator.h diff --git a/Filtering/vtkMergePoints.cxx b/Common/DataModel/vtkMergePoints.cxx similarity index 100% rename from Filtering/vtkMergePoints.cxx rename to Common/DataModel/vtkMergePoints.cxx diff --git a/Filtering/vtkMergePoints.h b/Common/DataModel/vtkMergePoints.h similarity index 100% rename from Filtering/vtkMergePoints.h rename to Common/DataModel/vtkMergePoints.h diff --git a/Filtering/vtkMolecule.cxx b/Common/DataModel/vtkMolecule.cxx similarity index 100% rename from Filtering/vtkMolecule.cxx rename to Common/DataModel/vtkMolecule.cxx diff --git a/Filtering/vtkMolecule.h b/Common/DataModel/vtkMolecule.h similarity index 100% rename from Filtering/vtkMolecule.h rename to Common/DataModel/vtkMolecule.h diff --git a/Filtering/vtkMultiBlockDataSet.cxx b/Common/DataModel/vtkMultiBlockDataSet.cxx similarity index 100% rename from Filtering/vtkMultiBlockDataSet.cxx rename to Common/DataModel/vtkMultiBlockDataSet.cxx diff --git a/Filtering/vtkMultiBlockDataSet.h b/Common/DataModel/vtkMultiBlockDataSet.h similarity index 100% rename from Filtering/vtkMultiBlockDataSet.h rename to Common/DataModel/vtkMultiBlockDataSet.h diff --git a/Filtering/vtkMultiPieceDataSet.cxx b/Common/DataModel/vtkMultiPieceDataSet.cxx similarity index 100% rename from Filtering/vtkMultiPieceDataSet.cxx rename to Common/DataModel/vtkMultiPieceDataSet.cxx diff --git a/Filtering/vtkMultiPieceDataSet.h b/Common/DataModel/vtkMultiPieceDataSet.h similarity index 100% rename from Filtering/vtkMultiPieceDataSet.h rename to Common/DataModel/vtkMultiPieceDataSet.h diff --git a/Filtering/vtkMutableDirectedGraph.cxx b/Common/DataModel/vtkMutableDirectedGraph.cxx similarity index 100% rename from Filtering/vtkMutableDirectedGraph.cxx rename to Common/DataModel/vtkMutableDirectedGraph.cxx diff --git a/Filtering/vtkMutableDirectedGraph.h b/Common/DataModel/vtkMutableDirectedGraph.h similarity index 100% rename from Filtering/vtkMutableDirectedGraph.h rename to Common/DataModel/vtkMutableDirectedGraph.h diff --git a/Filtering/vtkMutableUndirectedGraph.cxx b/Common/DataModel/vtkMutableUndirectedGraph.cxx similarity index 100% rename from Filtering/vtkMutableUndirectedGraph.cxx rename to Common/DataModel/vtkMutableUndirectedGraph.cxx diff --git a/Filtering/vtkMutableUndirectedGraph.h b/Common/DataModel/vtkMutableUndirectedGraph.h similarity index 100% rename from Filtering/vtkMutableUndirectedGraph.h rename to Common/DataModel/vtkMutableUndirectedGraph.h diff --git a/Filtering/vtkNonLinearCell.cxx b/Common/DataModel/vtkNonLinearCell.cxx similarity index 100% rename from Filtering/vtkNonLinearCell.cxx rename to Common/DataModel/vtkNonLinearCell.cxx diff --git a/Filtering/vtkNonLinearCell.h b/Common/DataModel/vtkNonLinearCell.h similarity index 100% rename from Filtering/vtkNonLinearCell.h rename to Common/DataModel/vtkNonLinearCell.h diff --git a/Filtering/vtkNonMergingPointLocator.cxx b/Common/DataModel/vtkNonMergingPointLocator.cxx similarity index 100% rename from Filtering/vtkNonMergingPointLocator.cxx rename to Common/DataModel/vtkNonMergingPointLocator.cxx diff --git a/Filtering/vtkNonMergingPointLocator.h b/Common/DataModel/vtkNonMergingPointLocator.h similarity index 100% rename from Filtering/vtkNonMergingPointLocator.h rename to Common/DataModel/vtkNonMergingPointLocator.h diff --git a/Filtering/vtkNonOverlappingAMR.cxx b/Common/DataModel/vtkNonOverlappingAMR.cxx similarity index 100% rename from Filtering/vtkNonOverlappingAMR.cxx rename to Common/DataModel/vtkNonOverlappingAMR.cxx diff --git a/Filtering/vtkNonOverlappingAMR.h b/Common/DataModel/vtkNonOverlappingAMR.h similarity index 100% rename from Filtering/vtkNonOverlappingAMR.h rename to Common/DataModel/vtkNonOverlappingAMR.h diff --git a/Filtering/vtkOctreePointLocator.cxx b/Common/DataModel/vtkOctreePointLocator.cxx similarity index 100% rename from Filtering/vtkOctreePointLocator.cxx rename to Common/DataModel/vtkOctreePointLocator.cxx diff --git a/Filtering/vtkOctreePointLocator.h b/Common/DataModel/vtkOctreePointLocator.h similarity index 100% rename from Filtering/vtkOctreePointLocator.h rename to Common/DataModel/vtkOctreePointLocator.h diff --git a/Filtering/vtkOctreePointLocatorNode.cxx b/Common/DataModel/vtkOctreePointLocatorNode.cxx similarity index 100% rename from Filtering/vtkOctreePointLocatorNode.cxx rename to Common/DataModel/vtkOctreePointLocatorNode.cxx diff --git a/Filtering/vtkOctreePointLocatorNode.h b/Common/DataModel/vtkOctreePointLocatorNode.h similarity index 100% rename from Filtering/vtkOctreePointLocatorNode.h rename to Common/DataModel/vtkOctreePointLocatorNode.h diff --git a/Filtering/vtkOrderedTriangulator.cxx b/Common/DataModel/vtkOrderedTriangulator.cxx similarity index 100% rename from Filtering/vtkOrderedTriangulator.cxx rename to Common/DataModel/vtkOrderedTriangulator.cxx diff --git a/Filtering/vtkOrderedTriangulator.h b/Common/DataModel/vtkOrderedTriangulator.h similarity index 100% rename from Filtering/vtkOrderedTriangulator.h rename to Common/DataModel/vtkOrderedTriangulator.h diff --git a/Filtering/vtkOutEdgeIterator.cxx b/Common/DataModel/vtkOutEdgeIterator.cxx similarity index 100% rename from Filtering/vtkOutEdgeIterator.cxx rename to Common/DataModel/vtkOutEdgeIterator.cxx diff --git a/Filtering/vtkOutEdgeIterator.h b/Common/DataModel/vtkOutEdgeIterator.h similarity index 100% rename from Filtering/vtkOutEdgeIterator.h rename to Common/DataModel/vtkOutEdgeIterator.h diff --git a/Filtering/vtkOverlappingAMR.cxx b/Common/DataModel/vtkOverlappingAMR.cxx similarity index 100% rename from Filtering/vtkOverlappingAMR.cxx rename to Common/DataModel/vtkOverlappingAMR.cxx diff --git a/Filtering/vtkOverlappingAMR.h b/Common/DataModel/vtkOverlappingAMR.h similarity index 100% rename from Filtering/vtkOverlappingAMR.h rename to Common/DataModel/vtkOverlappingAMR.h diff --git a/Filtering/vtkPentagonalPrism.cxx b/Common/DataModel/vtkPentagonalPrism.cxx similarity index 100% rename from Filtering/vtkPentagonalPrism.cxx rename to Common/DataModel/vtkPentagonalPrism.cxx diff --git a/Filtering/vtkPentagonalPrism.h b/Common/DataModel/vtkPentagonalPrism.h similarity index 100% rename from Filtering/vtkPentagonalPrism.h rename to Common/DataModel/vtkPentagonalPrism.h diff --git a/Filtering/vtkPerlinNoise.cxx b/Common/DataModel/vtkPerlinNoise.cxx similarity index 100% rename from Filtering/vtkPerlinNoise.cxx rename to Common/DataModel/vtkPerlinNoise.cxx diff --git a/Filtering/vtkPerlinNoise.h b/Common/DataModel/vtkPerlinNoise.h similarity index 100% rename from Filtering/vtkPerlinNoise.h rename to Common/DataModel/vtkPerlinNoise.h diff --git a/Filtering/vtkPiecewiseFunction.cxx b/Common/DataModel/vtkPiecewiseFunction.cxx similarity index 100% rename from Filtering/vtkPiecewiseFunction.cxx rename to Common/DataModel/vtkPiecewiseFunction.cxx diff --git a/Filtering/vtkPiecewiseFunction.h b/Common/DataModel/vtkPiecewiseFunction.h similarity index 100% rename from Filtering/vtkPiecewiseFunction.h rename to Common/DataModel/vtkPiecewiseFunction.h diff --git a/Filtering/vtkPixel.cxx b/Common/DataModel/vtkPixel.cxx similarity index 100% rename from Filtering/vtkPixel.cxx rename to Common/DataModel/vtkPixel.cxx diff --git a/Filtering/vtkPixel.h b/Common/DataModel/vtkPixel.h similarity index 100% rename from Filtering/vtkPixel.h rename to Common/DataModel/vtkPixel.h diff --git a/Common/vtkPlane.cxx b/Common/DataModel/vtkPlane.cxx similarity index 100% rename from Common/vtkPlane.cxx rename to Common/DataModel/vtkPlane.cxx diff --git a/Common/vtkPlane.h b/Common/DataModel/vtkPlane.h similarity index 100% rename from Common/vtkPlane.h rename to Common/DataModel/vtkPlane.h diff --git a/Common/vtkPlaneCollection.cxx b/Common/DataModel/vtkPlaneCollection.cxx similarity index 100% rename from Common/vtkPlaneCollection.cxx rename to Common/DataModel/vtkPlaneCollection.cxx diff --git a/Common/vtkPlaneCollection.h b/Common/DataModel/vtkPlaneCollection.h similarity index 100% rename from Common/vtkPlaneCollection.h rename to Common/DataModel/vtkPlaneCollection.h diff --git a/Common/vtkPlanes.cxx b/Common/DataModel/vtkPlanes.cxx similarity index 100% rename from Common/vtkPlanes.cxx rename to Common/DataModel/vtkPlanes.cxx diff --git a/Common/vtkPlanes.h b/Common/DataModel/vtkPlanes.h similarity index 100% rename from Common/vtkPlanes.h rename to Common/DataModel/vtkPlanes.h diff --git a/Filtering/vtkPlanesIntersection.cxx b/Common/DataModel/vtkPlanesIntersection.cxx similarity index 100% rename from Filtering/vtkPlanesIntersection.cxx rename to Common/DataModel/vtkPlanesIntersection.cxx diff --git a/Filtering/vtkPlanesIntersection.h b/Common/DataModel/vtkPlanesIntersection.h similarity index 100% rename from Filtering/vtkPlanesIntersection.h rename to Common/DataModel/vtkPlanesIntersection.h diff --git a/Filtering/vtkPointData.cxx b/Common/DataModel/vtkPointData.cxx similarity index 100% rename from Filtering/vtkPointData.cxx rename to Common/DataModel/vtkPointData.cxx diff --git a/Filtering/vtkPointData.h b/Common/DataModel/vtkPointData.h similarity index 100% rename from Filtering/vtkPointData.h rename to Common/DataModel/vtkPointData.h diff --git a/Filtering/vtkPointLocator.cxx b/Common/DataModel/vtkPointLocator.cxx similarity index 100% rename from Filtering/vtkPointLocator.cxx rename to Common/DataModel/vtkPointLocator.cxx diff --git a/Filtering/vtkPointLocator.h b/Common/DataModel/vtkPointLocator.h similarity index 100% rename from Filtering/vtkPointLocator.h rename to Common/DataModel/vtkPointLocator.h diff --git a/Filtering/vtkPointSet.cxx b/Common/DataModel/vtkPointSet.cxx similarity index 100% rename from Filtering/vtkPointSet.cxx rename to Common/DataModel/vtkPointSet.cxx diff --git a/Filtering/vtkPointSet.h b/Common/DataModel/vtkPointSet.h similarity index 100% rename from Filtering/vtkPointSet.h rename to Common/DataModel/vtkPointSet.h diff --git a/Filtering/vtkPointsProjectedHull.cxx b/Common/DataModel/vtkPointsProjectedHull.cxx similarity index 100% rename from Filtering/vtkPointsProjectedHull.cxx rename to Common/DataModel/vtkPointsProjectedHull.cxx diff --git a/Filtering/vtkPointsProjectedHull.h b/Common/DataModel/vtkPointsProjectedHull.h similarity index 100% rename from Filtering/vtkPointsProjectedHull.h rename to Common/DataModel/vtkPointsProjectedHull.h diff --git a/Filtering/vtkPolyData.cxx b/Common/DataModel/vtkPolyData.cxx similarity index 100% rename from Filtering/vtkPolyData.cxx rename to Common/DataModel/vtkPolyData.cxx diff --git a/Filtering/vtkPolyData.h b/Common/DataModel/vtkPolyData.h similarity index 100% rename from Filtering/vtkPolyData.h rename to Common/DataModel/vtkPolyData.h diff --git a/Filtering/vtkPolyDataCollection.cxx b/Common/DataModel/vtkPolyDataCollection.cxx similarity index 100% rename from Filtering/vtkPolyDataCollection.cxx rename to Common/DataModel/vtkPolyDataCollection.cxx diff --git a/Filtering/vtkPolyDataCollection.h b/Common/DataModel/vtkPolyDataCollection.h similarity index 100% rename from Filtering/vtkPolyDataCollection.h rename to Common/DataModel/vtkPolyDataCollection.h diff --git a/Filtering/vtkPolyLine.cxx b/Common/DataModel/vtkPolyLine.cxx similarity index 100% rename from Filtering/vtkPolyLine.cxx rename to Common/DataModel/vtkPolyLine.cxx diff --git a/Filtering/vtkPolyLine.h b/Common/DataModel/vtkPolyLine.h similarity index 100% rename from Filtering/vtkPolyLine.h rename to Common/DataModel/vtkPolyLine.h diff --git a/Filtering/vtkPolyPlane.cxx b/Common/DataModel/vtkPolyPlane.cxx similarity index 100% rename from Filtering/vtkPolyPlane.cxx rename to Common/DataModel/vtkPolyPlane.cxx diff --git a/Filtering/vtkPolyPlane.h b/Common/DataModel/vtkPolyPlane.h similarity index 100% rename from Filtering/vtkPolyPlane.h rename to Common/DataModel/vtkPolyPlane.h diff --git a/Filtering/vtkPolyVertex.cxx b/Common/DataModel/vtkPolyVertex.cxx similarity index 100% rename from Filtering/vtkPolyVertex.cxx rename to Common/DataModel/vtkPolyVertex.cxx diff --git a/Filtering/vtkPolyVertex.h b/Common/DataModel/vtkPolyVertex.h similarity index 100% rename from Filtering/vtkPolyVertex.h rename to Common/DataModel/vtkPolyVertex.h diff --git a/Filtering/vtkPolygon.cxx b/Common/DataModel/vtkPolygon.cxx similarity index 100% rename from Filtering/vtkPolygon.cxx rename to Common/DataModel/vtkPolygon.cxx diff --git a/Filtering/vtkPolygon.h b/Common/DataModel/vtkPolygon.h similarity index 100% rename from Filtering/vtkPolygon.h rename to Common/DataModel/vtkPolygon.h diff --git a/Filtering/vtkPolyhedron.cxx b/Common/DataModel/vtkPolyhedron.cxx similarity index 100% rename from Filtering/vtkPolyhedron.cxx rename to Common/DataModel/vtkPolyhedron.cxx diff --git a/Filtering/vtkPolyhedron.h b/Common/DataModel/vtkPolyhedron.h similarity index 100% rename from Filtering/vtkPolyhedron.h rename to Common/DataModel/vtkPolyhedron.h diff --git a/Filtering/vtkPyramid.cxx b/Common/DataModel/vtkPyramid.cxx similarity index 100% rename from Filtering/vtkPyramid.cxx rename to Common/DataModel/vtkPyramid.cxx diff --git a/Filtering/vtkPyramid.h b/Common/DataModel/vtkPyramid.h similarity index 100% rename from Filtering/vtkPyramid.h rename to Common/DataModel/vtkPyramid.h diff --git a/Filtering/vtkQuad.cxx b/Common/DataModel/vtkQuad.cxx similarity index 100% rename from Filtering/vtkQuad.cxx rename to Common/DataModel/vtkQuad.cxx diff --git a/Filtering/vtkQuad.h b/Common/DataModel/vtkQuad.h similarity index 100% rename from Filtering/vtkQuad.h rename to Common/DataModel/vtkQuad.h diff --git a/Filtering/vtkQuadraticEdge.cxx b/Common/DataModel/vtkQuadraticEdge.cxx similarity index 100% rename from Filtering/vtkQuadraticEdge.cxx rename to Common/DataModel/vtkQuadraticEdge.cxx diff --git a/Filtering/vtkQuadraticEdge.h b/Common/DataModel/vtkQuadraticEdge.h similarity index 100% rename from Filtering/vtkQuadraticEdge.h rename to Common/DataModel/vtkQuadraticEdge.h diff --git a/Filtering/vtkQuadraticHexahedron.cxx b/Common/DataModel/vtkQuadraticHexahedron.cxx similarity index 100% rename from Filtering/vtkQuadraticHexahedron.cxx rename to Common/DataModel/vtkQuadraticHexahedron.cxx diff --git a/Filtering/vtkQuadraticHexahedron.h b/Common/DataModel/vtkQuadraticHexahedron.h similarity index 100% rename from Filtering/vtkQuadraticHexahedron.h rename to Common/DataModel/vtkQuadraticHexahedron.h diff --git a/Filtering/vtkQuadraticLinearQuad.cxx b/Common/DataModel/vtkQuadraticLinearQuad.cxx similarity index 100% rename from Filtering/vtkQuadraticLinearQuad.cxx rename to Common/DataModel/vtkQuadraticLinearQuad.cxx diff --git a/Filtering/vtkQuadraticLinearQuad.h b/Common/DataModel/vtkQuadraticLinearQuad.h similarity index 100% rename from Filtering/vtkQuadraticLinearQuad.h rename to Common/DataModel/vtkQuadraticLinearQuad.h diff --git a/Filtering/vtkQuadraticLinearWedge.cxx b/Common/DataModel/vtkQuadraticLinearWedge.cxx similarity index 100% rename from Filtering/vtkQuadraticLinearWedge.cxx rename to Common/DataModel/vtkQuadraticLinearWedge.cxx diff --git a/Filtering/vtkQuadraticLinearWedge.h b/Common/DataModel/vtkQuadraticLinearWedge.h similarity index 100% rename from Filtering/vtkQuadraticLinearWedge.h rename to Common/DataModel/vtkQuadraticLinearWedge.h diff --git a/Filtering/vtkQuadraticPyramid.cxx b/Common/DataModel/vtkQuadraticPyramid.cxx similarity index 100% rename from Filtering/vtkQuadraticPyramid.cxx rename to Common/DataModel/vtkQuadraticPyramid.cxx diff --git a/Filtering/vtkQuadraticPyramid.h b/Common/DataModel/vtkQuadraticPyramid.h similarity index 100% rename from Filtering/vtkQuadraticPyramid.h rename to Common/DataModel/vtkQuadraticPyramid.h diff --git a/Filtering/vtkQuadraticQuad.cxx b/Common/DataModel/vtkQuadraticQuad.cxx similarity index 100% rename from Filtering/vtkQuadraticQuad.cxx rename to Common/DataModel/vtkQuadraticQuad.cxx diff --git a/Filtering/vtkQuadraticQuad.h b/Common/DataModel/vtkQuadraticQuad.h similarity index 100% rename from Filtering/vtkQuadraticQuad.h rename to Common/DataModel/vtkQuadraticQuad.h diff --git a/Filtering/vtkQuadraticTetra.cxx b/Common/DataModel/vtkQuadraticTetra.cxx similarity index 100% rename from Filtering/vtkQuadraticTetra.cxx rename to Common/DataModel/vtkQuadraticTetra.cxx diff --git a/Filtering/vtkQuadraticTetra.h b/Common/DataModel/vtkQuadraticTetra.h similarity index 100% rename from Filtering/vtkQuadraticTetra.h rename to Common/DataModel/vtkQuadraticTetra.h diff --git a/Filtering/vtkQuadraticTriangle.cxx b/Common/DataModel/vtkQuadraticTriangle.cxx similarity index 100% rename from Filtering/vtkQuadraticTriangle.cxx rename to Common/DataModel/vtkQuadraticTriangle.cxx diff --git a/Filtering/vtkQuadraticTriangle.h b/Common/DataModel/vtkQuadraticTriangle.h similarity index 100% rename from Filtering/vtkQuadraticTriangle.h rename to Common/DataModel/vtkQuadraticTriangle.h diff --git a/Filtering/vtkQuadraticWedge.cxx b/Common/DataModel/vtkQuadraticWedge.cxx similarity index 100% rename from Filtering/vtkQuadraticWedge.cxx rename to Common/DataModel/vtkQuadraticWedge.cxx diff --git a/Filtering/vtkQuadraticWedge.h b/Common/DataModel/vtkQuadraticWedge.h similarity index 100% rename from Filtering/vtkQuadraticWedge.h rename to Common/DataModel/vtkQuadraticWedge.h diff --git a/Common/vtkQuadratureSchemeDefinition.cxx b/Common/DataModel/vtkQuadratureSchemeDefinition.cxx similarity index 100% rename from Common/vtkQuadratureSchemeDefinition.cxx rename to Common/DataModel/vtkQuadratureSchemeDefinition.cxx diff --git a/Common/vtkQuadratureSchemeDefinition.h b/Common/DataModel/vtkQuadratureSchemeDefinition.h similarity index 100% rename from Common/vtkQuadratureSchemeDefinition.h rename to Common/DataModel/vtkQuadratureSchemeDefinition.h diff --git a/Common/vtkQuadric.cxx b/Common/DataModel/vtkQuadric.cxx similarity index 100% rename from Common/vtkQuadric.cxx rename to Common/DataModel/vtkQuadric.cxx diff --git a/Common/vtkQuadric.h b/Common/DataModel/vtkQuadric.h similarity index 100% rename from Common/vtkQuadric.h rename to Common/DataModel/vtkQuadric.h diff --git a/Common/vtkRect.h b/Common/DataModel/vtkRect.h similarity index 100% rename from Common/vtkRect.h rename to Common/DataModel/vtkRect.h diff --git a/Filtering/vtkRectilinearGrid.cxx b/Common/DataModel/vtkRectilinearGrid.cxx similarity index 100% rename from Filtering/vtkRectilinearGrid.cxx rename to Common/DataModel/vtkRectilinearGrid.cxx diff --git a/Filtering/vtkRectilinearGrid.h b/Common/DataModel/vtkRectilinearGrid.h similarity index 100% rename from Filtering/vtkRectilinearGrid.h rename to Common/DataModel/vtkRectilinearGrid.h diff --git a/Filtering/vtkReebGraph.cxx b/Common/DataModel/vtkReebGraph.cxx similarity index 100% rename from Filtering/vtkReebGraph.cxx rename to Common/DataModel/vtkReebGraph.cxx diff --git a/Filtering/vtkReebGraph.h b/Common/DataModel/vtkReebGraph.h similarity index 100% rename from Filtering/vtkReebGraph.h rename to Common/DataModel/vtkReebGraph.h diff --git a/Filtering/vtkReebGraphSimplificationMetric.cxx b/Common/DataModel/vtkReebGraphSimplificationMetric.cxx similarity index 100% rename from Filtering/vtkReebGraphSimplificationMetric.cxx rename to Common/DataModel/vtkReebGraphSimplificationMetric.cxx diff --git a/Filtering/vtkReebGraphSimplificationMetric.h b/Common/DataModel/vtkReebGraphSimplificationMetric.h similarity index 100% rename from Filtering/vtkReebGraphSimplificationMetric.h rename to Common/DataModel/vtkReebGraphSimplificationMetric.h diff --git a/Filtering/vtkSelection.cxx b/Common/DataModel/vtkSelection.cxx similarity index 100% rename from Filtering/vtkSelection.cxx rename to Common/DataModel/vtkSelection.cxx diff --git a/Filtering/vtkSelection.h b/Common/DataModel/vtkSelection.h similarity index 100% rename from Filtering/vtkSelection.h rename to Common/DataModel/vtkSelection.h diff --git a/Filtering/vtkSelectionNode.cxx b/Common/DataModel/vtkSelectionNode.cxx similarity index 100% rename from Filtering/vtkSelectionNode.cxx rename to Common/DataModel/vtkSelectionNode.cxx diff --git a/Filtering/vtkSelectionNode.h b/Common/DataModel/vtkSelectionNode.h similarity index 100% rename from Filtering/vtkSelectionNode.h rename to Common/DataModel/vtkSelectionNode.h diff --git a/Filtering/vtkSimpleCellTessellator.cxx b/Common/DataModel/vtkSimpleCellTessellator.cxx similarity index 100% rename from Filtering/vtkSimpleCellTessellator.cxx rename to Common/DataModel/vtkSimpleCellTessellator.cxx diff --git a/Filtering/vtkSimpleCellTessellator.h b/Common/DataModel/vtkSimpleCellTessellator.h similarity index 100% rename from Filtering/vtkSimpleCellTessellator.h rename to Common/DataModel/vtkSimpleCellTessellator.h diff --git a/Filtering/vtkSmoothErrorMetric.cxx b/Common/DataModel/vtkSmoothErrorMetric.cxx similarity index 100% rename from Filtering/vtkSmoothErrorMetric.cxx rename to Common/DataModel/vtkSmoothErrorMetric.cxx diff --git a/Filtering/vtkSmoothErrorMetric.h b/Common/DataModel/vtkSmoothErrorMetric.h similarity index 100% rename from Filtering/vtkSmoothErrorMetric.h rename to Common/DataModel/vtkSmoothErrorMetric.h diff --git a/Filtering/vtkSphere.cxx b/Common/DataModel/vtkSphere.cxx similarity index 100% rename from Filtering/vtkSphere.cxx rename to Common/DataModel/vtkSphere.cxx diff --git a/Filtering/vtkSphere.h b/Common/DataModel/vtkSphere.h similarity index 100% rename from Filtering/vtkSphere.h rename to Common/DataModel/vtkSphere.h diff --git a/Filtering/vtkSpline.cxx b/Common/DataModel/vtkSpline.cxx similarity index 100% rename from Filtering/vtkSpline.cxx rename to Common/DataModel/vtkSpline.cxx diff --git a/Filtering/vtkSpline.h b/Common/DataModel/vtkSpline.h similarity index 100% rename from Filtering/vtkSpline.h rename to Common/DataModel/vtkSpline.h diff --git a/Common/vtkStructuredData.cxx b/Common/DataModel/vtkStructuredData.cxx similarity index 100% rename from Common/vtkStructuredData.cxx rename to Common/DataModel/vtkStructuredData.cxx diff --git a/Common/vtkStructuredData.h b/Common/DataModel/vtkStructuredData.h similarity index 100% rename from Common/vtkStructuredData.h rename to Common/DataModel/vtkStructuredData.h diff --git a/Common/vtkStructuredExtent.cxx b/Common/DataModel/vtkStructuredExtent.cxx similarity index 100% rename from Common/vtkStructuredExtent.cxx rename to Common/DataModel/vtkStructuredExtent.cxx diff --git a/Common/vtkStructuredExtent.h b/Common/DataModel/vtkStructuredExtent.h similarity index 100% rename from Common/vtkStructuredExtent.h rename to Common/DataModel/vtkStructuredExtent.h diff --git a/Filtering/vtkStructuredGrid.cxx b/Common/DataModel/vtkStructuredGrid.cxx similarity index 100% rename from Filtering/vtkStructuredGrid.cxx rename to Common/DataModel/vtkStructuredGrid.cxx diff --git a/Filtering/vtkStructuredGrid.h b/Common/DataModel/vtkStructuredGrid.h similarity index 100% rename from Filtering/vtkStructuredGrid.h rename to Common/DataModel/vtkStructuredGrid.h diff --git a/Filtering/vtkStructuredPoints.cxx b/Common/DataModel/vtkStructuredPoints.cxx similarity index 100% rename from Filtering/vtkStructuredPoints.cxx rename to Common/DataModel/vtkStructuredPoints.cxx diff --git a/Filtering/vtkStructuredPoints.h b/Common/DataModel/vtkStructuredPoints.h similarity index 100% rename from Filtering/vtkStructuredPoints.h rename to Common/DataModel/vtkStructuredPoints.h diff --git a/Filtering/vtkStructuredPointsCollection.cxx b/Common/DataModel/vtkStructuredPointsCollection.cxx similarity index 100% rename from Filtering/vtkStructuredPointsCollection.cxx rename to Common/DataModel/vtkStructuredPointsCollection.cxx diff --git a/Filtering/vtkStructuredPointsCollection.h b/Common/DataModel/vtkStructuredPointsCollection.h similarity index 100% rename from Filtering/vtkStructuredPointsCollection.h rename to Common/DataModel/vtkStructuredPointsCollection.h diff --git a/Common/vtkStructuredVisibilityConstraint.cxx b/Common/DataModel/vtkStructuredVisibilityConstraint.cxx similarity index 100% rename from Common/vtkStructuredVisibilityConstraint.cxx rename to Common/DataModel/vtkStructuredVisibilityConstraint.cxx diff --git a/Common/vtkStructuredVisibilityConstraint.h b/Common/DataModel/vtkStructuredVisibilityConstraint.h similarity index 100% rename from Common/vtkStructuredVisibilityConstraint.h rename to Common/DataModel/vtkStructuredVisibilityConstraint.h diff --git a/Filtering/vtkSuperquadric.cxx b/Common/DataModel/vtkSuperquadric.cxx similarity index 100% rename from Filtering/vtkSuperquadric.cxx rename to Common/DataModel/vtkSuperquadric.cxx diff --git a/Filtering/vtkSuperquadric.h b/Common/DataModel/vtkSuperquadric.h similarity index 100% rename from Filtering/vtkSuperquadric.h rename to Common/DataModel/vtkSuperquadric.h diff --git a/Filtering/vtkTable.cxx b/Common/DataModel/vtkTable.cxx similarity index 100% rename from Filtering/vtkTable.cxx rename to Common/DataModel/vtkTable.cxx diff --git a/Filtering/vtkTable.h b/Common/DataModel/vtkTable.h similarity index 100% rename from Filtering/vtkTable.h rename to Common/DataModel/vtkTable.h diff --git a/Filtering/vtkTemporalDataSet.cxx b/Common/DataModel/vtkTemporalDataSet.cxx similarity index 100% rename from Filtering/vtkTemporalDataSet.cxx rename to Common/DataModel/vtkTemporalDataSet.cxx diff --git a/Filtering/vtkTemporalDataSet.h b/Common/DataModel/vtkTemporalDataSet.h similarity index 100% rename from Filtering/vtkTemporalDataSet.h rename to Common/DataModel/vtkTemporalDataSet.h diff --git a/Common/vtkTensor.cxx b/Common/DataModel/vtkTensor.cxx similarity index 100% rename from Common/vtkTensor.cxx rename to Common/DataModel/vtkTensor.cxx diff --git a/Common/vtkTensor.h b/Common/DataModel/vtkTensor.h similarity index 100% rename from Common/vtkTensor.h rename to Common/DataModel/vtkTensor.h diff --git a/Filtering/vtkTetra.cxx b/Common/DataModel/vtkTetra.cxx similarity index 100% rename from Filtering/vtkTetra.cxx rename to Common/DataModel/vtkTetra.cxx diff --git a/Filtering/vtkTetra.h b/Common/DataModel/vtkTetra.h similarity index 100% rename from Filtering/vtkTetra.h rename to Common/DataModel/vtkTetra.h diff --git a/Filtering/vtkTree.cxx b/Common/DataModel/vtkTree.cxx similarity index 100% rename from Filtering/vtkTree.cxx rename to Common/DataModel/vtkTree.cxx diff --git a/Filtering/vtkTree.h b/Common/DataModel/vtkTree.h similarity index 100% rename from Filtering/vtkTree.h rename to Common/DataModel/vtkTree.h diff --git a/Filtering/vtkTreeBFSIterator.cxx b/Common/DataModel/vtkTreeBFSIterator.cxx similarity index 100% rename from Filtering/vtkTreeBFSIterator.cxx rename to Common/DataModel/vtkTreeBFSIterator.cxx diff --git a/Filtering/vtkTreeBFSIterator.h b/Common/DataModel/vtkTreeBFSIterator.h similarity index 100% rename from Filtering/vtkTreeBFSIterator.h rename to Common/DataModel/vtkTreeBFSIterator.h diff --git a/Filtering/vtkTreeDFSIterator.cxx b/Common/DataModel/vtkTreeDFSIterator.cxx similarity index 100% rename from Filtering/vtkTreeDFSIterator.cxx rename to Common/DataModel/vtkTreeDFSIterator.cxx diff --git a/Filtering/vtkTreeDFSIterator.h b/Common/DataModel/vtkTreeDFSIterator.h similarity index 100% rename from Filtering/vtkTreeDFSIterator.h rename to Common/DataModel/vtkTreeDFSIterator.h diff --git a/Filtering/vtkTreeIterator.cxx b/Common/DataModel/vtkTreeIterator.cxx similarity index 100% rename from Filtering/vtkTreeIterator.cxx rename to Common/DataModel/vtkTreeIterator.cxx diff --git a/Filtering/vtkTreeIterator.h b/Common/DataModel/vtkTreeIterator.h similarity index 100% rename from Filtering/vtkTreeIterator.h rename to Common/DataModel/vtkTreeIterator.h diff --git a/Filtering/vtkTriQuadraticHexahedron.cxx b/Common/DataModel/vtkTriQuadraticHexahedron.cxx similarity index 100% rename from Filtering/vtkTriQuadraticHexahedron.cxx rename to Common/DataModel/vtkTriQuadraticHexahedron.cxx diff --git a/Filtering/vtkTriQuadraticHexahedron.h b/Common/DataModel/vtkTriQuadraticHexahedron.h similarity index 100% rename from Filtering/vtkTriQuadraticHexahedron.h rename to Common/DataModel/vtkTriQuadraticHexahedron.h diff --git a/Filtering/vtkTriangle.cxx b/Common/DataModel/vtkTriangle.cxx similarity index 100% rename from Filtering/vtkTriangle.cxx rename to Common/DataModel/vtkTriangle.cxx diff --git a/Filtering/vtkTriangle.h b/Common/DataModel/vtkTriangle.h similarity index 100% rename from Filtering/vtkTriangle.h rename to Common/DataModel/vtkTriangle.h diff --git a/Filtering/vtkTriangleStrip.cxx b/Common/DataModel/vtkTriangleStrip.cxx similarity index 100% rename from Filtering/vtkTriangleStrip.cxx rename to Common/DataModel/vtkTriangleStrip.cxx diff --git a/Filtering/vtkTriangleStrip.h b/Common/DataModel/vtkTriangleStrip.h similarity index 100% rename from Filtering/vtkTriangleStrip.h rename to Common/DataModel/vtkTriangleStrip.h diff --git a/Common/vtkTuple.h b/Common/DataModel/vtkTuple.h similarity index 100% rename from Common/vtkTuple.h rename to Common/DataModel/vtkTuple.h diff --git a/Filtering/vtkUndirectedGraph.cxx b/Common/DataModel/vtkUndirectedGraph.cxx similarity index 100% rename from Filtering/vtkUndirectedGraph.cxx rename to Common/DataModel/vtkUndirectedGraph.cxx diff --git a/Filtering/vtkUndirectedGraph.h b/Common/DataModel/vtkUndirectedGraph.h similarity index 100% rename from Filtering/vtkUndirectedGraph.h rename to Common/DataModel/vtkUndirectedGraph.h diff --git a/Filtering/vtkUniformGrid.cxx b/Common/DataModel/vtkUniformGrid.cxx similarity index 100% rename from Filtering/vtkUniformGrid.cxx rename to Common/DataModel/vtkUniformGrid.cxx diff --git a/Filtering/vtkUniformGrid.h b/Common/DataModel/vtkUniformGrid.h similarity index 100% rename from Filtering/vtkUniformGrid.h rename to Common/DataModel/vtkUniformGrid.h diff --git a/Filtering/vtkUniformGridAMR.cxx b/Common/DataModel/vtkUniformGridAMR.cxx similarity index 100% rename from Filtering/vtkUniformGridAMR.cxx rename to Common/DataModel/vtkUniformGridAMR.cxx diff --git a/Filtering/vtkUniformGridAMR.h b/Common/DataModel/vtkUniformGridAMR.h similarity index 100% rename from Filtering/vtkUniformGridAMR.h rename to Common/DataModel/vtkUniformGridAMR.h diff --git a/Filtering/vtkUniformGridAMRDataIterator.cxx b/Common/DataModel/vtkUniformGridAMRDataIterator.cxx similarity index 100% rename from Filtering/vtkUniformGridAMRDataIterator.cxx rename to Common/DataModel/vtkUniformGridAMRDataIterator.cxx diff --git a/Filtering/vtkUniformGridAMRDataIterator.h b/Common/DataModel/vtkUniformGridAMRDataIterator.h similarity index 100% rename from Filtering/vtkUniformGridAMRDataIterator.h rename to Common/DataModel/vtkUniformGridAMRDataIterator.h diff --git a/Filtering/vtkUnstructuredGrid.cxx b/Common/DataModel/vtkUnstructuredGrid.cxx similarity index 100% rename from Filtering/vtkUnstructuredGrid.cxx rename to Common/DataModel/vtkUnstructuredGrid.cxx diff --git a/Filtering/vtkUnstructuredGrid.h b/Common/DataModel/vtkUnstructuredGrid.h similarity index 100% rename from Filtering/vtkUnstructuredGrid.h rename to Common/DataModel/vtkUnstructuredGrid.h diff --git a/Common/vtkVector.h b/Common/DataModel/vtkVector.h similarity index 100% rename from Common/vtkVector.h rename to Common/DataModel/vtkVector.h diff --git a/Common/vtkVectorOperators.h b/Common/DataModel/vtkVectorOperators.h similarity index 100% rename from Common/vtkVectorOperators.h rename to Common/DataModel/vtkVectorOperators.h diff --git a/Filtering/vtkVertex.cxx b/Common/DataModel/vtkVertex.cxx similarity index 100% rename from Filtering/vtkVertex.cxx rename to Common/DataModel/vtkVertex.cxx diff --git a/Filtering/vtkVertex.h b/Common/DataModel/vtkVertex.h similarity index 100% rename from Filtering/vtkVertex.h rename to Common/DataModel/vtkVertex.h diff --git a/Filtering/vtkVertexListIterator.cxx b/Common/DataModel/vtkVertexListIterator.cxx similarity index 100% rename from Filtering/vtkVertexListIterator.cxx rename to Common/DataModel/vtkVertexListIterator.cxx diff --git a/Filtering/vtkVertexListIterator.h b/Common/DataModel/vtkVertexListIterator.h similarity index 100% rename from Filtering/vtkVertexListIterator.h rename to Common/DataModel/vtkVertexListIterator.h diff --git a/Filtering/vtkVoxel.cxx b/Common/DataModel/vtkVoxel.cxx similarity index 100% rename from Filtering/vtkVoxel.cxx rename to Common/DataModel/vtkVoxel.cxx diff --git a/Filtering/vtkVoxel.h b/Common/DataModel/vtkVoxel.h similarity index 100% rename from Filtering/vtkVoxel.h rename to Common/DataModel/vtkVoxel.h diff --git a/Filtering/vtkWedge.cxx b/Common/DataModel/vtkWedge.cxx similarity index 100% rename from Filtering/vtkWedge.cxx rename to Common/DataModel/vtkWedge.cxx diff --git a/Filtering/vtkWedge.h b/Common/DataModel/vtkWedge.h similarity index 100% rename from Filtering/vtkWedge.h rename to Common/DataModel/vtkWedge.h diff --git a/Common/vtkXMLDataElement.cxx b/Common/DataModel/vtkXMLDataElement.cxx similarity index 100% rename from Common/vtkXMLDataElement.cxx rename to Common/DataModel/vtkXMLDataElement.cxx diff --git a/Common/vtkXMLDataElement.h b/Common/DataModel/vtkXMLDataElement.h similarity index 100% rename from Common/vtkXMLDataElement.h rename to Common/DataModel/vtkXMLDataElement.h diff --git a/Filtering/Testing/Cxx/TestImageDataToStructuredGrid.cxx b/Common/ExecutionModel/Testing/Cxx/TestImageDataToStructuredGrid.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestImageDataToStructuredGrid.cxx rename to Common/ExecutionModel/Testing/Cxx/TestImageDataToStructuredGrid.cxx diff --git a/Filtering/Testing/Cxx/TestLinearSelector2D.cxx b/Common/ExecutionModel/Testing/Cxx/TestLinearSelector2D.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestLinearSelector2D.cxx rename to Common/ExecutionModel/Testing/Cxx/TestLinearSelector2D.cxx diff --git a/Filtering/Testing/Cxx/TestLinearSelector3D.cxx b/Common/ExecutionModel/Testing/Cxx/TestLinearSelector3D.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestLinearSelector3D.cxx rename to Common/ExecutionModel/Testing/Cxx/TestLinearSelector3D.cxx diff --git a/Filtering/vtkAlgorithm.cxx b/Common/ExecutionModel/vtkAlgorithm.cxx similarity index 100% rename from Filtering/vtkAlgorithm.cxx rename to Common/ExecutionModel/vtkAlgorithm.cxx diff --git a/Filtering/vtkAlgorithm.h b/Common/ExecutionModel/vtkAlgorithm.h similarity index 100% rename from Filtering/vtkAlgorithm.h rename to Common/ExecutionModel/vtkAlgorithm.h diff --git a/Filtering/vtkAlgorithmOutput.cxx b/Common/ExecutionModel/vtkAlgorithmOutput.cxx similarity index 100% rename from Filtering/vtkAlgorithmOutput.cxx rename to Common/ExecutionModel/vtkAlgorithmOutput.cxx diff --git a/Filtering/vtkAlgorithmOutput.h b/Common/ExecutionModel/vtkAlgorithmOutput.h similarity index 100% rename from Filtering/vtkAlgorithmOutput.h rename to Common/ExecutionModel/vtkAlgorithmOutput.h diff --git a/Filtering/vtkAnnotationLayersAlgorithm.cxx b/Common/ExecutionModel/vtkAnnotationLayersAlgorithm.cxx similarity index 100% rename from Filtering/vtkAnnotationLayersAlgorithm.cxx rename to Common/ExecutionModel/vtkAnnotationLayersAlgorithm.cxx diff --git a/Filtering/vtkAnnotationLayersAlgorithm.h b/Common/ExecutionModel/vtkAnnotationLayersAlgorithm.h similarity index 100% rename from Filtering/vtkAnnotationLayersAlgorithm.h rename to Common/ExecutionModel/vtkAnnotationLayersAlgorithm.h diff --git a/Filtering/vtkArrayDataAlgorithm.cxx b/Common/ExecutionModel/vtkArrayDataAlgorithm.cxx similarity index 100% rename from Filtering/vtkArrayDataAlgorithm.cxx rename to Common/ExecutionModel/vtkArrayDataAlgorithm.cxx diff --git a/Filtering/vtkArrayDataAlgorithm.h b/Common/ExecutionModel/vtkArrayDataAlgorithm.h similarity index 100% rename from Filtering/vtkArrayDataAlgorithm.h rename to Common/ExecutionModel/vtkArrayDataAlgorithm.h diff --git a/Filtering/vtkCachedStreamingDemandDrivenPipeline.cxx b/Common/ExecutionModel/vtkCachedStreamingDemandDrivenPipeline.cxx similarity index 100% rename from Filtering/vtkCachedStreamingDemandDrivenPipeline.cxx rename to Common/ExecutionModel/vtkCachedStreamingDemandDrivenPipeline.cxx diff --git a/Filtering/vtkCachedStreamingDemandDrivenPipeline.h b/Common/ExecutionModel/vtkCachedStreamingDemandDrivenPipeline.h similarity index 100% rename from Filtering/vtkCachedStreamingDemandDrivenPipeline.h rename to Common/ExecutionModel/vtkCachedStreamingDemandDrivenPipeline.h diff --git a/Filtering/vtkCastToConcrete.cxx b/Common/ExecutionModel/vtkCastToConcrete.cxx similarity index 100% rename from Filtering/vtkCastToConcrete.cxx rename to Common/ExecutionModel/vtkCastToConcrete.cxx diff --git a/Filtering/vtkCastToConcrete.h b/Common/ExecutionModel/vtkCastToConcrete.h similarity index 100% rename from Filtering/vtkCastToConcrete.h rename to Common/ExecutionModel/vtkCastToConcrete.h diff --git a/Filtering/vtkCompositeDataPipeline.cxx b/Common/ExecutionModel/vtkCompositeDataPipeline.cxx similarity index 100% rename from Filtering/vtkCompositeDataPipeline.cxx rename to Common/ExecutionModel/vtkCompositeDataPipeline.cxx diff --git a/Filtering/vtkCompositeDataPipeline.h b/Common/ExecutionModel/vtkCompositeDataPipeline.h similarity index 100% rename from Filtering/vtkCompositeDataPipeline.h rename to Common/ExecutionModel/vtkCompositeDataPipeline.h diff --git a/Filtering/vtkCompositeDataSetAlgorithm.cxx b/Common/ExecutionModel/vtkCompositeDataSetAlgorithm.cxx similarity index 100% rename from Filtering/vtkCompositeDataSetAlgorithm.cxx rename to Common/ExecutionModel/vtkCompositeDataSetAlgorithm.cxx diff --git a/Filtering/vtkCompositeDataSetAlgorithm.h b/Common/ExecutionModel/vtkCompositeDataSetAlgorithm.h similarity index 100% rename from Filtering/vtkCompositeDataSetAlgorithm.h rename to Common/ExecutionModel/vtkCompositeDataSetAlgorithm.h diff --git a/Filtering/vtkComputingResources.cxx b/Common/ExecutionModel/vtkComputingResources.cxx similarity index 100% rename from Filtering/vtkComputingResources.cxx rename to Common/ExecutionModel/vtkComputingResources.cxx diff --git a/Filtering/vtkComputingResources.h b/Common/ExecutionModel/vtkComputingResources.h similarity index 100% rename from Filtering/vtkComputingResources.h rename to Common/ExecutionModel/vtkComputingResources.h diff --git a/Filtering/vtkDataObjectAlgorithm.cxx b/Common/ExecutionModel/vtkDataObjectAlgorithm.cxx similarity index 100% rename from Filtering/vtkDataObjectAlgorithm.cxx rename to Common/ExecutionModel/vtkDataObjectAlgorithm.cxx diff --git a/Filtering/vtkDataObjectAlgorithm.h b/Common/ExecutionModel/vtkDataObjectAlgorithm.h similarity index 100% rename from Filtering/vtkDataObjectAlgorithm.h rename to Common/ExecutionModel/vtkDataObjectAlgorithm.h diff --git a/Filtering/vtkDataSetAlgorithm.cxx b/Common/ExecutionModel/vtkDataSetAlgorithm.cxx similarity index 100% rename from Filtering/vtkDataSetAlgorithm.cxx rename to Common/ExecutionModel/vtkDataSetAlgorithm.cxx diff --git a/Filtering/vtkDataSetAlgorithm.h b/Common/ExecutionModel/vtkDataSetAlgorithm.h similarity index 100% rename from Filtering/vtkDataSetAlgorithm.h rename to Common/ExecutionModel/vtkDataSetAlgorithm.h diff --git a/Filtering/vtkDemandDrivenPipeline.cxx b/Common/ExecutionModel/vtkDemandDrivenPipeline.cxx similarity index 100% rename from Filtering/vtkDemandDrivenPipeline.cxx rename to Common/ExecutionModel/vtkDemandDrivenPipeline.cxx diff --git a/Filtering/vtkDemandDrivenPipeline.h b/Common/ExecutionModel/vtkDemandDrivenPipeline.h similarity index 100% rename from Filtering/vtkDemandDrivenPipeline.h rename to Common/ExecutionModel/vtkDemandDrivenPipeline.h diff --git a/Filtering/vtkDirectedGraphAlgorithm.cxx b/Common/ExecutionModel/vtkDirectedGraphAlgorithm.cxx similarity index 100% rename from Filtering/vtkDirectedGraphAlgorithm.cxx rename to Common/ExecutionModel/vtkDirectedGraphAlgorithm.cxx diff --git a/Filtering/vtkDirectedGraphAlgorithm.h b/Common/ExecutionModel/vtkDirectedGraphAlgorithm.h similarity index 100% rename from Filtering/vtkDirectedGraphAlgorithm.h rename to Common/ExecutionModel/vtkDirectedGraphAlgorithm.h diff --git a/Filtering/vtkExecutionScheduler.cxx b/Common/ExecutionModel/vtkExecutionScheduler.cxx similarity index 100% rename from Filtering/vtkExecutionScheduler.cxx rename to Common/ExecutionModel/vtkExecutionScheduler.cxx diff --git a/Filtering/vtkExecutionScheduler.h b/Common/ExecutionModel/vtkExecutionScheduler.h similarity index 100% rename from Filtering/vtkExecutionScheduler.h rename to Common/ExecutionModel/vtkExecutionScheduler.h diff --git a/Filtering/vtkExecutionSchedulerManager.cxx b/Common/ExecutionModel/vtkExecutionSchedulerManager.cxx similarity index 100% rename from Filtering/vtkExecutionSchedulerManager.cxx rename to Common/ExecutionModel/vtkExecutionSchedulerManager.cxx diff --git a/Filtering/vtkExecutionSchedulerManager.h b/Common/ExecutionModel/vtkExecutionSchedulerManager.h similarity index 100% rename from Filtering/vtkExecutionSchedulerManager.h rename to Common/ExecutionModel/vtkExecutionSchedulerManager.h diff --git a/Filtering/vtkExecutive.cxx b/Common/ExecutionModel/vtkExecutive.cxx similarity index 100% rename from Filtering/vtkExecutive.cxx rename to Common/ExecutionModel/vtkExecutive.cxx diff --git a/Filtering/vtkExecutive.h b/Common/ExecutionModel/vtkExecutive.h similarity index 100% rename from Filtering/vtkExecutive.h rename to Common/ExecutionModel/vtkExecutive.h diff --git a/Filtering/vtkExecutiveCollection.cxx b/Common/ExecutionModel/vtkExecutiveCollection.cxx similarity index 100% rename from Filtering/vtkExecutiveCollection.cxx rename to Common/ExecutionModel/vtkExecutiveCollection.cxx diff --git a/Filtering/vtkExecutiveCollection.h b/Common/ExecutionModel/vtkExecutiveCollection.h similarity index 100% rename from Filtering/vtkExecutiveCollection.h rename to Common/ExecutionModel/vtkExecutiveCollection.h diff --git a/Common/vtkExtentRCBPartitioner.cxx b/Common/ExecutionModel/vtkExtentRCBPartitioner.cxx similarity index 100% rename from Common/vtkExtentRCBPartitioner.cxx rename to Common/ExecutionModel/vtkExtentRCBPartitioner.cxx diff --git a/Common/vtkExtentRCBPartitioner.h b/Common/ExecutionModel/vtkExtentRCBPartitioner.h similarity index 100% rename from Common/vtkExtentRCBPartitioner.h rename to Common/ExecutionModel/vtkExtentRCBPartitioner.h diff --git a/Common/vtkExtentSplitter.cxx b/Common/ExecutionModel/vtkExtentSplitter.cxx similarity index 100% rename from Common/vtkExtentSplitter.cxx rename to Common/ExecutionModel/vtkExtentSplitter.cxx diff --git a/Common/vtkExtentSplitter.h b/Common/ExecutionModel/vtkExtentSplitter.h similarity index 100% rename from Common/vtkExtentSplitter.h rename to Common/ExecutionModel/vtkExtentSplitter.h diff --git a/Common/vtkExtentTranslator.cxx b/Common/ExecutionModel/vtkExtentTranslator.cxx similarity index 100% rename from Common/vtkExtentTranslator.cxx rename to Common/ExecutionModel/vtkExtentTranslator.cxx diff --git a/Common/vtkExtentTranslator.h b/Common/ExecutionModel/vtkExtentTranslator.h similarity index 100% rename from Common/vtkExtentTranslator.h rename to Common/ExecutionModel/vtkExtentTranslator.h diff --git a/Filtering/vtkFilteringInformationKeyManager.cxx b/Common/ExecutionModel/vtkFilteringInformationKeyManager.cxx similarity index 100% rename from Filtering/vtkFilteringInformationKeyManager.cxx rename to Common/ExecutionModel/vtkFilteringInformationKeyManager.cxx diff --git a/Filtering/vtkFilteringInformationKeyManager.h b/Common/ExecutionModel/vtkFilteringInformationKeyManager.h similarity index 100% rename from Filtering/vtkFilteringInformationKeyManager.h rename to Common/ExecutionModel/vtkFilteringInformationKeyManager.h diff --git a/Filtering/vtkGraphAlgorithm.cxx b/Common/ExecutionModel/vtkGraphAlgorithm.cxx similarity index 100% rename from Filtering/vtkGraphAlgorithm.cxx rename to Common/ExecutionModel/vtkGraphAlgorithm.cxx diff --git a/Filtering/vtkGraphAlgorithm.h b/Common/ExecutionModel/vtkGraphAlgorithm.h similarity index 100% rename from Filtering/vtkGraphAlgorithm.h rename to Common/ExecutionModel/vtkGraphAlgorithm.h diff --git a/Filtering/vtkHierarchicalBoxDataSetAlgorithm.cxx b/Common/ExecutionModel/vtkHierarchicalBoxDataSetAlgorithm.cxx similarity index 100% rename from Filtering/vtkHierarchicalBoxDataSetAlgorithm.cxx rename to Common/ExecutionModel/vtkHierarchicalBoxDataSetAlgorithm.cxx diff --git a/Filtering/vtkHierarchicalBoxDataSetAlgorithm.h b/Common/ExecutionModel/vtkHierarchicalBoxDataSetAlgorithm.h similarity index 100% rename from Filtering/vtkHierarchicalBoxDataSetAlgorithm.h rename to Common/ExecutionModel/vtkHierarchicalBoxDataSetAlgorithm.h diff --git a/Filtering/vtkHyperOctreeAlgorithm.cxx b/Common/ExecutionModel/vtkHyperOctreeAlgorithm.cxx similarity index 100% rename from Filtering/vtkHyperOctreeAlgorithm.cxx rename to Common/ExecutionModel/vtkHyperOctreeAlgorithm.cxx diff --git a/Filtering/vtkHyperOctreeAlgorithm.h b/Common/ExecutionModel/vtkHyperOctreeAlgorithm.h similarity index 100% rename from Filtering/vtkHyperOctreeAlgorithm.h rename to Common/ExecutionModel/vtkHyperOctreeAlgorithm.h diff --git a/Filtering/vtkImageAlgorithm.cxx b/Common/ExecutionModel/vtkImageAlgorithm.cxx similarity index 100% rename from Filtering/vtkImageAlgorithm.cxx rename to Common/ExecutionModel/vtkImageAlgorithm.cxx diff --git a/Filtering/vtkImageAlgorithm.h b/Common/ExecutionModel/vtkImageAlgorithm.h similarity index 100% rename from Filtering/vtkImageAlgorithm.h rename to Common/ExecutionModel/vtkImageAlgorithm.h diff --git a/Filtering/vtkImageInPlaceFilter.cxx b/Common/ExecutionModel/vtkImageInPlaceFilter.cxx similarity index 100% rename from Filtering/vtkImageInPlaceFilter.cxx rename to Common/ExecutionModel/vtkImageInPlaceFilter.cxx diff --git a/Filtering/vtkImageInPlaceFilter.h b/Common/ExecutionModel/vtkImageInPlaceFilter.h similarity index 100% rename from Filtering/vtkImageInPlaceFilter.h rename to Common/ExecutionModel/vtkImageInPlaceFilter.h diff --git a/Filtering/vtkImageProgressIterator.cxx b/Common/ExecutionModel/vtkImageProgressIterator.cxx similarity index 100% rename from Filtering/vtkImageProgressIterator.cxx rename to Common/ExecutionModel/vtkImageProgressIterator.cxx diff --git a/Filtering/vtkImageProgressIterator.h b/Common/ExecutionModel/vtkImageProgressIterator.h similarity index 100% rename from Filtering/vtkImageProgressIterator.h rename to Common/ExecutionModel/vtkImageProgressIterator.h diff --git a/Filtering/vtkImageProgressIterator.txx b/Common/ExecutionModel/vtkImageProgressIterator.txx similarity index 100% rename from Filtering/vtkImageProgressIterator.txx rename to Common/ExecutionModel/vtkImageProgressIterator.txx diff --git a/Filtering/vtkImageToStructuredGrid.cxx b/Common/ExecutionModel/vtkImageToStructuredGrid.cxx similarity index 100% rename from Filtering/vtkImageToStructuredGrid.cxx rename to Common/ExecutionModel/vtkImageToStructuredGrid.cxx diff --git a/Filtering/vtkImageToStructuredGrid.h b/Common/ExecutionModel/vtkImageToStructuredGrid.h similarity index 100% rename from Filtering/vtkImageToStructuredGrid.h rename to Common/ExecutionModel/vtkImageToStructuredGrid.h diff --git a/Filtering/vtkImageToStructuredPoints.cxx b/Common/ExecutionModel/vtkImageToStructuredPoints.cxx similarity index 100% rename from Filtering/vtkImageToStructuredPoints.cxx rename to Common/ExecutionModel/vtkImageToStructuredPoints.cxx diff --git a/Filtering/vtkImageToStructuredPoints.h b/Common/ExecutionModel/vtkImageToStructuredPoints.h similarity index 100% rename from Filtering/vtkImageToStructuredPoints.h rename to Common/ExecutionModel/vtkImageToStructuredPoints.h diff --git a/Filtering/vtkInformationExecutivePortKey.cxx b/Common/ExecutionModel/vtkInformationExecutivePortKey.cxx similarity index 100% rename from Filtering/vtkInformationExecutivePortKey.cxx rename to Common/ExecutionModel/vtkInformationExecutivePortKey.cxx diff --git a/Filtering/vtkInformationExecutivePortKey.h b/Common/ExecutionModel/vtkInformationExecutivePortKey.h similarity index 100% rename from Filtering/vtkInformationExecutivePortKey.h rename to Common/ExecutionModel/vtkInformationExecutivePortKey.h diff --git a/Filtering/vtkInformationExecutivePortVectorKey.cxx b/Common/ExecutionModel/vtkInformationExecutivePortVectorKey.cxx similarity index 100% rename from Filtering/vtkInformationExecutivePortVectorKey.cxx rename to Common/ExecutionModel/vtkInformationExecutivePortVectorKey.cxx diff --git a/Filtering/vtkInformationExecutivePortVectorKey.h b/Common/ExecutionModel/vtkInformationExecutivePortVectorKey.h similarity index 100% rename from Filtering/vtkInformationExecutivePortVectorKey.h rename to Common/ExecutionModel/vtkInformationExecutivePortVectorKey.h diff --git a/Filtering/vtkLinearSelector.cxx b/Common/ExecutionModel/vtkLinearSelector.cxx similarity index 100% rename from Filtering/vtkLinearSelector.cxx rename to Common/ExecutionModel/vtkLinearSelector.cxx diff --git a/Filtering/vtkLinearSelector.h b/Common/ExecutionModel/vtkLinearSelector.h similarity index 100% rename from Filtering/vtkLinearSelector.h rename to Common/ExecutionModel/vtkLinearSelector.h diff --git a/Filtering/vtkMultiBlockDataSetAlgorithm.cxx b/Common/ExecutionModel/vtkMultiBlockDataSetAlgorithm.cxx similarity index 100% rename from Filtering/vtkMultiBlockDataSetAlgorithm.cxx rename to Common/ExecutionModel/vtkMultiBlockDataSetAlgorithm.cxx diff --git a/Filtering/vtkMultiBlockDataSetAlgorithm.h b/Common/ExecutionModel/vtkMultiBlockDataSetAlgorithm.h similarity index 100% rename from Filtering/vtkMultiBlockDataSetAlgorithm.h rename to Common/ExecutionModel/vtkMultiBlockDataSetAlgorithm.h diff --git a/Common/vtkOnePieceExtentTranslator.cxx b/Common/ExecutionModel/vtkOnePieceExtentTranslator.cxx similarity index 100% rename from Common/vtkOnePieceExtentTranslator.cxx rename to Common/ExecutionModel/vtkOnePieceExtentTranslator.cxx diff --git a/Common/vtkOnePieceExtentTranslator.h b/Common/ExecutionModel/vtkOnePieceExtentTranslator.h similarity index 100% rename from Common/vtkOnePieceExtentTranslator.h rename to Common/ExecutionModel/vtkOnePieceExtentTranslator.h diff --git a/Filtering/vtkPassInputTypeAlgorithm.cxx b/Common/ExecutionModel/vtkPassInputTypeAlgorithm.cxx similarity index 100% rename from Filtering/vtkPassInputTypeAlgorithm.cxx rename to Common/ExecutionModel/vtkPassInputTypeAlgorithm.cxx diff --git a/Filtering/vtkPassInputTypeAlgorithm.h b/Common/ExecutionModel/vtkPassInputTypeAlgorithm.h similarity index 100% rename from Filtering/vtkPassInputTypeAlgorithm.h rename to Common/ExecutionModel/vtkPassInputTypeAlgorithm.h diff --git a/Filtering/vtkPiecewiseFunctionAlgorithm.cxx b/Common/ExecutionModel/vtkPiecewiseFunctionAlgorithm.cxx similarity index 100% rename from Filtering/vtkPiecewiseFunctionAlgorithm.cxx rename to Common/ExecutionModel/vtkPiecewiseFunctionAlgorithm.cxx diff --git a/Filtering/vtkPiecewiseFunctionAlgorithm.h b/Common/ExecutionModel/vtkPiecewiseFunctionAlgorithm.h similarity index 100% rename from Filtering/vtkPiecewiseFunctionAlgorithm.h rename to Common/ExecutionModel/vtkPiecewiseFunctionAlgorithm.h diff --git a/Filtering/vtkPiecewiseFunctionShiftScale.cxx b/Common/ExecutionModel/vtkPiecewiseFunctionShiftScale.cxx similarity index 100% rename from Filtering/vtkPiecewiseFunctionShiftScale.cxx rename to Common/ExecutionModel/vtkPiecewiseFunctionShiftScale.cxx diff --git a/Filtering/vtkPiecewiseFunctionShiftScale.h b/Common/ExecutionModel/vtkPiecewiseFunctionShiftScale.h similarity index 100% rename from Filtering/vtkPiecewiseFunctionShiftScale.h rename to Common/ExecutionModel/vtkPiecewiseFunctionShiftScale.h diff --git a/Filtering/vtkPointSetAlgorithm.cxx b/Common/ExecutionModel/vtkPointSetAlgorithm.cxx similarity index 100% rename from Filtering/vtkPointSetAlgorithm.cxx rename to Common/ExecutionModel/vtkPointSetAlgorithm.cxx diff --git a/Filtering/vtkPointSetAlgorithm.h b/Common/ExecutionModel/vtkPointSetAlgorithm.h similarity index 100% rename from Filtering/vtkPointSetAlgorithm.h rename to Common/ExecutionModel/vtkPointSetAlgorithm.h diff --git a/Filtering/vtkPolyDataAlgorithm.cxx b/Common/ExecutionModel/vtkPolyDataAlgorithm.cxx similarity index 100% rename from Filtering/vtkPolyDataAlgorithm.cxx rename to Common/ExecutionModel/vtkPolyDataAlgorithm.cxx diff --git a/Filtering/vtkPolyDataAlgorithm.h b/Common/ExecutionModel/vtkPolyDataAlgorithm.h similarity index 100% rename from Filtering/vtkPolyDataAlgorithm.h rename to Common/ExecutionModel/vtkPolyDataAlgorithm.h diff --git a/Filtering/vtkRectilinearGridAlgorithm.cxx b/Common/ExecutionModel/vtkRectilinearGridAlgorithm.cxx similarity index 100% rename from Filtering/vtkRectilinearGridAlgorithm.cxx rename to Common/ExecutionModel/vtkRectilinearGridAlgorithm.cxx diff --git a/Filtering/vtkRectilinearGridAlgorithm.h b/Common/ExecutionModel/vtkRectilinearGridAlgorithm.h similarity index 100% rename from Filtering/vtkRectilinearGridAlgorithm.h rename to Common/ExecutionModel/vtkRectilinearGridAlgorithm.h diff --git a/Filtering/vtkScalarTree.cxx b/Common/ExecutionModel/vtkScalarTree.cxx similarity index 100% rename from Filtering/vtkScalarTree.cxx rename to Common/ExecutionModel/vtkScalarTree.cxx diff --git a/Filtering/vtkScalarTree.h b/Common/ExecutionModel/vtkScalarTree.h similarity index 100% rename from Filtering/vtkScalarTree.h rename to Common/ExecutionModel/vtkScalarTree.h diff --git a/Filtering/vtkSelectionAlgorithm.cxx b/Common/ExecutionModel/vtkSelectionAlgorithm.cxx similarity index 100% rename from Filtering/vtkSelectionAlgorithm.cxx rename to Common/ExecutionModel/vtkSelectionAlgorithm.cxx diff --git a/Filtering/vtkSelectionAlgorithm.h b/Common/ExecutionModel/vtkSelectionAlgorithm.h similarity index 100% rename from Filtering/vtkSelectionAlgorithm.h rename to Common/ExecutionModel/vtkSelectionAlgorithm.h diff --git a/Filtering/vtkSimpleImageToImageFilter.cxx b/Common/ExecutionModel/vtkSimpleImageToImageFilter.cxx similarity index 100% rename from Filtering/vtkSimpleImageToImageFilter.cxx rename to Common/ExecutionModel/vtkSimpleImageToImageFilter.cxx diff --git a/Filtering/vtkSimpleImageToImageFilter.h b/Common/ExecutionModel/vtkSimpleImageToImageFilter.h similarity index 100% rename from Filtering/vtkSimpleImageToImageFilter.h rename to Common/ExecutionModel/vtkSimpleImageToImageFilter.h diff --git a/Filtering/vtkSimpleScalarTree.cxx b/Common/ExecutionModel/vtkSimpleScalarTree.cxx similarity index 100% rename from Filtering/vtkSimpleScalarTree.cxx rename to Common/ExecutionModel/vtkSimpleScalarTree.cxx diff --git a/Filtering/vtkSimpleScalarTree.h b/Common/ExecutionModel/vtkSimpleScalarTree.h similarity index 100% rename from Filtering/vtkSimpleScalarTree.h rename to Common/ExecutionModel/vtkSimpleScalarTree.h diff --git a/Filtering/vtkStreamingDemandDrivenPipeline.cxx b/Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.cxx similarity index 100% rename from Filtering/vtkStreamingDemandDrivenPipeline.cxx rename to Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.cxx diff --git a/Filtering/vtkStreamingDemandDrivenPipeline.h b/Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.h similarity index 100% rename from Filtering/vtkStreamingDemandDrivenPipeline.h rename to Common/ExecutionModel/vtkStreamingDemandDrivenPipeline.h diff --git a/Filtering/vtkStructuredGridAlgorithm.cxx b/Common/ExecutionModel/vtkStructuredGridAlgorithm.cxx similarity index 100% rename from Filtering/vtkStructuredGridAlgorithm.cxx rename to Common/ExecutionModel/vtkStructuredGridAlgorithm.cxx diff --git a/Filtering/vtkStructuredGridAlgorithm.h b/Common/ExecutionModel/vtkStructuredGridAlgorithm.h similarity index 100% rename from Filtering/vtkStructuredGridAlgorithm.h rename to Common/ExecutionModel/vtkStructuredGridAlgorithm.h diff --git a/Filtering/vtkTableAlgorithm.cxx b/Common/ExecutionModel/vtkTableAlgorithm.cxx similarity index 100% rename from Filtering/vtkTableAlgorithm.cxx rename to Common/ExecutionModel/vtkTableAlgorithm.cxx diff --git a/Filtering/vtkTableAlgorithm.h b/Common/ExecutionModel/vtkTableAlgorithm.h similarity index 100% rename from Filtering/vtkTableAlgorithm.h rename to Common/ExecutionModel/vtkTableAlgorithm.h diff --git a/Common/vtkTableExtentTranslator.cxx b/Common/ExecutionModel/vtkTableExtentTranslator.cxx similarity index 100% rename from Common/vtkTableExtentTranslator.cxx rename to Common/ExecutionModel/vtkTableExtentTranslator.cxx diff --git a/Common/vtkTableExtentTranslator.h b/Common/ExecutionModel/vtkTableExtentTranslator.h similarity index 100% rename from Common/vtkTableExtentTranslator.h rename to Common/ExecutionModel/vtkTableExtentTranslator.h diff --git a/Filtering/vtkTemporalDataSetAlgorithm.cxx b/Common/ExecutionModel/vtkTemporalDataSetAlgorithm.cxx similarity index 100% rename from Filtering/vtkTemporalDataSetAlgorithm.cxx rename to Common/ExecutionModel/vtkTemporalDataSetAlgorithm.cxx diff --git a/Filtering/vtkTemporalDataSetAlgorithm.h b/Common/ExecutionModel/vtkTemporalDataSetAlgorithm.h similarity index 100% rename from Filtering/vtkTemporalDataSetAlgorithm.h rename to Common/ExecutionModel/vtkTemporalDataSetAlgorithm.h diff --git a/Filtering/vtkThreadedImageAlgorithm.cxx b/Common/ExecutionModel/vtkThreadedImageAlgorithm.cxx similarity index 100% rename from Filtering/vtkThreadedImageAlgorithm.cxx rename to Common/ExecutionModel/vtkThreadedImageAlgorithm.cxx diff --git a/Filtering/vtkThreadedImageAlgorithm.h b/Common/ExecutionModel/vtkThreadedImageAlgorithm.h similarity index 100% rename from Filtering/vtkThreadedImageAlgorithm.h rename to Common/ExecutionModel/vtkThreadedImageAlgorithm.h diff --git a/Filtering/vtkThreadedStreamingPipeline.cxx b/Common/ExecutionModel/vtkThreadedStreamingPipeline.cxx similarity index 100% rename from Filtering/vtkThreadedStreamingPipeline.cxx rename to Common/ExecutionModel/vtkThreadedStreamingPipeline.cxx diff --git a/Filtering/vtkThreadedStreamingPipeline.h b/Common/ExecutionModel/vtkThreadedStreamingPipeline.h similarity index 100% rename from Filtering/vtkThreadedStreamingPipeline.h rename to Common/ExecutionModel/vtkThreadedStreamingPipeline.h diff --git a/Filtering/vtkTreeAlgorithm.cxx b/Common/ExecutionModel/vtkTreeAlgorithm.cxx similarity index 100% rename from Filtering/vtkTreeAlgorithm.cxx rename to Common/ExecutionModel/vtkTreeAlgorithm.cxx diff --git a/Filtering/vtkTreeAlgorithm.h b/Common/ExecutionModel/vtkTreeAlgorithm.h similarity index 100% rename from Filtering/vtkTreeAlgorithm.h rename to Common/ExecutionModel/vtkTreeAlgorithm.h diff --git a/Filtering/vtkTrivialProducer.cxx b/Common/ExecutionModel/vtkTrivialProducer.cxx similarity index 100% rename from Filtering/vtkTrivialProducer.cxx rename to Common/ExecutionModel/vtkTrivialProducer.cxx diff --git a/Filtering/vtkTrivialProducer.h b/Common/ExecutionModel/vtkTrivialProducer.h similarity index 100% rename from Filtering/vtkTrivialProducer.h rename to Common/ExecutionModel/vtkTrivialProducer.h diff --git a/Filtering/vtkUndirectedGraphAlgorithm.cxx b/Common/ExecutionModel/vtkUndirectedGraphAlgorithm.cxx similarity index 100% rename from Filtering/vtkUndirectedGraphAlgorithm.cxx rename to Common/ExecutionModel/vtkUndirectedGraphAlgorithm.cxx diff --git a/Filtering/vtkUndirectedGraphAlgorithm.h b/Common/ExecutionModel/vtkUndirectedGraphAlgorithm.h similarity index 100% rename from Filtering/vtkUndirectedGraphAlgorithm.h rename to Common/ExecutionModel/vtkUndirectedGraphAlgorithm.h diff --git a/Filtering/vtkUniformGridPartitioner.cxx b/Common/ExecutionModel/vtkUniformGridPartitioner.cxx similarity index 100% rename from Filtering/vtkUniformGridPartitioner.cxx rename to Common/ExecutionModel/vtkUniformGridPartitioner.cxx diff --git a/Filtering/vtkUniformGridPartitioner.h b/Common/ExecutionModel/vtkUniformGridPartitioner.h similarity index 100% rename from Filtering/vtkUniformGridPartitioner.h rename to Common/ExecutionModel/vtkUniformGridPartitioner.h diff --git a/Filtering/vtkUnstructuredGridAlgorithm.cxx b/Common/ExecutionModel/vtkUnstructuredGridAlgorithm.cxx similarity index 100% rename from Filtering/vtkUnstructuredGridAlgorithm.cxx rename to Common/ExecutionModel/vtkUnstructuredGridAlgorithm.cxx diff --git a/Filtering/vtkUnstructuredGridAlgorithm.h b/Common/ExecutionModel/vtkUnstructuredGridAlgorithm.h similarity index 100% rename from Filtering/vtkUnstructuredGridAlgorithm.h rename to Common/ExecutionModel/vtkUnstructuredGridAlgorithm.h diff --git a/Common/Testing/Cxx/TestAmoebaMinimizer.cxx b/Common/Math/Testing/Cxx/TestAmoebaMinimizer.cxx similarity index 100% rename from Common/Testing/Cxx/TestAmoebaMinimizer.cxx rename to Common/Math/Testing/Cxx/TestAmoebaMinimizer.cxx diff --git a/Common/Testing/Cxx/TestFastNumericConversion.cxx b/Common/Math/Testing/Cxx/TestFastNumericConversion.cxx similarity index 100% rename from Common/Testing/Cxx/TestFastNumericConversion.cxx rename to Common/Math/Testing/Cxx/TestFastNumericConversion.cxx diff --git a/Common/Testing/Cxx/TestMatrix3x3.cxx b/Common/Math/Testing/Cxx/TestMatrix3x3.cxx similarity index 100% rename from Common/Testing/Cxx/TestMatrix3x3.cxx rename to Common/Math/Testing/Cxx/TestMatrix3x3.cxx diff --git a/Common/Testing/Cxx/TestPolynomialSolversUnivariate.cxx b/Common/Math/Testing/Cxx/TestPolynomialSolversUnivariate.cxx similarity index 100% rename from Common/Testing/Cxx/TestPolynomialSolversUnivariate.cxx rename to Common/Math/Testing/Cxx/TestPolynomialSolversUnivariate.cxx diff --git a/Common/Testing/Tcl/TestAmoebaMinimizer.tcl b/Common/Math/Testing/Tcl/TestAmoebaMinimizer.tcl similarity index 100% rename from Common/Testing/Tcl/TestAmoebaMinimizer.tcl rename to Common/Math/Testing/Tcl/TestAmoebaMinimizer.tcl diff --git a/Common/vtkAmoebaMinimizer.cxx b/Common/Math/vtkAmoebaMinimizer.cxx similarity index 100% rename from Common/vtkAmoebaMinimizer.cxx rename to Common/Math/vtkAmoebaMinimizer.cxx diff --git a/Common/vtkAmoebaMinimizer.h b/Common/Math/vtkAmoebaMinimizer.h similarity index 100% rename from Common/vtkAmoebaMinimizer.h rename to Common/Math/vtkAmoebaMinimizer.h diff --git a/Common/vtkFastNumericConversion.cxx b/Common/Math/vtkFastNumericConversion.cxx similarity index 100% rename from Common/vtkFastNumericConversion.cxx rename to Common/Math/vtkFastNumericConversion.cxx diff --git a/Common/vtkFastNumericConversion.h b/Common/Math/vtkFastNumericConversion.h similarity index 100% rename from Common/vtkFastNumericConversion.h rename to Common/Math/vtkFastNumericConversion.h diff --git a/Common/vtkFunctionSet.cxx b/Common/Math/vtkFunctionSet.cxx similarity index 100% rename from Common/vtkFunctionSet.cxx rename to Common/Math/vtkFunctionSet.cxx diff --git a/Common/vtkFunctionSet.h b/Common/Math/vtkFunctionSet.h similarity index 100% rename from Common/vtkFunctionSet.h rename to Common/Math/vtkFunctionSet.h diff --git a/Common/vtkInitialValueProblemSolver.cxx b/Common/Math/vtkInitialValueProblemSolver.cxx similarity index 100% rename from Common/vtkInitialValueProblemSolver.cxx rename to Common/Math/vtkInitialValueProblemSolver.cxx diff --git a/Common/vtkInitialValueProblemSolver.h b/Common/Math/vtkInitialValueProblemSolver.h similarity index 100% rename from Common/vtkInitialValueProblemSolver.h rename to Common/Math/vtkInitialValueProblemSolver.h diff --git a/Common/vtkMatrix3x3.cxx b/Common/Math/vtkMatrix3x3.cxx similarity index 100% rename from Common/vtkMatrix3x3.cxx rename to Common/Math/vtkMatrix3x3.cxx diff --git a/Common/vtkMatrix3x3.h b/Common/Math/vtkMatrix3x3.h similarity index 100% rename from Common/vtkMatrix3x3.h rename to Common/Math/vtkMatrix3x3.h diff --git a/Common/vtkMatrix4x4.cxx b/Common/Math/vtkMatrix4x4.cxx similarity index 100% rename from Common/vtkMatrix4x4.cxx rename to Common/Math/vtkMatrix4x4.cxx diff --git a/Common/vtkMatrix4x4.h b/Common/Math/vtkMatrix4x4.h similarity index 100% rename from Common/vtkMatrix4x4.h rename to Common/Math/vtkMatrix4x4.h diff --git a/Common/vtkPolynomialSolversUnivariate.cxx b/Common/Math/vtkPolynomialSolversUnivariate.cxx similarity index 100% rename from Common/vtkPolynomialSolversUnivariate.cxx rename to Common/Math/vtkPolynomialSolversUnivariate.cxx diff --git a/Common/vtkPolynomialSolversUnivariate.h b/Common/Math/vtkPolynomialSolversUnivariate.h similarity index 100% rename from Common/vtkPolynomialSolversUnivariate.h rename to Common/Math/vtkPolynomialSolversUnivariate.h diff --git a/Rendering/vtkQuaternionInterpolator.cxx b/Common/Math/vtkQuaternionInterpolator.cxx similarity index 100% rename from Rendering/vtkQuaternionInterpolator.cxx rename to Common/Math/vtkQuaternionInterpolator.cxx diff --git a/Rendering/vtkQuaternionInterpolator.h b/Common/Math/vtkQuaternionInterpolator.h similarity index 100% rename from Rendering/vtkQuaternionInterpolator.h rename to Common/Math/vtkQuaternionInterpolator.h diff --git a/Common/vtkRungeKutta2.cxx b/Common/Math/vtkRungeKutta2.cxx similarity index 100% rename from Common/vtkRungeKutta2.cxx rename to Common/Math/vtkRungeKutta2.cxx diff --git a/Common/vtkRungeKutta2.h b/Common/Math/vtkRungeKutta2.h similarity index 100% rename from Common/vtkRungeKutta2.h rename to Common/Math/vtkRungeKutta2.h diff --git a/Common/vtkRungeKutta4.cxx b/Common/Math/vtkRungeKutta4.cxx similarity index 100% rename from Common/vtkRungeKutta4.cxx rename to Common/Math/vtkRungeKutta4.cxx diff --git a/Common/vtkRungeKutta4.h b/Common/Math/vtkRungeKutta4.h similarity index 100% rename from Common/vtkRungeKutta4.h rename to Common/Math/vtkRungeKutta4.h diff --git a/Common/vtkRungeKutta45.cxx b/Common/Math/vtkRungeKutta45.cxx similarity index 100% rename from Common/vtkRungeKutta45.cxx rename to Common/Math/vtkRungeKutta45.cxx diff --git a/Common/vtkRungeKutta45.h b/Common/Math/vtkRungeKutta45.h similarity index 100% rename from Common/vtkRungeKutta45.h rename to Common/Math/vtkRungeKutta45.h diff --git a/Common/vtkContourValues.cxx b/Common/Misc/vtkContourValues.cxx similarity index 100% rename from Common/vtkContourValues.cxx rename to Common/Misc/vtkContourValues.cxx diff --git a/Common/vtkContourValues.h b/Common/Misc/vtkContourValues.h similarity index 100% rename from Common/vtkContourValues.h rename to Common/Misc/vtkContourValues.h diff --git a/Common/vtkErrorCode.cxx b/Common/Misc/vtkErrorCode.cxx similarity index 100% rename from Common/vtkErrorCode.cxx rename to Common/Misc/vtkErrorCode.cxx diff --git a/Common/vtkErrorCode.h b/Common/Misc/vtkErrorCode.h similarity index 100% rename from Common/vtkErrorCode.h rename to Common/Misc/vtkErrorCode.h diff --git a/Common/vtkFunctionParser.cxx b/Common/Misc/vtkFunctionParser.cxx similarity index 100% rename from Common/vtkFunctionParser.cxx rename to Common/Misc/vtkFunctionParser.cxx diff --git a/Common/vtkFunctionParser.h b/Common/Misc/vtkFunctionParser.h similarity index 100% rename from Common/vtkFunctionParser.h rename to Common/Misc/vtkFunctionParser.h diff --git a/Common/vtkHeap.cxx b/Common/Misc/vtkHeap.cxx similarity index 100% rename from Common/vtkHeap.cxx rename to Common/Misc/vtkHeap.cxx diff --git a/Common/vtkHeap.h b/Common/Misc/vtkHeap.h similarity index 100% rename from Common/vtkHeap.h rename to Common/Misc/vtkHeap.h diff --git a/Common/Testing/Cxx/TestDirectory.cxx b/Common/System/Testing/Cxx/TestDirectory.cxx similarity index 100% rename from Common/Testing/Cxx/TestDirectory.cxx rename to Common/System/Testing/Cxx/TestDirectory.cxx diff --git a/Common/Testing/Cxx/otherTimerLog.cxx b/Common/System/Testing/Cxx/otherTimerLog.cxx similarity index 100% rename from Common/Testing/Cxx/otherTimerLog.cxx rename to Common/System/Testing/Cxx/otherTimerLog.cxx diff --git a/Common/vtkClientSocket.cxx b/Common/System/vtkClientSocket.cxx similarity index 100% rename from Common/vtkClientSocket.cxx rename to Common/System/vtkClientSocket.cxx diff --git a/Common/vtkClientSocket.h b/Common/System/vtkClientSocket.h similarity index 100% rename from Common/vtkClientSocket.h rename to Common/System/vtkClientSocket.h diff --git a/Common/vtkDirectory.cxx b/Common/System/vtkDirectory.cxx similarity index 100% rename from Common/vtkDirectory.cxx rename to Common/System/vtkDirectory.cxx diff --git a/Common/vtkDirectory.h b/Common/System/vtkDirectory.h similarity index 100% rename from Common/vtkDirectory.h rename to Common/System/vtkDirectory.h diff --git a/Common/vtkServerSocket.cxx b/Common/System/vtkServerSocket.cxx similarity index 100% rename from Common/vtkServerSocket.cxx rename to Common/System/vtkServerSocket.cxx diff --git a/Common/vtkServerSocket.h b/Common/System/vtkServerSocket.h similarity index 100% rename from Common/vtkServerSocket.h rename to Common/System/vtkServerSocket.h diff --git a/Common/vtkSocket.cxx b/Common/System/vtkSocket.cxx similarity index 100% rename from Common/vtkSocket.cxx rename to Common/System/vtkSocket.cxx diff --git a/Common/vtkSocket.h b/Common/System/vtkSocket.h similarity index 100% rename from Common/vtkSocket.h rename to Common/System/vtkSocket.h diff --git a/Common/vtkSocketCollection.cxx b/Common/System/vtkSocketCollection.cxx similarity index 100% rename from Common/vtkSocketCollection.cxx rename to Common/System/vtkSocketCollection.cxx diff --git a/Common/vtkSocketCollection.h b/Common/System/vtkSocketCollection.h similarity index 100% rename from Common/vtkSocketCollection.h rename to Common/System/vtkSocketCollection.h diff --git a/Common/vtkThreadMessager.cxx b/Common/System/vtkThreadMessager.cxx similarity index 100% rename from Common/vtkThreadMessager.cxx rename to Common/System/vtkThreadMessager.cxx diff --git a/Common/vtkThreadMessager.h b/Common/System/vtkThreadMessager.h similarity index 100% rename from Common/vtkThreadMessager.h rename to Common/System/vtkThreadMessager.h diff --git a/Common/vtkTimerLog.cxx b/Common/System/vtkTimerLog.cxx similarity index 100% rename from Common/vtkTimerLog.cxx rename to Common/System/vtkTimerLog.cxx diff --git a/Common/vtkTimerLog.h b/Common/System/vtkTimerLog.h similarity index 100% rename from Common/vtkTimerLog.h rename to Common/System/vtkTimerLog.h diff --git a/Graphics/Testing/Tcl/MatrixToTransform.tcl b/Common/Transforms/Testing/Tcl/MatrixToTransform.tcl similarity index 100% rename from Graphics/Testing/Tcl/MatrixToTransform.tcl rename to Common/Transforms/Testing/Tcl/MatrixToTransform.tcl diff --git a/Graphics/Testing/Tcl/SliceOrder.tcl b/Common/Transforms/Testing/Tcl/SliceOrder.tcl similarity index 100% rename from Graphics/Testing/Tcl/SliceOrder.tcl rename to Common/Transforms/Testing/Tcl/SliceOrder.tcl diff --git a/Hybrid/Testing/Tcl/TestThinPlateWarp.tcl b/Common/Transforms/Testing/Tcl/TestThinPlateWarp.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestThinPlateWarp.tcl rename to Common/Transforms/Testing/Tcl/TestThinPlateWarp.tcl diff --git a/Hybrid/Testing/Tcl/TestThinPlateWarp3D.tcl b/Common/Transforms/Testing/Tcl/TestThinPlateWarp3D.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestThinPlateWarp3D.tcl rename to Common/Transforms/Testing/Tcl/TestThinPlateWarp3D.tcl diff --git a/Graphics/Testing/Tcl/cylindrical.tcl b/Common/Transforms/Testing/Tcl/cylindrical.tcl similarity index 100% rename from Graphics/Testing/Tcl/cylindrical.tcl rename to Common/Transforms/Testing/Tcl/cylindrical.tcl diff --git a/Graphics/Testing/Tcl/spherical.tcl b/Common/Transforms/Testing/Tcl/spherical.tcl similarity index 100% rename from Graphics/Testing/Tcl/spherical.tcl rename to Common/Transforms/Testing/Tcl/spherical.tcl diff --git a/Common/vtkAbstractTransform.cxx b/Common/Transforms/vtkAbstractTransform.cxx similarity index 100% rename from Common/vtkAbstractTransform.cxx rename to Common/Transforms/vtkAbstractTransform.cxx diff --git a/Common/vtkAbstractTransform.h b/Common/Transforms/vtkAbstractTransform.h similarity index 100% rename from Common/vtkAbstractTransform.h rename to Common/Transforms/vtkAbstractTransform.h diff --git a/Common/vtkCylindricalTransform.cxx b/Common/Transforms/vtkCylindricalTransform.cxx similarity index 100% rename from Common/vtkCylindricalTransform.cxx rename to Common/Transforms/vtkCylindricalTransform.cxx diff --git a/Common/vtkCylindricalTransform.h b/Common/Transforms/vtkCylindricalTransform.h similarity index 100% rename from Common/vtkCylindricalTransform.h rename to Common/Transforms/vtkCylindricalTransform.h diff --git a/Common/vtkGeneralTransform.cxx b/Common/Transforms/vtkGeneralTransform.cxx similarity index 100% rename from Common/vtkGeneralTransform.cxx rename to Common/Transforms/vtkGeneralTransform.cxx diff --git a/Common/vtkGeneralTransform.h b/Common/Transforms/vtkGeneralTransform.h similarity index 100% rename from Common/vtkGeneralTransform.h rename to Common/Transforms/vtkGeneralTransform.h diff --git a/Common/vtkHomogeneousTransform.cxx b/Common/Transforms/vtkHomogeneousTransform.cxx similarity index 100% rename from Common/vtkHomogeneousTransform.cxx rename to Common/Transforms/vtkHomogeneousTransform.cxx diff --git a/Common/vtkHomogeneousTransform.h b/Common/Transforms/vtkHomogeneousTransform.h similarity index 100% rename from Common/vtkHomogeneousTransform.h rename to Common/Transforms/vtkHomogeneousTransform.h diff --git a/Common/vtkIdentityTransform.cxx b/Common/Transforms/vtkIdentityTransform.cxx similarity index 100% rename from Common/vtkIdentityTransform.cxx rename to Common/Transforms/vtkIdentityTransform.cxx diff --git a/Common/vtkIdentityTransform.h b/Common/Transforms/vtkIdentityTransform.h similarity index 100% rename from Common/vtkIdentityTransform.h rename to Common/Transforms/vtkIdentityTransform.h diff --git a/Hybrid/vtkLandmarkTransform.cxx b/Common/Transforms/vtkLandmarkTransform.cxx similarity index 100% rename from Hybrid/vtkLandmarkTransform.cxx rename to Common/Transforms/vtkLandmarkTransform.cxx diff --git a/Hybrid/vtkLandmarkTransform.h b/Common/Transforms/vtkLandmarkTransform.h similarity index 100% rename from Hybrid/vtkLandmarkTransform.h rename to Common/Transforms/vtkLandmarkTransform.h diff --git a/Common/vtkLinearTransform.cxx b/Common/Transforms/vtkLinearTransform.cxx similarity index 100% rename from Common/vtkLinearTransform.cxx rename to Common/Transforms/vtkLinearTransform.cxx diff --git a/Common/vtkLinearTransform.h b/Common/Transforms/vtkLinearTransform.h similarity index 100% rename from Common/vtkLinearTransform.h rename to Common/Transforms/vtkLinearTransform.h diff --git a/Common/vtkMatrixToHomogeneousTransform.cxx b/Common/Transforms/vtkMatrixToHomogeneousTransform.cxx similarity index 100% rename from Common/vtkMatrixToHomogeneousTransform.cxx rename to Common/Transforms/vtkMatrixToHomogeneousTransform.cxx diff --git a/Common/vtkMatrixToHomogeneousTransform.h b/Common/Transforms/vtkMatrixToHomogeneousTransform.h similarity index 100% rename from Common/vtkMatrixToHomogeneousTransform.h rename to Common/Transforms/vtkMatrixToHomogeneousTransform.h diff --git a/Common/vtkMatrixToLinearTransform.cxx b/Common/Transforms/vtkMatrixToLinearTransform.cxx similarity index 100% rename from Common/vtkMatrixToLinearTransform.cxx rename to Common/Transforms/vtkMatrixToLinearTransform.cxx diff --git a/Common/vtkMatrixToLinearTransform.h b/Common/Transforms/vtkMatrixToLinearTransform.h similarity index 100% rename from Common/vtkMatrixToLinearTransform.h rename to Common/Transforms/vtkMatrixToLinearTransform.h diff --git a/Common/vtkPerspectiveTransform.cxx b/Common/Transforms/vtkPerspectiveTransform.cxx similarity index 100% rename from Common/vtkPerspectiveTransform.cxx rename to Common/Transforms/vtkPerspectiveTransform.cxx diff --git a/Common/vtkPerspectiveTransform.h b/Common/Transforms/vtkPerspectiveTransform.h similarity index 100% rename from Common/vtkPerspectiveTransform.h rename to Common/Transforms/vtkPerspectiveTransform.h diff --git a/Common/vtkSphericalTransform.cxx b/Common/Transforms/vtkSphericalTransform.cxx similarity index 100% rename from Common/vtkSphericalTransform.cxx rename to Common/Transforms/vtkSphericalTransform.cxx diff --git a/Common/vtkSphericalTransform.h b/Common/Transforms/vtkSphericalTransform.h similarity index 100% rename from Common/vtkSphericalTransform.h rename to Common/Transforms/vtkSphericalTransform.h diff --git a/Hybrid/vtkThinPlateSplineTransform.cxx b/Common/Transforms/vtkThinPlateSplineTransform.cxx similarity index 100% rename from Hybrid/vtkThinPlateSplineTransform.cxx rename to Common/Transforms/vtkThinPlateSplineTransform.cxx diff --git a/Hybrid/vtkThinPlateSplineTransform.h b/Common/Transforms/vtkThinPlateSplineTransform.h similarity index 100% rename from Hybrid/vtkThinPlateSplineTransform.h rename to Common/Transforms/vtkThinPlateSplineTransform.h diff --git a/Common/vtkTransform.cxx b/Common/Transforms/vtkTransform.cxx similarity index 100% rename from Common/vtkTransform.cxx rename to Common/Transforms/vtkTransform.cxx diff --git a/Common/vtkTransform.h b/Common/Transforms/vtkTransform.h similarity index 100% rename from Common/vtkTransform.h rename to Common/Transforms/vtkTransform.h diff --git a/Common/vtkTransform2D.cxx b/Common/Transforms/vtkTransform2D.cxx similarity index 100% rename from Common/vtkTransform2D.cxx rename to Common/Transforms/vtkTransform2D.cxx diff --git a/Common/vtkTransform2D.h b/Common/Transforms/vtkTransform2D.h similarity index 100% rename from Common/vtkTransform2D.h rename to Common/Transforms/vtkTransform2D.h diff --git a/Common/vtkTransformCollection.cxx b/Common/Transforms/vtkTransformCollection.cxx similarity index 100% rename from Common/vtkTransformCollection.cxx rename to Common/Transforms/vtkTransformCollection.cxx diff --git a/Common/vtkTransformCollection.h b/Common/Transforms/vtkTransformCollection.h similarity index 100% rename from Common/vtkTransformCollection.h rename to Common/Transforms/vtkTransformCollection.h diff --git a/Common/vtkWarpTransform.cxx b/Common/Transforms/vtkWarpTransform.cxx similarity index 100% rename from Common/vtkWarpTransform.cxx rename to Common/Transforms/vtkWarpTransform.cxx diff --git a/Common/vtkWarpTransform.h b/Common/Transforms/vtkWarpTransform.h similarity index 100% rename from Common/vtkWarpTransform.h rename to Common/Transforms/vtkWarpTransform.h diff --git a/Infovis/Testing/Cxx/TestGraphHierarchicalBundle.cxx b/Deprecated/TestGraphHierarchicalBundle.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestGraphHierarchicalBundle.cxx rename to Deprecated/TestGraphHierarchicalBundle.cxx diff --git a/Infovis/vtkGraphHierarchicalBundle.cxx b/Deprecated/vtkGraphHierarchicalBundle.cxx similarity index 100% rename from Infovis/vtkGraphHierarchicalBundle.cxx rename to Deprecated/vtkGraphHierarchicalBundle.cxx diff --git a/Infovis/vtkGraphHierarchicalBundle.h b/Deprecated/vtkGraphHierarchicalBundle.h similarity index 100% rename from Infovis/vtkGraphHierarchicalBundle.h rename to Deprecated/vtkGraphHierarchicalBundle.h diff --git a/Infovis/vtkStringToTimePoint.cxx b/Deprecated/vtkStringToTimePoint.cxx similarity index 100% rename from Infovis/vtkStringToTimePoint.cxx rename to Deprecated/vtkStringToTimePoint.cxx diff --git a/Infovis/vtkStringToTimePoint.h b/Deprecated/vtkStringToTimePoint.h similarity index 100% rename from Infovis/vtkStringToTimePoint.h rename to Deprecated/vtkStringToTimePoint.h diff --git a/Infovis/vtkTimePointToString.cxx b/Deprecated/vtkTimePointToString.cxx similarity index 100% rename from Infovis/vtkTimePointToString.cxx rename to Deprecated/vtkTimePointToString.cxx diff --git a/Infovis/vtkTimePointToString.h b/Deprecated/vtkTimePointToString.h similarity index 100% rename from Infovis/vtkTimePointToString.h rename to Deprecated/vtkTimePointToString.h diff --git a/Graphics/Testing/Cxx/TestAppendPolyData.cxx b/Filters/Core/Testing/Cxx/TestAppendPolyData.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestAppendPolyData.cxx rename to Filters/Core/Testing/Cxx/TestAppendPolyData.cxx diff --git a/Graphics/Testing/Cxx/TestAppendSelection.cxx b/Filters/Core/Testing/Cxx/TestAppendSelection.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestAppendSelection.cxx rename to Filters/Core/Testing/Cxx/TestAppendSelection.cxx diff --git a/Graphics/Testing/Cxx/TestArrayCalculator.cxx b/Filters/Core/Testing/Cxx/TestArrayCalculator.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestArrayCalculator.cxx rename to Filters/Core/Testing/Cxx/TestArrayCalculator.cxx diff --git a/Graphics/Testing/Cxx/TestAssignAttribute.cxx b/Filters/Core/Testing/Cxx/TestAssignAttribute.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestAssignAttribute.cxx rename to Filters/Core/Testing/Cxx/TestAssignAttribute.cxx diff --git a/Graphics/Testing/Cxx/TestCellDataToPointData.cxx b/Filters/Core/Testing/Cxx/TestCellDataToPointData.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestCellDataToPointData.cxx rename to Filters/Core/Testing/Cxx/TestCellDataToPointData.cxx diff --git a/Graphics/Testing/Cxx/TestCenterOfMass.cxx b/Filters/Core/Testing/Cxx/TestCenterOfMass.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestCenterOfMass.cxx rename to Filters/Core/Testing/Cxx/TestCenterOfMass.cxx diff --git a/Graphics/Testing/Cxx/TestDecimatePolylineFilter.cxx b/Filters/Core/Testing/Cxx/TestDecimatePolylineFilter.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestDecimatePolylineFilter.cxx rename to Filters/Core/Testing/Cxx/TestDecimatePolylineFilter.cxx diff --git a/Graphics/Testing/Cxx/TestDelaunay2D.cxx b/Filters/Core/Testing/Cxx/TestDelaunay2D.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestDelaunay2D.cxx rename to Filters/Core/Testing/Cxx/TestDelaunay2D.cxx diff --git a/Common/Testing/Cxx/TestGhostArray.cxx b/Filters/Core/Testing/Cxx/TestGhostArray.cxx similarity index 100% rename from Common/Testing/Cxx/TestGhostArray.cxx rename to Filters/Core/Testing/Cxx/TestGhostArray.cxx diff --git a/Graphics/Testing/Cxx/TestGlyph3D.cxx b/Filters/Core/Testing/Cxx/TestGlyph3D.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestGlyph3D.cxx rename to Filters/Core/Testing/Cxx/TestGlyph3D.cxx diff --git a/Graphics/Testing/Cxx/TestImplicitPolyDataDistance.cxx b/Filters/Core/Testing/Cxx/TestImplicitPolyDataDistance.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestImplicitPolyDataDistance.cxx rename to Filters/Core/Testing/Cxx/TestImplicitPolyDataDistance.cxx diff --git a/Graphics/Testing/Cxx/TestNamedComponents.cxx b/Filters/Core/Testing/Cxx/TestNamedComponents.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestNamedComponents.cxx rename to Filters/Core/Testing/Cxx/TestNamedComponents.cxx diff --git a/Graphics/Testing/Python/TestTensorGlyph.py b/Filters/Core/Testing/Python/TestTensorGlyph.py similarity index 100% rename from Graphics/Testing/Python/TestTensorGlyph.py rename to Filters/Core/Testing/Python/TestTensorGlyph.py diff --git a/Graphics/Testing/Python/TestTextureGlyph.py b/Filters/Core/Testing/Python/TestTextureGlyph.py similarity index 100% rename from Graphics/Testing/Python/TestTextureGlyph.py rename to Filters/Core/Testing/Python/TestTextureGlyph.py diff --git a/Graphics/Testing/Python/glyphComb.py b/Filters/Core/Testing/Python/glyphComb.py similarity index 100% rename from Graphics/Testing/Python/glyphComb.py rename to Filters/Core/Testing/Python/glyphComb.py diff --git a/Graphics/Testing/Python/streamComb.py b/Filters/Core/Testing/Python/streamComb.py similarity index 100% rename from Graphics/Testing/Python/streamComb.py rename to Filters/Core/Testing/Python/streamComb.py diff --git a/Graphics/Testing/Python/streamSurface.py b/Filters/Core/Testing/Python/streamSurface.py similarity index 100% rename from Graphics/Testing/Python/streamSurface.py rename to Filters/Core/Testing/Python/streamSurface.py diff --git a/Graphics/Testing/Python/streamSurface2.py b/Filters/Core/Testing/Python/streamSurface2.py similarity index 100% rename from Graphics/Testing/Python/streamSurface2.py rename to Filters/Core/Testing/Python/streamSurface2.py diff --git a/Graphics/Testing/Python/tubeComb.py b/Filters/Core/Testing/Python/tubeComb.py similarity index 100% rename from Graphics/Testing/Python/tubeComb.py rename to Filters/Core/Testing/Python/tubeComb.py diff --git a/Graphics/Testing/Tcl/CellDataToPointData.tcl b/Filters/Core/Testing/Tcl/CellDataToPointData.tcl similarity index 100% rename from Graphics/Testing/Tcl/CellDataToPointData.tcl rename to Filters/Core/Testing/Tcl/CellDataToPointData.tcl diff --git a/Graphics/Testing/Tcl/Delaunay2D.tcl b/Filters/Core/Testing/Tcl/Delaunay2D.tcl similarity index 100% rename from Graphics/Testing/Tcl/Delaunay2D.tcl rename to Filters/Core/Testing/Tcl/Delaunay2D.tcl diff --git a/Graphics/Testing/Tcl/Delaunay2DAlpha.tcl b/Filters/Core/Testing/Tcl/Delaunay2DAlpha.tcl similarity index 100% rename from Graphics/Testing/Tcl/Delaunay2DAlpha.tcl rename to Filters/Core/Testing/Tcl/Delaunay2DAlpha.tcl diff --git a/Graphics/Testing/Tcl/Delaunay2DTransform.tcl b/Filters/Core/Testing/Tcl/Delaunay2DTransform.tcl similarity index 100% rename from Graphics/Testing/Tcl/Delaunay2DTransform.tcl rename to Filters/Core/Testing/Tcl/Delaunay2DTransform.tcl diff --git a/Graphics/Testing/Tcl/Delaunay3D.tcl b/Filters/Core/Testing/Tcl/Delaunay3D.tcl similarity index 100% rename from Graphics/Testing/Tcl/Delaunay3D.tcl rename to Filters/Core/Testing/Tcl/Delaunay3D.tcl diff --git a/Hybrid/Testing/Tcl/MassProperties.tcl b/Filters/Core/Testing/Tcl/MassProperties.tcl similarity index 100% rename from Hybrid/Testing/Tcl/MassProperties.tcl rename to Filters/Core/Testing/Tcl/MassProperties.tcl diff --git a/Graphics/Testing/Tcl/QuadricDecimation.tcl b/Filters/Core/Testing/Tcl/QuadricDecimation.tcl similarity index 100% rename from Graphics/Testing/Tcl/QuadricDecimation.tcl rename to Filters/Core/Testing/Tcl/QuadricDecimation.tcl diff --git a/Graphics/Testing/Tcl/StreamPolyData.tcl b/Filters/Core/Testing/Tcl/StreamPolyData.tcl similarity index 100% rename from Graphics/Testing/Tcl/StreamPolyData.tcl rename to Filters/Core/Testing/Tcl/StreamPolyData.tcl diff --git a/Graphics/Testing/Tcl/TestGridSynchronizedTemplates3D.tcl b/Filters/Core/Testing/Tcl/TestGridSynchronizedTemplates3D.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestGridSynchronizedTemplates3D.tcl rename to Filters/Core/Testing/Tcl/TestGridSynchronizedTemplates3D.tcl diff --git a/Graphics/Testing/Tcl/TestMarchingSquares.tcl b/Filters/Core/Testing/Tcl/TestMarchingSquares.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestMarchingSquares.tcl rename to Filters/Core/Testing/Tcl/TestMarchingSquares.tcl diff --git a/Graphics/Testing/Tcl/TestRectilinearSynchronizedTemplates.tcl b/Filters/Core/Testing/Tcl/TestRectilinearSynchronizedTemplates.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestRectilinearSynchronizedTemplates.tcl rename to Filters/Core/Testing/Tcl/TestRectilinearSynchronizedTemplates.tcl diff --git a/Graphics/Testing/Tcl/TestSynchronizedTemplates2D.tcl b/Filters/Core/Testing/Tcl/TestSynchronizedTemplates2D.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestSynchronizedTemplates2D.tcl rename to Filters/Core/Testing/Tcl/TestSynchronizedTemplates2D.tcl diff --git a/Graphics/Testing/Tcl/TestSynchronizedTemplates3D.tcl b/Filters/Core/Testing/Tcl/TestSynchronizedTemplates3D.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestSynchronizedTemplates3D.tcl rename to Filters/Core/Testing/Tcl/TestSynchronizedTemplates3D.tcl diff --git a/Graphics/Testing/Tcl/TestTriangleFilter.tcl b/Filters/Core/Testing/Tcl/TestTriangleFilter.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestTriangleFilter.tcl rename to Filters/Core/Testing/Tcl/TestTriangleFilter.tcl diff --git a/Graphics/Testing/Tcl/capCow.tcl b/Filters/Core/Testing/Tcl/capCow.tcl similarity index 100% rename from Graphics/Testing/Tcl/capCow.tcl rename to Filters/Core/Testing/Tcl/capCow.tcl diff --git a/Graphics/Testing/Tcl/capSphere.tcl b/Filters/Core/Testing/Tcl/capSphere.tcl similarity index 100% rename from Graphics/Testing/Tcl/capSphere.tcl rename to Filters/Core/Testing/Tcl/capSphere.tcl diff --git a/Graphics/Testing/Tcl/clipArt.tcl b/Filters/Core/Testing/Tcl/clipArt.tcl similarity index 100% rename from Graphics/Testing/Tcl/clipArt.tcl rename to Filters/Core/Testing/Tcl/clipArt.tcl diff --git a/Graphics/Testing/Tcl/combStreamers.tcl b/Filters/Core/Testing/Tcl/combStreamers.tcl similarity index 100% rename from Graphics/Testing/Tcl/combStreamers.tcl rename to Filters/Core/Testing/Tcl/combStreamers.tcl diff --git a/Graphics/Testing/Tcl/combStreamers2.tcl b/Filters/Core/Testing/Tcl/combStreamers2.tcl similarity index 100% rename from Graphics/Testing/Tcl/combStreamers2.tcl rename to Filters/Core/Testing/Tcl/combStreamers2.tcl diff --git a/Graphics/Testing/Tcl/constrainedDelaunay.tcl b/Filters/Core/Testing/Tcl/constrainedDelaunay.tcl similarity index 100% rename from Graphics/Testing/Tcl/constrainedDelaunay.tcl rename to Filters/Core/Testing/Tcl/constrainedDelaunay.tcl diff --git a/Graphics/Testing/Tcl/contourCells.tcl b/Filters/Core/Testing/Tcl/contourCells.tcl similarity index 100% rename from Graphics/Testing/Tcl/contourCells.tcl rename to Filters/Core/Testing/Tcl/contourCells.tcl diff --git a/Graphics/Testing/Tcl/contourQuadraticCells.tcl b/Filters/Core/Testing/Tcl/contourQuadraticCells.tcl similarity index 100% rename from Graphics/Testing/Tcl/contourQuadraticCells.tcl rename to Filters/Core/Testing/Tcl/contourQuadraticCells.tcl diff --git a/Graphics/Testing/Tcl/createBFont.tcl b/Filters/Core/Testing/Tcl/createBFont.tcl similarity index 100% rename from Graphics/Testing/Tcl/createBFont.tcl rename to Filters/Core/Testing/Tcl/createBFont.tcl diff --git a/Graphics/Testing/Tcl/cutLoop.tcl b/Filters/Core/Testing/Tcl/cutLoop.tcl similarity index 100% rename from Graphics/Testing/Tcl/cutLoop.tcl rename to Filters/Core/Testing/Tcl/cutLoop.tcl diff --git a/Graphics/Testing/Tcl/deciFranFace.tcl b/Filters/Core/Testing/Tcl/deciFranFace.tcl similarity index 100% rename from Graphics/Testing/Tcl/deciFranFace.tcl rename to Filters/Core/Testing/Tcl/deciFranFace.tcl diff --git a/Graphics/Testing/Tcl/deciPlane.tcl b/Filters/Core/Testing/Tcl/deciPlane.tcl similarity index 100% rename from Graphics/Testing/Tcl/deciPlane.tcl rename to Filters/Core/Testing/Tcl/deciPlane.tcl diff --git a/Graphics/Testing/Tcl/dispPlot.tcl b/Filters/Core/Testing/Tcl/dispPlot.tcl similarity index 100% rename from Graphics/Testing/Tcl/dispPlot.tcl rename to Filters/Core/Testing/Tcl/dispPlot.tcl diff --git a/Graphics/Testing/Tcl/fieldToPolyData.tcl b/Filters/Core/Testing/Tcl/fieldToPolyData.tcl similarity index 100% rename from Graphics/Testing/Tcl/fieldToPolyData.tcl rename to Filters/Core/Testing/Tcl/fieldToPolyData.tcl diff --git a/Graphics/Testing/Tcl/fieldToRGrid.tcl b/Filters/Core/Testing/Tcl/fieldToRGrid.tcl similarity index 100% rename from Graphics/Testing/Tcl/fieldToRGrid.tcl rename to Filters/Core/Testing/Tcl/fieldToRGrid.tcl diff --git a/Graphics/Testing/Tcl/fieldToSGrid.tcl b/Filters/Core/Testing/Tcl/fieldToSGrid.tcl similarity index 100% rename from Graphics/Testing/Tcl/fieldToSGrid.tcl rename to Filters/Core/Testing/Tcl/fieldToSGrid.tcl diff --git a/Graphics/Testing/Tcl/fieldToUGrid.tcl b/Filters/Core/Testing/Tcl/fieldToUGrid.tcl similarity index 100% rename from Graphics/Testing/Tcl/fieldToUGrid.tcl rename to Filters/Core/Testing/Tcl/fieldToUGrid.tcl diff --git a/Graphics/Testing/Tcl/financialField.tcl b/Filters/Core/Testing/Tcl/financialField.tcl similarity index 100% rename from Graphics/Testing/Tcl/financialField.tcl rename to Filters/Core/Testing/Tcl/financialField.tcl diff --git a/Hybrid/Testing/Tcl/financialField2.tcl b/Filters/Core/Testing/Tcl/financialField2.tcl similarity index 100% rename from Hybrid/Testing/Tcl/financialField2.tcl rename to Filters/Core/Testing/Tcl/financialField2.tcl diff --git a/Hybrid/Testing/Tcl/financialField3.tcl b/Filters/Core/Testing/Tcl/financialField3.tcl similarity index 100% rename from Hybrid/Testing/Tcl/financialField3.tcl rename to Filters/Core/Testing/Tcl/financialField3.tcl diff --git a/Graphics/Testing/Tcl/hull.tcl b/Filters/Core/Testing/Tcl/hull.tcl similarity index 100% rename from Graphics/Testing/Tcl/hull.tcl rename to Filters/Core/Testing/Tcl/hull.tcl diff --git a/Graphics/Testing/Tcl/mergeFilter.tcl b/Filters/Core/Testing/Tcl/mergeFilter.tcl similarity index 100% rename from Graphics/Testing/Tcl/mergeFilter.tcl rename to Filters/Core/Testing/Tcl/mergeFilter.tcl diff --git a/Graphics/Testing/Tcl/multipleComponentContour.tcl b/Filters/Core/Testing/Tcl/multipleComponentContour.tcl similarity index 100% rename from Graphics/Testing/Tcl/multipleComponentContour.tcl rename to Filters/Core/Testing/Tcl/multipleComponentContour.tcl diff --git a/Graphics/Testing/Tcl/multipleIso.tcl b/Filters/Core/Testing/Tcl/multipleIso.tcl similarity index 100% rename from Graphics/Testing/Tcl/multipleIso.tcl rename to Filters/Core/Testing/Tcl/multipleIso.tcl diff --git a/Graphics/Testing/Tcl/polyConn.tcl b/Filters/Core/Testing/Tcl/polyConn.tcl similarity index 100% rename from Graphics/Testing/Tcl/polyConn.tcl rename to Filters/Core/Testing/Tcl/polyConn.tcl diff --git a/Graphics/Testing/Tcl/probe.tcl b/Filters/Core/Testing/Tcl/probe.tcl similarity index 100% rename from Graphics/Testing/Tcl/probe.tcl rename to Filters/Core/Testing/Tcl/probe.tcl diff --git a/Graphics/Testing/Tcl/probeComb.tcl b/Filters/Core/Testing/Tcl/probeComb.tcl similarity index 100% rename from Graphics/Testing/Tcl/probeComb.tcl rename to Filters/Core/Testing/Tcl/probeComb.tcl diff --git a/Graphics/Testing/Tcl/reverseNormals.tcl b/Filters/Core/Testing/Tcl/reverseNormals.tcl similarity index 100% rename from Graphics/Testing/Tcl/reverseNormals.tcl rename to Filters/Core/Testing/Tcl/reverseNormals.tcl diff --git a/Graphics/Testing/Tcl/skinOrder.tcl b/Filters/Core/Testing/Tcl/skinOrder.tcl similarity index 100% rename from Graphics/Testing/Tcl/skinOrder.tcl rename to Filters/Core/Testing/Tcl/skinOrder.tcl diff --git a/Graphics/Testing/Tcl/smoothMeshOnMesh.tcl b/Filters/Core/Testing/Tcl/smoothMeshOnMesh.tcl similarity index 100% rename from Graphics/Testing/Tcl/smoothMeshOnMesh.tcl rename to Filters/Core/Testing/Tcl/smoothMeshOnMesh.tcl diff --git a/Graphics/Testing/Tcl/stripF.tcl b/Filters/Core/Testing/Tcl/stripF.tcl similarity index 100% rename from Graphics/Testing/Tcl/stripF.tcl rename to Filters/Core/Testing/Tcl/stripF.tcl diff --git a/Graphics/Testing/Tcl/teapotHulls.tcl b/Filters/Core/Testing/Tcl/teapotHulls.tcl similarity index 100% rename from Graphics/Testing/Tcl/teapotHulls.tcl rename to Filters/Core/Testing/Tcl/teapotHulls.tcl diff --git a/Graphics/vtkAppendFilter.cxx b/Filters/Core/vtkAppendFilter.cxx similarity index 100% rename from Graphics/vtkAppendFilter.cxx rename to Filters/Core/vtkAppendFilter.cxx diff --git a/Graphics/vtkAppendFilter.h b/Filters/Core/vtkAppendFilter.h similarity index 100% rename from Graphics/vtkAppendFilter.h rename to Filters/Core/vtkAppendFilter.h diff --git a/Graphics/vtkAppendPolyData.cxx b/Filters/Core/vtkAppendPolyData.cxx similarity index 100% rename from Graphics/vtkAppendPolyData.cxx rename to Filters/Core/vtkAppendPolyData.cxx diff --git a/Graphics/vtkAppendPolyData.h b/Filters/Core/vtkAppendPolyData.h similarity index 100% rename from Graphics/vtkAppendPolyData.h rename to Filters/Core/vtkAppendPolyData.h diff --git a/Graphics/vtkAppendSelection.cxx b/Filters/Core/vtkAppendSelection.cxx similarity index 100% rename from Graphics/vtkAppendSelection.cxx rename to Filters/Core/vtkAppendSelection.cxx diff --git a/Graphics/vtkAppendSelection.h b/Filters/Core/vtkAppendSelection.h similarity index 100% rename from Graphics/vtkAppendSelection.h rename to Filters/Core/vtkAppendSelection.h diff --git a/Graphics/vtkArrayCalculator.cxx b/Filters/Core/vtkArrayCalculator.cxx similarity index 100% rename from Graphics/vtkArrayCalculator.cxx rename to Filters/Core/vtkArrayCalculator.cxx diff --git a/Graphics/vtkArrayCalculator.h b/Filters/Core/vtkArrayCalculator.h similarity index 100% rename from Graphics/vtkArrayCalculator.h rename to Filters/Core/vtkArrayCalculator.h diff --git a/Graphics/vtkAssignAttribute.cxx b/Filters/Core/vtkAssignAttribute.cxx similarity index 100% rename from Graphics/vtkAssignAttribute.cxx rename to Filters/Core/vtkAssignAttribute.cxx diff --git a/Graphics/vtkAssignAttribute.h b/Filters/Core/vtkAssignAttribute.h similarity index 100% rename from Graphics/vtkAssignAttribute.h rename to Filters/Core/vtkAssignAttribute.h diff --git a/Graphics/vtkAttributeDataToFieldDataFilter.cxx b/Filters/Core/vtkAttributeDataToFieldDataFilter.cxx similarity index 100% rename from Graphics/vtkAttributeDataToFieldDataFilter.cxx rename to Filters/Core/vtkAttributeDataToFieldDataFilter.cxx diff --git a/Graphics/vtkAttributeDataToFieldDataFilter.h b/Filters/Core/vtkAttributeDataToFieldDataFilter.h similarity index 100% rename from Graphics/vtkAttributeDataToFieldDataFilter.h rename to Filters/Core/vtkAttributeDataToFieldDataFilter.h diff --git a/Graphics/vtkCellDataToPointData.cxx b/Filters/Core/vtkCellDataToPointData.cxx similarity index 100% rename from Graphics/vtkCellDataToPointData.cxx rename to Filters/Core/vtkCellDataToPointData.cxx diff --git a/Graphics/vtkCellDataToPointData.h b/Filters/Core/vtkCellDataToPointData.h similarity index 100% rename from Graphics/vtkCellDataToPointData.h rename to Filters/Core/vtkCellDataToPointData.h diff --git a/Graphics/vtkCenterOfMass.cxx b/Filters/Core/vtkCenterOfMass.cxx similarity index 100% rename from Graphics/vtkCenterOfMass.cxx rename to Filters/Core/vtkCenterOfMass.cxx diff --git a/Graphics/vtkCenterOfMass.h b/Filters/Core/vtkCenterOfMass.h similarity index 100% rename from Graphics/vtkCenterOfMass.h rename to Filters/Core/vtkCenterOfMass.h diff --git a/Graphics/vtkCleanPolyData.cxx b/Filters/Core/vtkCleanPolyData.cxx similarity index 100% rename from Graphics/vtkCleanPolyData.cxx rename to Filters/Core/vtkCleanPolyData.cxx diff --git a/Graphics/vtkCleanPolyData.h b/Filters/Core/vtkCleanPolyData.h similarity index 100% rename from Graphics/vtkCleanPolyData.h rename to Filters/Core/vtkCleanPolyData.h diff --git a/Graphics/vtkClipPolyData.cxx b/Filters/Core/vtkClipPolyData.cxx similarity index 100% rename from Graphics/vtkClipPolyData.cxx rename to Filters/Core/vtkClipPolyData.cxx diff --git a/Graphics/vtkClipPolyData.h b/Filters/Core/vtkClipPolyData.h similarity index 100% rename from Graphics/vtkClipPolyData.h rename to Filters/Core/vtkClipPolyData.h diff --git a/Graphics/vtkCompositeDataProbeFilter.cxx b/Filters/Core/vtkCompositeDataProbeFilter.cxx similarity index 100% rename from Graphics/vtkCompositeDataProbeFilter.cxx rename to Filters/Core/vtkCompositeDataProbeFilter.cxx diff --git a/Graphics/vtkCompositeDataProbeFilter.h b/Filters/Core/vtkCompositeDataProbeFilter.h similarity index 100% rename from Graphics/vtkCompositeDataProbeFilter.h rename to Filters/Core/vtkCompositeDataProbeFilter.h diff --git a/Graphics/vtkConnectivityFilter.cxx b/Filters/Core/vtkConnectivityFilter.cxx similarity index 100% rename from Graphics/vtkConnectivityFilter.cxx rename to Filters/Core/vtkConnectivityFilter.cxx diff --git a/Graphics/vtkConnectivityFilter.h b/Filters/Core/vtkConnectivityFilter.h similarity index 100% rename from Graphics/vtkConnectivityFilter.h rename to Filters/Core/vtkConnectivityFilter.h diff --git a/Graphics/vtkContourFilter.cxx b/Filters/Core/vtkContourFilter.cxx similarity index 100% rename from Graphics/vtkContourFilter.cxx rename to Filters/Core/vtkContourFilter.cxx diff --git a/Graphics/vtkContourFilter.h b/Filters/Core/vtkContourFilter.h similarity index 100% rename from Graphics/vtkContourFilter.h rename to Filters/Core/vtkContourFilter.h diff --git a/Graphics/vtkContourGrid.cxx b/Filters/Core/vtkContourGrid.cxx similarity index 100% rename from Graphics/vtkContourGrid.cxx rename to Filters/Core/vtkContourGrid.cxx diff --git a/Graphics/vtkContourGrid.h b/Filters/Core/vtkContourGrid.h similarity index 100% rename from Graphics/vtkContourGrid.h rename to Filters/Core/vtkContourGrid.h diff --git a/Graphics/vtkCutter.cxx b/Filters/Core/vtkCutter.cxx similarity index 100% rename from Graphics/vtkCutter.cxx rename to Filters/Core/vtkCutter.cxx diff --git a/Graphics/vtkCutter.h b/Filters/Core/vtkCutter.h similarity index 100% rename from Graphics/vtkCutter.h rename to Filters/Core/vtkCutter.h diff --git a/Graphics/vtkDataObjectGenerator.cxx b/Filters/Core/vtkDataObjectGenerator.cxx similarity index 100% rename from Graphics/vtkDataObjectGenerator.cxx rename to Filters/Core/vtkDataObjectGenerator.cxx diff --git a/Graphics/vtkDataObjectGenerator.h b/Filters/Core/vtkDataObjectGenerator.h similarity index 100% rename from Graphics/vtkDataObjectGenerator.h rename to Filters/Core/vtkDataObjectGenerator.h diff --git a/Graphics/vtkDataObjectToDataSetFilter.cxx b/Filters/Core/vtkDataObjectToDataSetFilter.cxx similarity index 100% rename from Graphics/vtkDataObjectToDataSetFilter.cxx rename to Filters/Core/vtkDataObjectToDataSetFilter.cxx diff --git a/Graphics/vtkDataObjectToDataSetFilter.h b/Filters/Core/vtkDataObjectToDataSetFilter.h similarity index 100% rename from Graphics/vtkDataObjectToDataSetFilter.h rename to Filters/Core/vtkDataObjectToDataSetFilter.h diff --git a/Graphics/vtkDataSetEdgeSubdivisionCriterion.cxx b/Filters/Core/vtkDataSetEdgeSubdivisionCriterion.cxx similarity index 100% rename from Graphics/vtkDataSetEdgeSubdivisionCriterion.cxx rename to Filters/Core/vtkDataSetEdgeSubdivisionCriterion.cxx diff --git a/Graphics/vtkDataSetEdgeSubdivisionCriterion.h b/Filters/Core/vtkDataSetEdgeSubdivisionCriterion.h similarity index 100% rename from Graphics/vtkDataSetEdgeSubdivisionCriterion.h rename to Filters/Core/vtkDataSetEdgeSubdivisionCriterion.h diff --git a/Graphics/vtkDataSetToDataObjectFilter.cxx b/Filters/Core/vtkDataSetToDataObjectFilter.cxx similarity index 100% rename from Graphics/vtkDataSetToDataObjectFilter.cxx rename to Filters/Core/vtkDataSetToDataObjectFilter.cxx diff --git a/Graphics/vtkDataSetToDataObjectFilter.h b/Filters/Core/vtkDataSetToDataObjectFilter.h similarity index 100% rename from Graphics/vtkDataSetToDataObjectFilter.h rename to Filters/Core/vtkDataSetToDataObjectFilter.h diff --git a/Graphics/vtkDecimatePolylineFilter.cxx b/Filters/Core/vtkDecimatePolylineFilter.cxx similarity index 100% rename from Graphics/vtkDecimatePolylineFilter.cxx rename to Filters/Core/vtkDecimatePolylineFilter.cxx diff --git a/Graphics/vtkDecimatePolylineFilter.h b/Filters/Core/vtkDecimatePolylineFilter.h similarity index 100% rename from Graphics/vtkDecimatePolylineFilter.h rename to Filters/Core/vtkDecimatePolylineFilter.h diff --git a/Graphics/vtkDecimatePro.cxx b/Filters/Core/vtkDecimatePro.cxx similarity index 100% rename from Graphics/vtkDecimatePro.cxx rename to Filters/Core/vtkDecimatePro.cxx diff --git a/Graphics/vtkDecimatePro.h b/Filters/Core/vtkDecimatePro.h similarity index 100% rename from Graphics/vtkDecimatePro.h rename to Filters/Core/vtkDecimatePro.h diff --git a/Graphics/vtkDelaunay2D.cxx b/Filters/Core/vtkDelaunay2D.cxx similarity index 100% rename from Graphics/vtkDelaunay2D.cxx rename to Filters/Core/vtkDelaunay2D.cxx diff --git a/Graphics/vtkDelaunay2D.h b/Filters/Core/vtkDelaunay2D.h similarity index 100% rename from Graphics/vtkDelaunay2D.h rename to Filters/Core/vtkDelaunay2D.h diff --git a/Graphics/vtkDelaunay3D.cxx b/Filters/Core/vtkDelaunay3D.cxx similarity index 100% rename from Graphics/vtkDelaunay3D.cxx rename to Filters/Core/vtkDelaunay3D.cxx diff --git a/Graphics/vtkDelaunay3D.h b/Filters/Core/vtkDelaunay3D.h similarity index 100% rename from Graphics/vtkDelaunay3D.h rename to Filters/Core/vtkDelaunay3D.h diff --git a/Graphics/vtkEdgeSubdivisionCriterion.cxx b/Filters/Core/vtkEdgeSubdivisionCriterion.cxx similarity index 100% rename from Graphics/vtkEdgeSubdivisionCriterion.cxx rename to Filters/Core/vtkEdgeSubdivisionCriterion.cxx diff --git a/Graphics/vtkEdgeSubdivisionCriterion.h b/Filters/Core/vtkEdgeSubdivisionCriterion.h similarity index 100% rename from Graphics/vtkEdgeSubdivisionCriterion.h rename to Filters/Core/vtkEdgeSubdivisionCriterion.h diff --git a/Graphics/vtkElevationFilter.cxx b/Filters/Core/vtkElevationFilter.cxx similarity index 100% rename from Graphics/vtkElevationFilter.cxx rename to Filters/Core/vtkElevationFilter.cxx diff --git a/Graphics/vtkElevationFilter.h b/Filters/Core/vtkElevationFilter.h similarity index 100% rename from Graphics/vtkElevationFilter.h rename to Filters/Core/vtkElevationFilter.h diff --git a/Graphics/vtkFeatureEdges.cxx b/Filters/Core/vtkFeatureEdges.cxx similarity index 100% rename from Graphics/vtkFeatureEdges.cxx rename to Filters/Core/vtkFeatureEdges.cxx diff --git a/Graphics/vtkFeatureEdges.h b/Filters/Core/vtkFeatureEdges.h similarity index 100% rename from Graphics/vtkFeatureEdges.h rename to Filters/Core/vtkFeatureEdges.h diff --git a/Graphics/vtkFieldDataToAttributeDataFilter.cxx b/Filters/Core/vtkFieldDataToAttributeDataFilter.cxx similarity index 100% rename from Graphics/vtkFieldDataToAttributeDataFilter.cxx rename to Filters/Core/vtkFieldDataToAttributeDataFilter.cxx diff --git a/Graphics/vtkFieldDataToAttributeDataFilter.h b/Filters/Core/vtkFieldDataToAttributeDataFilter.h similarity index 100% rename from Graphics/vtkFieldDataToAttributeDataFilter.h rename to Filters/Core/vtkFieldDataToAttributeDataFilter.h diff --git a/Common/vtkGhostArray.cxx b/Filters/Core/vtkGhostArray.cxx similarity index 100% rename from Common/vtkGhostArray.cxx rename to Filters/Core/vtkGhostArray.cxx diff --git a/Common/vtkGhostArray.h b/Filters/Core/vtkGhostArray.h similarity index 100% rename from Common/vtkGhostArray.h rename to Filters/Core/vtkGhostArray.h diff --git a/Graphics/vtkGlyph2D.cxx b/Filters/Core/vtkGlyph2D.cxx similarity index 100% rename from Graphics/vtkGlyph2D.cxx rename to Filters/Core/vtkGlyph2D.cxx diff --git a/Graphics/vtkGlyph2D.h b/Filters/Core/vtkGlyph2D.h similarity index 100% rename from Graphics/vtkGlyph2D.h rename to Filters/Core/vtkGlyph2D.h diff --git a/Graphics/vtkGlyph3D.cxx b/Filters/Core/vtkGlyph3D.cxx similarity index 100% rename from Graphics/vtkGlyph3D.cxx rename to Filters/Core/vtkGlyph3D.cxx diff --git a/Graphics/vtkGlyph3D.h b/Filters/Core/vtkGlyph3D.h similarity index 100% rename from Graphics/vtkGlyph3D.h rename to Filters/Core/vtkGlyph3D.h diff --git a/Graphics/vtkGridSynchronizedTemplates3D.cxx b/Filters/Core/vtkGridSynchronizedTemplates3D.cxx similarity index 100% rename from Graphics/vtkGridSynchronizedTemplates3D.cxx rename to Filters/Core/vtkGridSynchronizedTemplates3D.cxx diff --git a/Graphics/vtkGridSynchronizedTemplates3D.h b/Filters/Core/vtkGridSynchronizedTemplates3D.h similarity index 100% rename from Graphics/vtkGridSynchronizedTemplates3D.h rename to Filters/Core/vtkGridSynchronizedTemplates3D.h diff --git a/Graphics/vtkHedgeHog.cxx b/Filters/Core/vtkHedgeHog.cxx similarity index 100% rename from Graphics/vtkHedgeHog.cxx rename to Filters/Core/vtkHedgeHog.cxx diff --git a/Graphics/vtkHedgeHog.h b/Filters/Core/vtkHedgeHog.h similarity index 100% rename from Graphics/vtkHedgeHog.h rename to Filters/Core/vtkHedgeHog.h diff --git a/Graphics/vtkHull.cxx b/Filters/Core/vtkHull.cxx similarity index 100% rename from Graphics/vtkHull.cxx rename to Filters/Core/vtkHull.cxx diff --git a/Graphics/vtkHull.h b/Filters/Core/vtkHull.h similarity index 100% rename from Graphics/vtkHull.h rename to Filters/Core/vtkHull.h diff --git a/Graphics/vtkIdFilter.cxx b/Filters/Core/vtkIdFilter.cxx similarity index 100% rename from Graphics/vtkIdFilter.cxx rename to Filters/Core/vtkIdFilter.cxx diff --git a/Graphics/vtkIdFilter.h b/Filters/Core/vtkIdFilter.h similarity index 100% rename from Graphics/vtkIdFilter.h rename to Filters/Core/vtkIdFilter.h diff --git a/Graphics/vtkImplicitPolyDataDistance.cxx b/Filters/Core/vtkImplicitPolyDataDistance.cxx similarity index 100% rename from Graphics/vtkImplicitPolyDataDistance.cxx rename to Filters/Core/vtkImplicitPolyDataDistance.cxx diff --git a/Graphics/vtkImplicitPolyDataDistance.h b/Filters/Core/vtkImplicitPolyDataDistance.h similarity index 100% rename from Graphics/vtkImplicitPolyDataDistance.h rename to Filters/Core/vtkImplicitPolyDataDistance.h diff --git a/Graphics/vtkMarchingCubes.cxx b/Filters/Core/vtkMarchingCubes.cxx similarity index 100% rename from Graphics/vtkMarchingCubes.cxx rename to Filters/Core/vtkMarchingCubes.cxx diff --git a/Graphics/vtkMarchingCubes.h b/Filters/Core/vtkMarchingCubes.h similarity index 100% rename from Graphics/vtkMarchingCubes.h rename to Filters/Core/vtkMarchingCubes.h diff --git a/Graphics/vtkMarchingSquares.cxx b/Filters/Core/vtkMarchingSquares.cxx similarity index 100% rename from Graphics/vtkMarchingSquares.cxx rename to Filters/Core/vtkMarchingSquares.cxx diff --git a/Graphics/vtkMarchingSquares.h b/Filters/Core/vtkMarchingSquares.h similarity index 100% rename from Graphics/vtkMarchingSquares.h rename to Filters/Core/vtkMarchingSquares.h diff --git a/Graphics/vtkMaskFields.cxx b/Filters/Core/vtkMaskFields.cxx similarity index 100% rename from Graphics/vtkMaskFields.cxx rename to Filters/Core/vtkMaskFields.cxx diff --git a/Graphics/vtkMaskFields.h b/Filters/Core/vtkMaskFields.h similarity index 100% rename from Graphics/vtkMaskFields.h rename to Filters/Core/vtkMaskFields.h diff --git a/Graphics/vtkMaskPoints.cxx b/Filters/Core/vtkMaskPoints.cxx similarity index 100% rename from Graphics/vtkMaskPoints.cxx rename to Filters/Core/vtkMaskPoints.cxx diff --git a/Graphics/vtkMaskPoints.h b/Filters/Core/vtkMaskPoints.h similarity index 100% rename from Graphics/vtkMaskPoints.h rename to Filters/Core/vtkMaskPoints.h diff --git a/Graphics/vtkMaskPolyData.cxx b/Filters/Core/vtkMaskPolyData.cxx similarity index 100% rename from Graphics/vtkMaskPolyData.cxx rename to Filters/Core/vtkMaskPolyData.cxx diff --git a/Graphics/vtkMaskPolyData.h b/Filters/Core/vtkMaskPolyData.h similarity index 100% rename from Graphics/vtkMaskPolyData.h rename to Filters/Core/vtkMaskPolyData.h diff --git a/Graphics/vtkMassProperties.cxx b/Filters/Core/vtkMassProperties.cxx similarity index 100% rename from Graphics/vtkMassProperties.cxx rename to Filters/Core/vtkMassProperties.cxx diff --git a/Graphics/vtkMassProperties.h b/Filters/Core/vtkMassProperties.h similarity index 100% rename from Graphics/vtkMassProperties.h rename to Filters/Core/vtkMassProperties.h diff --git a/Graphics/vtkMergeDataObjectFilter.cxx b/Filters/Core/vtkMergeDataObjectFilter.cxx similarity index 100% rename from Graphics/vtkMergeDataObjectFilter.cxx rename to Filters/Core/vtkMergeDataObjectFilter.cxx diff --git a/Graphics/vtkMergeDataObjectFilter.h b/Filters/Core/vtkMergeDataObjectFilter.h similarity index 100% rename from Graphics/vtkMergeDataObjectFilter.h rename to Filters/Core/vtkMergeDataObjectFilter.h diff --git a/Graphics/vtkMergeFields.cxx b/Filters/Core/vtkMergeFields.cxx similarity index 100% rename from Graphics/vtkMergeFields.cxx rename to Filters/Core/vtkMergeFields.cxx diff --git a/Graphics/vtkMergeFields.h b/Filters/Core/vtkMergeFields.h similarity index 100% rename from Graphics/vtkMergeFields.h rename to Filters/Core/vtkMergeFields.h diff --git a/Graphics/vtkMergeFilter.cxx b/Filters/Core/vtkMergeFilter.cxx similarity index 100% rename from Graphics/vtkMergeFilter.cxx rename to Filters/Core/vtkMergeFilter.cxx diff --git a/Graphics/vtkMergeFilter.h b/Filters/Core/vtkMergeFilter.h similarity index 100% rename from Graphics/vtkMergeFilter.h rename to Filters/Core/vtkMergeFilter.h diff --git a/Graphics/vtkPointDataToCellData.cxx b/Filters/Core/vtkPointDataToCellData.cxx similarity index 100% rename from Graphics/vtkPointDataToCellData.cxx rename to Filters/Core/vtkPointDataToCellData.cxx diff --git a/Graphics/vtkPointDataToCellData.h b/Filters/Core/vtkPointDataToCellData.h similarity index 100% rename from Graphics/vtkPointDataToCellData.h rename to Filters/Core/vtkPointDataToCellData.h diff --git a/Graphics/vtkPolyDataConnectivityFilter.cxx b/Filters/Core/vtkPolyDataConnectivityFilter.cxx similarity index 100% rename from Graphics/vtkPolyDataConnectivityFilter.cxx rename to Filters/Core/vtkPolyDataConnectivityFilter.cxx diff --git a/Graphics/vtkPolyDataConnectivityFilter.h b/Filters/Core/vtkPolyDataConnectivityFilter.h similarity index 100% rename from Graphics/vtkPolyDataConnectivityFilter.h rename to Filters/Core/vtkPolyDataConnectivityFilter.h diff --git a/Graphics/vtkPolyDataNormals.cxx b/Filters/Core/vtkPolyDataNormals.cxx similarity index 100% rename from Graphics/vtkPolyDataNormals.cxx rename to Filters/Core/vtkPolyDataNormals.cxx diff --git a/Graphics/vtkPolyDataNormals.h b/Filters/Core/vtkPolyDataNormals.h similarity index 100% rename from Graphics/vtkPolyDataNormals.h rename to Filters/Core/vtkPolyDataNormals.h diff --git a/Graphics/vtkProbeFilter.cxx b/Filters/Core/vtkProbeFilter.cxx similarity index 100% rename from Graphics/vtkProbeFilter.cxx rename to Filters/Core/vtkProbeFilter.cxx diff --git a/Graphics/vtkProbeFilter.h b/Filters/Core/vtkProbeFilter.h similarity index 100% rename from Graphics/vtkProbeFilter.h rename to Filters/Core/vtkProbeFilter.h diff --git a/Graphics/vtkQuadricClustering.cxx b/Filters/Core/vtkQuadricClustering.cxx similarity index 100% rename from Graphics/vtkQuadricClustering.cxx rename to Filters/Core/vtkQuadricClustering.cxx diff --git a/Graphics/vtkQuadricClustering.h b/Filters/Core/vtkQuadricClustering.h similarity index 100% rename from Graphics/vtkQuadricClustering.h rename to Filters/Core/vtkQuadricClustering.h diff --git a/Graphics/vtkQuadricDecimation.cxx b/Filters/Core/vtkQuadricDecimation.cxx similarity index 100% rename from Graphics/vtkQuadricDecimation.cxx rename to Filters/Core/vtkQuadricDecimation.cxx diff --git a/Graphics/vtkQuadricDecimation.h b/Filters/Core/vtkQuadricDecimation.h similarity index 100% rename from Graphics/vtkQuadricDecimation.h rename to Filters/Core/vtkQuadricDecimation.h diff --git a/Graphics/vtkRearrangeFields.cxx b/Filters/Core/vtkRearrangeFields.cxx similarity index 100% rename from Graphics/vtkRearrangeFields.cxx rename to Filters/Core/vtkRearrangeFields.cxx diff --git a/Graphics/vtkRearrangeFields.h b/Filters/Core/vtkRearrangeFields.h similarity index 100% rename from Graphics/vtkRearrangeFields.h rename to Filters/Core/vtkRearrangeFields.h diff --git a/Graphics/vtkRectilinearSynchronizedTemplates.cxx b/Filters/Core/vtkRectilinearSynchronizedTemplates.cxx similarity index 100% rename from Graphics/vtkRectilinearSynchronizedTemplates.cxx rename to Filters/Core/vtkRectilinearSynchronizedTemplates.cxx diff --git a/Graphics/vtkRectilinearSynchronizedTemplates.h b/Filters/Core/vtkRectilinearSynchronizedTemplates.h similarity index 100% rename from Graphics/vtkRectilinearSynchronizedTemplates.h rename to Filters/Core/vtkRectilinearSynchronizedTemplates.h diff --git a/Graphics/vtkReverseSense.cxx b/Filters/Core/vtkReverseSense.cxx similarity index 100% rename from Graphics/vtkReverseSense.cxx rename to Filters/Core/vtkReverseSense.cxx diff --git a/Graphics/vtkReverseSense.h b/Filters/Core/vtkReverseSense.h similarity index 100% rename from Graphics/vtkReverseSense.h rename to Filters/Core/vtkReverseSense.h diff --git a/Graphics/vtkSimpleElevationFilter.cxx b/Filters/Core/vtkSimpleElevationFilter.cxx similarity index 100% rename from Graphics/vtkSimpleElevationFilter.cxx rename to Filters/Core/vtkSimpleElevationFilter.cxx diff --git a/Graphics/vtkSimpleElevationFilter.h b/Filters/Core/vtkSimpleElevationFilter.h similarity index 100% rename from Graphics/vtkSimpleElevationFilter.h rename to Filters/Core/vtkSimpleElevationFilter.h diff --git a/Graphics/vtkSmoothPolyDataFilter.cxx b/Filters/Core/vtkSmoothPolyDataFilter.cxx similarity index 100% rename from Graphics/vtkSmoothPolyDataFilter.cxx rename to Filters/Core/vtkSmoothPolyDataFilter.cxx diff --git a/Graphics/vtkSmoothPolyDataFilter.h b/Filters/Core/vtkSmoothPolyDataFilter.h similarity index 100% rename from Graphics/vtkSmoothPolyDataFilter.h rename to Filters/Core/vtkSmoothPolyDataFilter.h diff --git a/Graphics/vtkStreamLine.cxx b/Filters/Core/vtkStreamLine.cxx similarity index 100% rename from Graphics/vtkStreamLine.cxx rename to Filters/Core/vtkStreamLine.cxx diff --git a/Graphics/vtkStreamLine.h b/Filters/Core/vtkStreamLine.h similarity index 100% rename from Graphics/vtkStreamLine.h rename to Filters/Core/vtkStreamLine.h diff --git a/Graphics/vtkStreamPoints.cxx b/Filters/Core/vtkStreamPoints.cxx similarity index 100% rename from Graphics/vtkStreamPoints.cxx rename to Filters/Core/vtkStreamPoints.cxx diff --git a/Graphics/vtkStreamPoints.h b/Filters/Core/vtkStreamPoints.h similarity index 100% rename from Graphics/vtkStreamPoints.h rename to Filters/Core/vtkStreamPoints.h diff --git a/Graphics/vtkStreamer.cxx b/Filters/Core/vtkStreamer.cxx similarity index 100% rename from Graphics/vtkStreamer.cxx rename to Filters/Core/vtkStreamer.cxx diff --git a/Graphics/vtkStreamer.h b/Filters/Core/vtkStreamer.h similarity index 100% rename from Graphics/vtkStreamer.h rename to Filters/Core/vtkStreamer.h diff --git a/Graphics/vtkStreamerBase.cxx b/Filters/Core/vtkStreamerBase.cxx similarity index 100% rename from Graphics/vtkStreamerBase.cxx rename to Filters/Core/vtkStreamerBase.cxx diff --git a/Graphics/vtkStreamerBase.h b/Filters/Core/vtkStreamerBase.h similarity index 100% rename from Graphics/vtkStreamerBase.h rename to Filters/Core/vtkStreamerBase.h diff --git a/Graphics/vtkStreamingTessellator.cxx b/Filters/Core/vtkStreamingTessellator.cxx similarity index 100% rename from Graphics/vtkStreamingTessellator.cxx rename to Filters/Core/vtkStreamingTessellator.cxx diff --git a/Graphics/vtkStreamingTessellator.h b/Filters/Core/vtkStreamingTessellator.h similarity index 100% rename from Graphics/vtkStreamingTessellator.h rename to Filters/Core/vtkStreamingTessellator.h diff --git a/Graphics/vtkStreamingTessellatorGenerator.py b/Filters/Core/vtkStreamingTessellatorGenerator.py similarity index 100% rename from Graphics/vtkStreamingTessellatorGenerator.py rename to Filters/Core/vtkStreamingTessellatorGenerator.py diff --git a/Graphics/vtkStripper.cxx b/Filters/Core/vtkStripper.cxx similarity index 100% rename from Graphics/vtkStripper.cxx rename to Filters/Core/vtkStripper.cxx diff --git a/Graphics/vtkStripper.h b/Filters/Core/vtkStripper.h similarity index 100% rename from Graphics/vtkStripper.h rename to Filters/Core/vtkStripper.h diff --git a/Graphics/vtkStructuredGridOutlineFilter.cxx b/Filters/Core/vtkStructuredGridOutlineFilter.cxx similarity index 100% rename from Graphics/vtkStructuredGridOutlineFilter.cxx rename to Filters/Core/vtkStructuredGridOutlineFilter.cxx diff --git a/Graphics/vtkStructuredGridOutlineFilter.h b/Filters/Core/vtkStructuredGridOutlineFilter.h similarity index 100% rename from Graphics/vtkStructuredGridOutlineFilter.h rename to Filters/Core/vtkStructuredGridOutlineFilter.h diff --git a/Graphics/vtkSynchronizedTemplates2D.cxx b/Filters/Core/vtkSynchronizedTemplates2D.cxx similarity index 100% rename from Graphics/vtkSynchronizedTemplates2D.cxx rename to Filters/Core/vtkSynchronizedTemplates2D.cxx diff --git a/Graphics/vtkSynchronizedTemplates2D.h b/Filters/Core/vtkSynchronizedTemplates2D.h similarity index 100% rename from Graphics/vtkSynchronizedTemplates2D.h rename to Filters/Core/vtkSynchronizedTemplates2D.h diff --git a/Graphics/vtkSynchronizedTemplates3D.cxx b/Filters/Core/vtkSynchronizedTemplates3D.cxx similarity index 100% rename from Graphics/vtkSynchronizedTemplates3D.cxx rename to Filters/Core/vtkSynchronizedTemplates3D.cxx diff --git a/Graphics/vtkSynchronizedTemplates3D.h b/Filters/Core/vtkSynchronizedTemplates3D.h similarity index 100% rename from Graphics/vtkSynchronizedTemplates3D.h rename to Filters/Core/vtkSynchronizedTemplates3D.h diff --git a/Graphics/vtkSynchronizedTemplatesCutter3D.cxx b/Filters/Core/vtkSynchronizedTemplatesCutter3D.cxx similarity index 100% rename from Graphics/vtkSynchronizedTemplatesCutter3D.cxx rename to Filters/Core/vtkSynchronizedTemplatesCutter3D.cxx diff --git a/Graphics/vtkSynchronizedTemplatesCutter3D.h b/Filters/Core/vtkSynchronizedTemplatesCutter3D.h similarity index 100% rename from Graphics/vtkSynchronizedTemplatesCutter3D.h rename to Filters/Core/vtkSynchronizedTemplatesCutter3D.h diff --git a/Graphics/vtkTensorGlyph.cxx b/Filters/Core/vtkTensorGlyph.cxx similarity index 100% rename from Graphics/vtkTensorGlyph.cxx rename to Filters/Core/vtkTensorGlyph.cxx diff --git a/Graphics/vtkTensorGlyph.h b/Filters/Core/vtkTensorGlyph.h similarity index 100% rename from Graphics/vtkTensorGlyph.h rename to Filters/Core/vtkTensorGlyph.h diff --git a/Graphics/vtkThreshold.cxx b/Filters/Core/vtkThreshold.cxx similarity index 100% rename from Graphics/vtkThreshold.cxx rename to Filters/Core/vtkThreshold.cxx diff --git a/Graphics/vtkThreshold.h b/Filters/Core/vtkThreshold.h similarity index 100% rename from Graphics/vtkThreshold.h rename to Filters/Core/vtkThreshold.h diff --git a/Graphics/vtkThresholdPoints.cxx b/Filters/Core/vtkThresholdPoints.cxx similarity index 100% rename from Graphics/vtkThresholdPoints.cxx rename to Filters/Core/vtkThresholdPoints.cxx diff --git a/Graphics/vtkThresholdPoints.h b/Filters/Core/vtkThresholdPoints.h similarity index 100% rename from Graphics/vtkThresholdPoints.h rename to Filters/Core/vtkThresholdPoints.h diff --git a/Graphics/vtkTriangleFilter.cxx b/Filters/Core/vtkTriangleFilter.cxx similarity index 100% rename from Graphics/vtkTriangleFilter.cxx rename to Filters/Core/vtkTriangleFilter.cxx diff --git a/Graphics/vtkTriangleFilter.h b/Filters/Core/vtkTriangleFilter.h similarity index 100% rename from Graphics/vtkTriangleFilter.h rename to Filters/Core/vtkTriangleFilter.h diff --git a/Graphics/vtkTubeFilter.cxx b/Filters/Core/vtkTubeFilter.cxx similarity index 100% rename from Graphics/vtkTubeFilter.cxx rename to Filters/Core/vtkTubeFilter.cxx diff --git a/Graphics/vtkTubeFilter.h b/Filters/Core/vtkTubeFilter.h similarity index 100% rename from Graphics/vtkTubeFilter.h rename to Filters/Core/vtkTubeFilter.h diff --git a/Graphics/vtkVectorDot.cxx b/Filters/Core/vtkVectorDot.cxx similarity index 100% rename from Graphics/vtkVectorDot.cxx rename to Filters/Core/vtkVectorDot.cxx diff --git a/Graphics/vtkVectorDot.h b/Filters/Core/vtkVectorDot.h similarity index 100% rename from Graphics/vtkVectorDot.h rename to Filters/Core/vtkVectorDot.h diff --git a/Graphics/vtkVectorNorm.cxx b/Filters/Core/vtkVectorNorm.cxx similarity index 100% rename from Graphics/vtkVectorNorm.cxx rename to Filters/Core/vtkVectorNorm.cxx diff --git a/Graphics/vtkVectorNorm.h b/Filters/Core/vtkVectorNorm.h similarity index 100% rename from Graphics/vtkVectorNorm.h rename to Filters/Core/vtkVectorNorm.h diff --git a/Graphics/vtkWindowedSincPolyDataFilter.cxx b/Filters/Core/vtkWindowedSincPolyDataFilter.cxx similarity index 100% rename from Graphics/vtkWindowedSincPolyDataFilter.cxx rename to Filters/Core/vtkWindowedSincPolyDataFilter.cxx diff --git a/Graphics/vtkWindowedSincPolyDataFilter.h b/Filters/Core/vtkWindowedSincPolyDataFilter.h similarity index 100% rename from Graphics/vtkWindowedSincPolyDataFilter.h rename to Filters/Core/vtkWindowedSincPolyDataFilter.h diff --git a/Graphics/Testing/Cxx/TestConvertSelection.cxx b/Filters/Extraction/Testing/Cxx/TestConvertSelection.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestConvertSelection.cxx rename to Filters/Extraction/Testing/Cxx/TestConvertSelection.cxx diff --git a/Graphics/Testing/Cxx/TestExtractSelection.cxx b/Filters/Extraction/Testing/Cxx/TestExtractSelection.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestExtractSelection.cxx rename to Filters/Extraction/Testing/Cxx/TestExtractSelection.cxx diff --git a/Graphics/Testing/Cxx/TestExtraction.cxx b/Filters/Extraction/Testing/Cxx/TestExtraction.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestExtraction.cxx rename to Filters/Extraction/Testing/Cxx/TestExtraction.cxx diff --git a/Graphics/Testing/Tcl/ExtractEdgesQuadraticCells.tcl b/Filters/Extraction/Testing/Tcl/ExtractEdgesQuadraticCells.tcl similarity index 100% rename from Graphics/Testing/Tcl/ExtractEdgesQuadraticCells.tcl rename to Filters/Extraction/Testing/Tcl/ExtractEdgesQuadraticCells.tcl diff --git a/Graphics/Testing/Tcl/ExtractTensors.tcl b/Filters/Extraction/Testing/Tcl/ExtractTensors.tcl similarity index 100% rename from Graphics/Testing/Tcl/ExtractTensors.tcl rename to Filters/Extraction/Testing/Tcl/ExtractTensors.tcl diff --git a/Graphics/Testing/Tcl/extractPolyData.tcl b/Filters/Extraction/Testing/Tcl/extractPolyData.tcl similarity index 100% rename from Graphics/Testing/Tcl/extractPolyData.tcl rename to Filters/Extraction/Testing/Tcl/extractPolyData.tcl diff --git a/Graphics/Testing/Tcl/extractRectGrid.tcl b/Filters/Extraction/Testing/Tcl/extractRectGrid.tcl similarity index 100% rename from Graphics/Testing/Tcl/extractRectGrid.tcl rename to Filters/Extraction/Testing/Tcl/extractRectGrid.tcl diff --git a/Graphics/Testing/Tcl/extractUGrid.tcl b/Filters/Extraction/Testing/Tcl/extractUGrid.tcl similarity index 100% rename from Graphics/Testing/Tcl/extractUGrid.tcl rename to Filters/Extraction/Testing/Tcl/extractUGrid.tcl diff --git a/Graphics/Testing/Tcl/extractVectors.tcl b/Filters/Extraction/Testing/Tcl/extractVectors.tcl similarity index 100% rename from Graphics/Testing/Tcl/extractVectors.tcl rename to Filters/Extraction/Testing/Tcl/extractVectors.tcl diff --git a/Graphics/vtkConvertSelection.cxx b/Filters/Extraction/vtkConvertSelection.cxx similarity index 100% rename from Graphics/vtkConvertSelection.cxx rename to Filters/Extraction/vtkConvertSelection.cxx diff --git a/Graphics/vtkConvertSelection.h b/Filters/Extraction/vtkConvertSelection.h similarity index 100% rename from Graphics/vtkConvertSelection.h rename to Filters/Extraction/vtkConvertSelection.h diff --git a/Graphics/vtkExtractArraysOverTime.cxx b/Filters/Extraction/vtkExtractArraysOverTime.cxx similarity index 100% rename from Graphics/vtkExtractArraysOverTime.cxx rename to Filters/Extraction/vtkExtractArraysOverTime.cxx diff --git a/Graphics/vtkExtractArraysOverTime.h b/Filters/Extraction/vtkExtractArraysOverTime.h similarity index 100% rename from Graphics/vtkExtractArraysOverTime.h rename to Filters/Extraction/vtkExtractArraysOverTime.h diff --git a/Graphics/vtkExtractBlock.cxx b/Filters/Extraction/vtkExtractBlock.cxx similarity index 100% rename from Graphics/vtkExtractBlock.cxx rename to Filters/Extraction/vtkExtractBlock.cxx diff --git a/Graphics/vtkExtractBlock.h b/Filters/Extraction/vtkExtractBlock.h similarity index 100% rename from Graphics/vtkExtractBlock.h rename to Filters/Extraction/vtkExtractBlock.h diff --git a/Graphics/vtkExtractCells.cxx b/Filters/Extraction/vtkExtractCells.cxx similarity index 100% rename from Graphics/vtkExtractCells.cxx rename to Filters/Extraction/vtkExtractCells.cxx diff --git a/Graphics/vtkExtractCells.h b/Filters/Extraction/vtkExtractCells.h similarity index 100% rename from Graphics/vtkExtractCells.h rename to Filters/Extraction/vtkExtractCells.h diff --git a/Graphics/vtkExtractDataOverTime.cxx b/Filters/Extraction/vtkExtractDataOverTime.cxx similarity index 100% rename from Graphics/vtkExtractDataOverTime.cxx rename to Filters/Extraction/vtkExtractDataOverTime.cxx diff --git a/Graphics/vtkExtractDataOverTime.h b/Filters/Extraction/vtkExtractDataOverTime.h similarity index 100% rename from Graphics/vtkExtractDataOverTime.h rename to Filters/Extraction/vtkExtractDataOverTime.h diff --git a/Graphics/vtkExtractDataSets.cxx b/Filters/Extraction/vtkExtractDataSets.cxx similarity index 100% rename from Graphics/vtkExtractDataSets.cxx rename to Filters/Extraction/vtkExtractDataSets.cxx diff --git a/Graphics/vtkExtractDataSets.h b/Filters/Extraction/vtkExtractDataSets.h similarity index 100% rename from Graphics/vtkExtractDataSets.h rename to Filters/Extraction/vtkExtractDataSets.h diff --git a/Graphics/vtkExtractEdges.cxx b/Filters/Extraction/vtkExtractEdges.cxx similarity index 100% rename from Graphics/vtkExtractEdges.cxx rename to Filters/Extraction/vtkExtractEdges.cxx diff --git a/Graphics/vtkExtractEdges.h b/Filters/Extraction/vtkExtractEdges.h similarity index 100% rename from Graphics/vtkExtractEdges.h rename to Filters/Extraction/vtkExtractEdges.h diff --git a/Graphics/vtkExtractGeometry.cxx b/Filters/Extraction/vtkExtractGeometry.cxx similarity index 100% rename from Graphics/vtkExtractGeometry.cxx rename to Filters/Extraction/vtkExtractGeometry.cxx diff --git a/Graphics/vtkExtractGeometry.h b/Filters/Extraction/vtkExtractGeometry.h similarity index 100% rename from Graphics/vtkExtractGeometry.h rename to Filters/Extraction/vtkExtractGeometry.h diff --git a/Graphics/vtkExtractGrid.cxx b/Filters/Extraction/vtkExtractGrid.cxx similarity index 100% rename from Graphics/vtkExtractGrid.cxx rename to Filters/Extraction/vtkExtractGrid.cxx diff --git a/Graphics/vtkExtractGrid.h b/Filters/Extraction/vtkExtractGrid.h similarity index 100% rename from Graphics/vtkExtractGrid.h rename to Filters/Extraction/vtkExtractGrid.h diff --git a/Graphics/vtkExtractLevel.cxx b/Filters/Extraction/vtkExtractLevel.cxx similarity index 100% rename from Graphics/vtkExtractLevel.cxx rename to Filters/Extraction/vtkExtractLevel.cxx diff --git a/Graphics/vtkExtractLevel.h b/Filters/Extraction/vtkExtractLevel.h similarity index 100% rename from Graphics/vtkExtractLevel.h rename to Filters/Extraction/vtkExtractLevel.h diff --git a/Graphics/vtkExtractPolyDataGeometry.cxx b/Filters/Extraction/vtkExtractPolyDataGeometry.cxx similarity index 100% rename from Graphics/vtkExtractPolyDataGeometry.cxx rename to Filters/Extraction/vtkExtractPolyDataGeometry.cxx diff --git a/Graphics/vtkExtractPolyDataGeometry.h b/Filters/Extraction/vtkExtractPolyDataGeometry.h similarity index 100% rename from Graphics/vtkExtractPolyDataGeometry.h rename to Filters/Extraction/vtkExtractPolyDataGeometry.h diff --git a/Graphics/vtkExtractRectilinearGrid.cxx b/Filters/Extraction/vtkExtractRectilinearGrid.cxx similarity index 100% rename from Graphics/vtkExtractRectilinearGrid.cxx rename to Filters/Extraction/vtkExtractRectilinearGrid.cxx diff --git a/Graphics/vtkExtractRectilinearGrid.h b/Filters/Extraction/vtkExtractRectilinearGrid.h similarity index 100% rename from Graphics/vtkExtractRectilinearGrid.h rename to Filters/Extraction/vtkExtractRectilinearGrid.h diff --git a/Graphics/vtkExtractSelectedBlock.cxx b/Filters/Extraction/vtkExtractSelectedBlock.cxx similarity index 100% rename from Graphics/vtkExtractSelectedBlock.cxx rename to Filters/Extraction/vtkExtractSelectedBlock.cxx diff --git a/Graphics/vtkExtractSelectedBlock.h b/Filters/Extraction/vtkExtractSelectedBlock.h similarity index 100% rename from Graphics/vtkExtractSelectedBlock.h rename to Filters/Extraction/vtkExtractSelectedBlock.h diff --git a/Graphics/vtkExtractSelectedFrustum.cxx b/Filters/Extraction/vtkExtractSelectedFrustum.cxx similarity index 100% rename from Graphics/vtkExtractSelectedFrustum.cxx rename to Filters/Extraction/vtkExtractSelectedFrustum.cxx diff --git a/Graphics/vtkExtractSelectedFrustum.h b/Filters/Extraction/vtkExtractSelectedFrustum.h similarity index 100% rename from Graphics/vtkExtractSelectedFrustum.h rename to Filters/Extraction/vtkExtractSelectedFrustum.h diff --git a/Graphics/vtkExtractSelectedIds.cxx b/Filters/Extraction/vtkExtractSelectedIds.cxx similarity index 100% rename from Graphics/vtkExtractSelectedIds.cxx rename to Filters/Extraction/vtkExtractSelectedIds.cxx diff --git a/Graphics/vtkExtractSelectedIds.h b/Filters/Extraction/vtkExtractSelectedIds.h similarity index 100% rename from Graphics/vtkExtractSelectedIds.h rename to Filters/Extraction/vtkExtractSelectedIds.h diff --git a/Graphics/vtkExtractSelectedLocations.cxx b/Filters/Extraction/vtkExtractSelectedLocations.cxx similarity index 100% rename from Graphics/vtkExtractSelectedLocations.cxx rename to Filters/Extraction/vtkExtractSelectedLocations.cxx diff --git a/Graphics/vtkExtractSelectedLocations.h b/Filters/Extraction/vtkExtractSelectedLocations.h similarity index 100% rename from Graphics/vtkExtractSelectedLocations.h rename to Filters/Extraction/vtkExtractSelectedLocations.h diff --git a/Graphics/vtkExtractSelectedPolyDataIds.cxx b/Filters/Extraction/vtkExtractSelectedPolyDataIds.cxx similarity index 100% rename from Graphics/vtkExtractSelectedPolyDataIds.cxx rename to Filters/Extraction/vtkExtractSelectedPolyDataIds.cxx diff --git a/Graphics/vtkExtractSelectedPolyDataIds.h b/Filters/Extraction/vtkExtractSelectedPolyDataIds.h similarity index 100% rename from Graphics/vtkExtractSelectedPolyDataIds.h rename to Filters/Extraction/vtkExtractSelectedPolyDataIds.h diff --git a/Graphics/vtkExtractSelectedRows.cxx b/Filters/Extraction/vtkExtractSelectedRows.cxx similarity index 100% rename from Graphics/vtkExtractSelectedRows.cxx rename to Filters/Extraction/vtkExtractSelectedRows.cxx diff --git a/Graphics/vtkExtractSelectedRows.h b/Filters/Extraction/vtkExtractSelectedRows.h similarity index 100% rename from Graphics/vtkExtractSelectedRows.h rename to Filters/Extraction/vtkExtractSelectedRows.h diff --git a/Graphics/vtkExtractSelectedThresholds.cxx b/Filters/Extraction/vtkExtractSelectedThresholds.cxx similarity index 100% rename from Graphics/vtkExtractSelectedThresholds.cxx rename to Filters/Extraction/vtkExtractSelectedThresholds.cxx diff --git a/Graphics/vtkExtractSelectedThresholds.h b/Filters/Extraction/vtkExtractSelectedThresholds.h similarity index 100% rename from Graphics/vtkExtractSelectedThresholds.h rename to Filters/Extraction/vtkExtractSelectedThresholds.h diff --git a/Graphics/vtkExtractSelection.cxx b/Filters/Extraction/vtkExtractSelection.cxx similarity index 100% rename from Graphics/vtkExtractSelection.cxx rename to Filters/Extraction/vtkExtractSelection.cxx diff --git a/Graphics/vtkExtractSelection.h b/Filters/Extraction/vtkExtractSelection.h similarity index 100% rename from Graphics/vtkExtractSelection.h rename to Filters/Extraction/vtkExtractSelection.h diff --git a/Graphics/vtkExtractSelectionBase.cxx b/Filters/Extraction/vtkExtractSelectionBase.cxx similarity index 100% rename from Graphics/vtkExtractSelectionBase.cxx rename to Filters/Extraction/vtkExtractSelectionBase.cxx diff --git a/Graphics/vtkExtractSelectionBase.h b/Filters/Extraction/vtkExtractSelectionBase.h similarity index 100% rename from Graphics/vtkExtractSelectionBase.h rename to Filters/Extraction/vtkExtractSelectionBase.h diff --git a/Graphics/vtkExtractTemporalFieldData.cxx b/Filters/Extraction/vtkExtractTemporalFieldData.cxx similarity index 100% rename from Graphics/vtkExtractTemporalFieldData.cxx rename to Filters/Extraction/vtkExtractTemporalFieldData.cxx diff --git a/Graphics/vtkExtractTemporalFieldData.h b/Filters/Extraction/vtkExtractTemporalFieldData.h similarity index 100% rename from Graphics/vtkExtractTemporalFieldData.h rename to Filters/Extraction/vtkExtractTemporalFieldData.h diff --git a/Graphics/vtkExtractTensorComponents.cxx b/Filters/Extraction/vtkExtractTensorComponents.cxx similarity index 100% rename from Graphics/vtkExtractTensorComponents.cxx rename to Filters/Extraction/vtkExtractTensorComponents.cxx diff --git a/Graphics/vtkExtractTensorComponents.h b/Filters/Extraction/vtkExtractTensorComponents.h similarity index 100% rename from Graphics/vtkExtractTensorComponents.h rename to Filters/Extraction/vtkExtractTensorComponents.h diff --git a/Graphics/vtkExtractUnstructuredGrid.cxx b/Filters/Extraction/vtkExtractUnstructuredGrid.cxx similarity index 100% rename from Graphics/vtkExtractUnstructuredGrid.cxx rename to Filters/Extraction/vtkExtractUnstructuredGrid.cxx diff --git a/Graphics/vtkExtractUnstructuredGrid.h b/Filters/Extraction/vtkExtractUnstructuredGrid.h similarity index 100% rename from Graphics/vtkExtractUnstructuredGrid.h rename to Filters/Extraction/vtkExtractUnstructuredGrid.h diff --git a/Graphics/vtkExtractVectorComponents.cxx b/Filters/Extraction/vtkExtractVectorComponents.cxx similarity index 100% rename from Graphics/vtkExtractVectorComponents.cxx rename to Filters/Extraction/vtkExtractVectorComponents.cxx diff --git a/Graphics/vtkExtractVectorComponents.h b/Filters/Extraction/vtkExtractVectorComponents.h similarity index 100% rename from Graphics/vtkExtractVectorComponents.h rename to Filters/Extraction/vtkExtractVectorComponents.h diff --git a/Graphics/vtkHierarchicalDataExtractDataSets.cxx b/Filters/Extraction/vtkHierarchicalDataExtractDataSets.cxx similarity index 100% rename from Graphics/vtkHierarchicalDataExtractDataSets.cxx rename to Filters/Extraction/vtkHierarchicalDataExtractDataSets.cxx diff --git a/Graphics/vtkHierarchicalDataExtractDataSets.h b/Filters/Extraction/vtkHierarchicalDataExtractDataSets.h similarity index 100% rename from Graphics/vtkHierarchicalDataExtractDataSets.h rename to Filters/Extraction/vtkHierarchicalDataExtractDataSets.h diff --git a/Graphics/vtkHierarchicalDataExtractLevel.cxx b/Filters/Extraction/vtkHierarchicalDataExtractLevel.cxx similarity index 100% rename from Graphics/vtkHierarchicalDataExtractLevel.cxx rename to Filters/Extraction/vtkHierarchicalDataExtractLevel.cxx diff --git a/Graphics/vtkHierarchicalDataExtractLevel.h b/Filters/Extraction/vtkHierarchicalDataExtractLevel.h similarity index 100% rename from Graphics/vtkHierarchicalDataExtractLevel.h rename to Filters/Extraction/vtkHierarchicalDataExtractLevel.h diff --git a/Graphics/vtkProbeSelectedLocations.cxx b/Filters/Extraction/vtkProbeSelectedLocations.cxx similarity index 100% rename from Graphics/vtkProbeSelectedLocations.cxx rename to Filters/Extraction/vtkProbeSelectedLocations.cxx diff --git a/Graphics/vtkProbeSelectedLocations.h b/Filters/Extraction/vtkProbeSelectedLocations.h similarity index 100% rename from Graphics/vtkProbeSelectedLocations.h rename to Filters/Extraction/vtkProbeSelectedLocations.h diff --git a/Infovis/Testing/Cxx/ArrayExtractFactoredArray.cxx b/Filters/General/Testing/Cxx/ArrayExtractFactoredArray.cxx similarity index 100% rename from Infovis/Testing/Cxx/ArrayExtractFactoredArray.cxx rename to Filters/General/Testing/Cxx/ArrayExtractFactoredArray.cxx diff --git a/Infovis/Testing/Cxx/ArrayMatricizeArray.cxx b/Filters/General/Testing/Cxx/ArrayMatricizeArray.cxx similarity index 100% rename from Infovis/Testing/Cxx/ArrayMatricizeArray.cxx rename to Filters/General/Testing/Cxx/ArrayMatricizeArray.cxx diff --git a/Infovis/Testing/Cxx/ArrayNormalizeMatrixVectors.cxx b/Filters/General/Testing/Cxx/ArrayNormalizeMatrixVectors.cxx similarity index 100% rename from Infovis/Testing/Cxx/ArrayNormalizeMatrixVectors.cxx rename to Filters/General/Testing/Cxx/ArrayNormalizeMatrixVectors.cxx diff --git a/Graphics/Testing/Cxx/BoxClipPolyData.cxx b/Filters/General/Testing/Cxx/BoxClipPolyData.cxx similarity index 100% rename from Graphics/Testing/Cxx/BoxClipPolyData.cxx rename to Filters/General/Testing/Cxx/BoxClipPolyData.cxx diff --git a/Graphics/Testing/Cxx/BoxClipTetrahedra.cxx b/Filters/General/Testing/Cxx/BoxClipTetrahedra.cxx similarity index 100% rename from Graphics/Testing/Cxx/BoxClipTetrahedra.cxx rename to Filters/General/Testing/Cxx/BoxClipTetrahedra.cxx diff --git a/Graphics/Testing/Cxx/BoxClipTriangulate.cxx b/Filters/General/Testing/Cxx/BoxClipTriangulate.cxx similarity index 100% rename from Graphics/Testing/Cxx/BoxClipTriangulate.cxx rename to Filters/General/Testing/Cxx/BoxClipTriangulate.cxx diff --git a/Graphics/Testing/Cxx/BoxClipTriangulateAndInterpolate.cxx b/Filters/General/Testing/Cxx/BoxClipTriangulateAndInterpolate.cxx similarity index 100% rename from Graphics/Testing/Cxx/BoxClipTriangulateAndInterpolate.cxx rename to Filters/General/Testing/Cxx/BoxClipTriangulateAndInterpolate.cxx diff --git a/Filtering/Testing/Cxx/CellTreeLocator.cxx b/Filters/General/Testing/Cxx/CellTreeLocator.cxx similarity index 100% rename from Filtering/Testing/Cxx/CellTreeLocator.cxx rename to Filters/General/Testing/Cxx/CellTreeLocator.cxx diff --git a/Graphics/Testing/Cxx/TemporalStatistics.cxx b/Filters/General/Testing/Cxx/TemporalStatistics.cxx similarity index 100% rename from Graphics/Testing/Cxx/TemporalStatistics.cxx rename to Filters/General/Testing/Cxx/TemporalStatistics.cxx diff --git a/Graphics/Testing/Cxx/TestBSPTree.cxx b/Filters/General/Testing/Cxx/TestBSPTree.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestBSPTree.cxx rename to Filters/General/Testing/Cxx/TestBSPTree.cxx diff --git a/Graphics/Testing/Cxx/TestBooleanOperationPolyDataFilter.cxx b/Filters/General/Testing/Cxx/TestBooleanOperationPolyDataFilter.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestBooleanOperationPolyDataFilter.cxx rename to Filters/General/Testing/Cxx/TestBooleanOperationPolyDataFilter.cxx diff --git a/Graphics/Testing/Cxx/TestBooleanOperationPolyDataFilter2.cxx b/Filters/General/Testing/Cxx/TestBooleanOperationPolyDataFilter2.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestBooleanOperationPolyDataFilter2.cxx rename to Filters/General/Testing/Cxx/TestBooleanOperationPolyDataFilter2.cxx diff --git a/Graphics/Testing/Cxx/TestDensifyPolyData.cxx b/Filters/General/Testing/Cxx/TestDensifyPolyData.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestDensifyPolyData.cxx rename to Filters/General/Testing/Cxx/TestDensifyPolyData.cxx diff --git a/Graphics/Testing/Cxx/TestDistancePolyDataFilter.cxx b/Filters/General/Testing/Cxx/TestDistancePolyDataFilter.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestDistancePolyDataFilter.cxx rename to Filters/General/Testing/Cxx/TestDistancePolyDataFilter.cxx diff --git a/Graphics/Testing/Cxx/TestGradientAndVorticity.cxx b/Filters/General/Testing/Cxx/TestGradientAndVorticity.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestGradientAndVorticity.cxx rename to Filters/General/Testing/Cxx/TestGradientAndVorticity.cxx diff --git a/Filtering/Testing/Cxx/TestGraphWeightEuclideanDistanceFilter.cxx b/Filters/General/Testing/Cxx/TestGraphWeightEuclideanDistanceFilter.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestGraphWeightEuclideanDistanceFilter.cxx rename to Filters/General/Testing/Cxx/TestGraphWeightEuclideanDistanceFilter.cxx diff --git a/Graphics/Testing/Cxx/TestIconGlyphFilterGravity.cxx b/Filters/General/Testing/Cxx/TestIconGlyphFilterGravity.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestIconGlyphFilterGravity.cxx rename to Filters/General/Testing/Cxx/TestIconGlyphFilterGravity.cxx diff --git a/Graphics/Testing/Cxx/TestImageDataToPointSet.cxx b/Filters/General/Testing/Cxx/TestImageDataToPointSet.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestImageDataToPointSet.cxx rename to Filters/General/Testing/Cxx/TestImageDataToPointSet.cxx diff --git a/Graphics/Testing/Cxx/TestIntersectionPolyDataFilter.cxx b/Filters/General/Testing/Cxx/TestIntersectionPolyDataFilter.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestIntersectionPolyDataFilter.cxx rename to Filters/General/Testing/Cxx/TestIntersectionPolyDataFilter.cxx diff --git a/Graphics/Testing/Cxx/TestMultiBlock.cxx b/Filters/General/Testing/Cxx/TestMultiBlock.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestMultiBlock.cxx rename to Filters/General/Testing/Cxx/TestMultiBlock.cxx diff --git a/Infovis/Testing/Cxx/TestPassArrays.cxx b/Filters/General/Testing/Cxx/TestPassArrays.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestPassArrays.cxx rename to Filters/General/Testing/Cxx/TestPassArrays.cxx diff --git a/Infovis/Testing/Cxx/TestPassThrough.cxx b/Filters/General/Testing/Cxx/TestPassThrough.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestPassThrough.cxx rename to Filters/General/Testing/Cxx/TestPassThrough.cxx diff --git a/Graphics/Testing/Cxx/TestQuadraturePoints.cxx b/Filters/General/Testing/Cxx/TestQuadraturePoints.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestQuadraturePoints.cxx rename to Filters/General/Testing/Cxx/TestQuadraturePoints.cxx diff --git a/Graphics/Testing/Cxx/TestRectilinearGridToPointSet.cxx b/Filters/General/Testing/Cxx/TestRectilinearGridToPointSet.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestRectilinearGridToPointSet.cxx rename to Filters/General/Testing/Cxx/TestRectilinearGridToPointSet.cxx diff --git a/Graphics/Testing/Cxx/TestReflectionFilter.cxx b/Filters/General/Testing/Cxx/TestReflectionFilter.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestReflectionFilter.cxx rename to Filters/General/Testing/Cxx/TestReflectionFilter.cxx diff --git a/Infovis/Testing/Cxx/TestTableSplitColumnComponents.cxx b/Filters/General/Testing/Cxx/TestTableSplitColumnComponents.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestTableSplitColumnComponents.cxx rename to Filters/General/Testing/Cxx/TestTableSplitColumnComponents.cxx diff --git a/Graphics/Testing/Cxx/TestTessellator.cxx b/Filters/General/Testing/Cxx/TestTessellator.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestTessellator.cxx rename to Filters/General/Testing/Cxx/TestTessellator.cxx diff --git a/Graphics/Testing/Cxx/TestUncertaintyTubeFilter.cxx b/Filters/General/Testing/Cxx/TestUncertaintyTubeFilter.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestUncertaintyTubeFilter.cxx rename to Filters/General/Testing/Cxx/TestUncertaintyTubeFilter.cxx diff --git a/Graphics/Testing/Cxx/TestYoungsMaterialInterface.cxx b/Filters/General/Testing/Cxx/TestYoungsMaterialInterface.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestYoungsMaterialInterface.cxx rename to Filters/General/Testing/Cxx/TestYoungsMaterialInterface.cxx diff --git a/Graphics/Testing/Cxx/expCos.cxx b/Filters/General/Testing/Cxx/expCos.cxx similarity index 100% rename from Graphics/Testing/Cxx/expCos.cxx rename to Filters/General/Testing/Cxx/expCos.cxx diff --git a/Graphics/Testing/Tcl/Canny.tcl b/Filters/General/Testing/Tcl/Canny.tcl similarity index 100% rename from Graphics/Testing/Tcl/Canny.tcl rename to Filters/General/Testing/Tcl/Canny.tcl diff --git a/Graphics/Testing/Tcl/OBBCylinder.tcl b/Filters/General/Testing/Tcl/OBBCylinder.tcl similarity index 100% rename from Graphics/Testing/Tcl/OBBCylinder.tcl rename to Filters/General/Testing/Tcl/OBBCylinder.tcl diff --git a/Graphics/Testing/Tcl/TestCellDerivs.tcl b/Filters/General/Testing/Tcl/TestCellDerivs.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestCellDerivs.tcl rename to Filters/General/Testing/Tcl/TestCellDerivs.tcl diff --git a/Graphics/Testing/Tcl/TestClipClosedSurface.tcl b/Filters/General/Testing/Tcl/TestClipClosedSurface.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestClipClosedSurface.tcl rename to Filters/General/Testing/Tcl/TestClipClosedSurface.tcl diff --git a/Graphics/Testing/Tcl/TestClipOutline.tcl b/Filters/General/Testing/Tcl/TestClipOutline.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestClipOutline.tcl rename to Filters/General/Testing/Tcl/TestClipOutline.tcl diff --git a/Graphics/Testing/Tcl/TestCurvatures.tcl b/Filters/General/Testing/Tcl/TestCurvatures.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestCurvatures.tcl rename to Filters/General/Testing/Tcl/TestCurvatures.tcl diff --git a/Graphics/Testing/Tcl/TestDiscreteMarchingCubes.tcl b/Filters/General/Testing/Tcl/TestDiscreteMarchingCubes.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestDiscreteMarchingCubes.tcl rename to Filters/General/Testing/Tcl/TestDiscreteMarchingCubes.tcl diff --git a/Graphics/Testing/Tcl/TestGraphLayoutFilter.tcl b/Filters/General/Testing/Tcl/TestGraphLayoutFilter.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestGraphLayoutFilter.tcl rename to Filters/General/Testing/Tcl/TestGraphLayoutFilter.tcl diff --git a/Graphics/Testing/Tcl/TestMultiBlockStreamer.tcl b/Filters/General/Testing/Tcl/TestMultiBlockStreamer.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestMultiBlockStreamer.tcl rename to Filters/General/Testing/Tcl/TestMultiBlockStreamer.tcl diff --git a/Graphics/Testing/Tcl/TestRandomAttributeGenerator.tcl b/Filters/General/Testing/Tcl/TestRandomAttributeGenerator.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestRandomAttributeGenerator.tcl rename to Filters/General/Testing/Tcl/TestRandomAttributeGenerator.tcl diff --git a/Graphics/Testing/Tcl/TestRectilinearGridToTetrahedra.tcl b/Filters/General/Testing/Tcl/TestRectilinearGridToTetrahedra.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestRectilinearGridToTetrahedra.tcl rename to Filters/General/Testing/Tcl/TestRectilinearGridToTetrahedra.tcl diff --git a/Graphics/Testing/Tcl/TestSplineFilter.tcl b/Filters/General/Testing/Tcl/TestSplineFilter.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestSplineFilter.tcl rename to Filters/General/Testing/Tcl/TestSplineFilter.tcl diff --git a/Graphics/Testing/Tcl/WarpScalarImage.tcl b/Filters/General/Testing/Tcl/WarpScalarImage.tcl similarity index 100% rename from Graphics/Testing/Tcl/WarpScalarImage.tcl rename to Filters/General/Testing/Tcl/WarpScalarImage.tcl diff --git a/Graphics/Testing/Tcl/WarpToImage.tcl b/Filters/General/Testing/Tcl/WarpToImage.tcl similarity index 100% rename from Graphics/Testing/Tcl/WarpToImage.tcl rename to Filters/General/Testing/Tcl/WarpToImage.tcl diff --git a/Graphics/Testing/Tcl/WarpVectorImage.tcl b/Filters/General/Testing/Tcl/WarpVectorImage.tcl similarity index 100% rename from Graphics/Testing/Tcl/WarpVectorImage.tcl rename to Filters/General/Testing/Tcl/WarpVectorImage.tcl diff --git a/Graphics/Testing/Tcl/blankGrid.tcl b/Filters/General/Testing/Tcl/blankGrid.tcl similarity index 100% rename from Graphics/Testing/Tcl/blankGrid.tcl rename to Filters/General/Testing/Tcl/blankGrid.tcl diff --git a/Graphics/Testing/Tcl/clipComb.tcl b/Filters/General/Testing/Tcl/clipComb.tcl similarity index 100% rename from Graphics/Testing/Tcl/clipComb.tcl rename to Filters/General/Testing/Tcl/clipComb.tcl diff --git a/Hybrid/Testing/Tcl/clipHex.tcl b/Filters/General/Testing/Tcl/clipHex.tcl similarity index 100% rename from Hybrid/Testing/Tcl/clipHex.tcl rename to Filters/General/Testing/Tcl/clipHex.tcl diff --git a/Graphics/Testing/Tcl/clipImage.tcl b/Filters/General/Testing/Tcl/clipImage.tcl similarity index 100% rename from Graphics/Testing/Tcl/clipImage.tcl rename to Filters/General/Testing/Tcl/clipImage.tcl diff --git a/Hybrid/Testing/Tcl/clipPyramid.tcl b/Filters/General/Testing/Tcl/clipPyramid.tcl similarity index 100% rename from Hybrid/Testing/Tcl/clipPyramid.tcl rename to Filters/General/Testing/Tcl/clipPyramid.tcl diff --git a/Graphics/Testing/Tcl/clipQuadraticCells.tcl b/Filters/General/Testing/Tcl/clipQuadraticCells.tcl similarity index 100% rename from Graphics/Testing/Tcl/clipQuadraticCells.tcl rename to Filters/General/Testing/Tcl/clipQuadraticCells.tcl diff --git a/Hybrid/Testing/Tcl/clipTet.tcl b/Filters/General/Testing/Tcl/clipTet.tcl similarity index 100% rename from Hybrid/Testing/Tcl/clipTet.tcl rename to Filters/General/Testing/Tcl/clipTet.tcl diff --git a/Graphics/Testing/Tcl/clipVolume.tcl b/Filters/General/Testing/Tcl/clipVolume.tcl similarity index 100% rename from Graphics/Testing/Tcl/clipVolume.tcl rename to Filters/General/Testing/Tcl/clipVolume.tcl diff --git a/Graphics/Testing/Tcl/clipVolume2.tcl b/Filters/General/Testing/Tcl/clipVolume2.tcl similarity index 100% rename from Graphics/Testing/Tcl/clipVolume2.tcl rename to Filters/General/Testing/Tcl/clipVolume2.tcl diff --git a/Graphics/Testing/Tcl/clipVolume3.tcl b/Filters/General/Testing/Tcl/clipVolume3.tcl similarity index 100% rename from Graphics/Testing/Tcl/clipVolume3.tcl rename to Filters/General/Testing/Tcl/clipVolume3.tcl diff --git a/Hybrid/Testing/Tcl/clipWedge.tcl b/Filters/General/Testing/Tcl/clipWedge.tcl similarity index 100% rename from Hybrid/Testing/Tcl/clipWedge.tcl rename to Filters/General/Testing/Tcl/clipWedge.tcl diff --git a/Graphics/Testing/Tcl/contoursToSurface.tcl b/Filters/General/Testing/Tcl/contoursToSurface.tcl similarity index 100% rename from Graphics/Testing/Tcl/contoursToSurface.tcl rename to Filters/General/Testing/Tcl/contoursToSurface.tcl diff --git a/Graphics/Testing/Tcl/cursor2D.tcl b/Filters/General/Testing/Tcl/cursor2D.tcl similarity index 100% rename from Graphics/Testing/Tcl/cursor2D.tcl rename to Filters/General/Testing/Tcl/cursor2D.tcl diff --git a/Graphics/Testing/Tcl/cursor3D.tcl b/Filters/General/Testing/Tcl/cursor3D.tcl similarity index 100% rename from Graphics/Testing/Tcl/cursor3D.tcl rename to Filters/General/Testing/Tcl/cursor3D.tcl diff --git a/Graphics/Testing/Tcl/dicer.tcl b/Filters/General/Testing/Tcl/dicer.tcl similarity index 100% rename from Graphics/Testing/Tcl/dicer.tcl rename to Filters/General/Testing/Tcl/dicer.tcl diff --git a/Graphics/Testing/Tcl/edgePoints.tcl b/Filters/General/Testing/Tcl/edgePoints.tcl similarity index 100% rename from Graphics/Testing/Tcl/edgePoints.tcl rename to Filters/General/Testing/Tcl/edgePoints.tcl diff --git a/Graphics/Testing/Tcl/genHead.tcl b/Filters/General/Testing/Tcl/genHead.tcl similarity index 100% rename from Graphics/Testing/Tcl/genHead.tcl rename to Filters/General/Testing/Tcl/genHead.tcl diff --git a/Graphics/Testing/Tcl/mcubes.tcl b/Filters/General/Testing/Tcl/mcubes.tcl similarity index 100% rename from Graphics/Testing/Tcl/mcubes.tcl rename to Filters/General/Testing/Tcl/mcubes.tcl diff --git a/Graphics/Testing/Tcl/recursiveDC.tcl b/Filters/General/Testing/Tcl/recursiveDC.tcl similarity index 100% rename from Graphics/Testing/Tcl/recursiveDC.tcl rename to Filters/General/Testing/Tcl/recursiveDC.tcl diff --git a/Graphics/Testing/Tcl/spatialRepAll.tcl b/Filters/General/Testing/Tcl/spatialRepAll.tcl similarity index 100% rename from Graphics/Testing/Tcl/spatialRepAll.tcl rename to Filters/General/Testing/Tcl/spatialRepAll.tcl diff --git a/Graphics/Testing/Tcl/splitVectors.tcl b/Filters/General/Testing/Tcl/splitVectors.tcl similarity index 100% rename from Graphics/Testing/Tcl/splitVectors.tcl rename to Filters/General/Testing/Tcl/splitVectors.tcl diff --git a/Graphics/Testing/Tcl/streamTracer.tcl b/Filters/General/Testing/Tcl/streamTracer.tcl similarity index 100% rename from Graphics/Testing/Tcl/streamTracer.tcl rename to Filters/General/Testing/Tcl/streamTracer.tcl diff --git a/Graphics/Testing/Tcl/subPixelPositionMin.tcl b/Filters/General/Testing/Tcl/subPixelPositionMin.tcl similarity index 100% rename from Graphics/Testing/Tcl/subPixelPositionMin.tcl rename to Filters/General/Testing/Tcl/subPixelPositionMin.tcl diff --git a/Graphics/Testing/Tcl/testDataSetTriangleFilter.tcl b/Filters/General/Testing/Tcl/testDataSetTriangleFilter.tcl similarity index 100% rename from Graphics/Testing/Tcl/testDataSetTriangleFilter.tcl rename to Filters/General/Testing/Tcl/testDataSetTriangleFilter.tcl diff --git a/Graphics/Testing/Tcl/testDataSetTriangleFilter2.tcl b/Filters/General/Testing/Tcl/testDataSetTriangleFilter2.tcl similarity index 100% rename from Graphics/Testing/Tcl/testDataSetTriangleFilter2.tcl rename to Filters/General/Testing/Tcl/testDataSetTriangleFilter2.tcl diff --git a/Graphics/Testing/Tcl/testReflect.tcl b/Filters/General/Testing/Tcl/testReflect.tcl similarity index 100% rename from Graphics/Testing/Tcl/testReflect.tcl rename to Filters/General/Testing/Tcl/testReflect.tcl diff --git a/Graphics/Testing/Tcl/warplens.tcl b/Filters/General/Testing/Tcl/warplens.tcl similarity index 100% rename from Graphics/Testing/Tcl/warplens.tcl rename to Filters/General/Testing/Tcl/warplens.tcl diff --git a/Graphics/vtkAnnotationLink.cxx b/Filters/General/vtkAnnotationLink.cxx similarity index 100% rename from Graphics/vtkAnnotationLink.cxx rename to Filters/General/vtkAnnotationLink.cxx diff --git a/Graphics/vtkAnnotationLink.h b/Filters/General/vtkAnnotationLink.h similarity index 100% rename from Graphics/vtkAnnotationLink.h rename to Filters/General/vtkAnnotationLink.h diff --git a/Graphics/vtkAppendCompositeDataLeaves.cxx b/Filters/General/vtkAppendCompositeDataLeaves.cxx similarity index 100% rename from Graphics/vtkAppendCompositeDataLeaves.cxx rename to Filters/General/vtkAppendCompositeDataLeaves.cxx diff --git a/Graphics/vtkAppendCompositeDataLeaves.h b/Filters/General/vtkAppendCompositeDataLeaves.h similarity index 100% rename from Graphics/vtkAppendCompositeDataLeaves.h rename to Filters/General/vtkAppendCompositeDataLeaves.h diff --git a/Infovis/vtkAppendPoints.cxx b/Filters/General/vtkAppendPoints.cxx similarity index 100% rename from Infovis/vtkAppendPoints.cxx rename to Filters/General/vtkAppendPoints.cxx diff --git a/Infovis/vtkAppendPoints.h b/Filters/General/vtkAppendPoints.h similarity index 100% rename from Infovis/vtkAppendPoints.h rename to Filters/General/vtkAppendPoints.h diff --git a/Graphics/vtkApproximatingSubdivisionFilter.cxx b/Filters/General/vtkApproximatingSubdivisionFilter.cxx similarity index 100% rename from Graphics/vtkApproximatingSubdivisionFilter.cxx rename to Filters/General/vtkApproximatingSubdivisionFilter.cxx diff --git a/Graphics/vtkApproximatingSubdivisionFilter.h b/Filters/General/vtkApproximatingSubdivisionFilter.h similarity index 100% rename from Graphics/vtkApproximatingSubdivisionFilter.h rename to Filters/General/vtkApproximatingSubdivisionFilter.h diff --git a/Graphics/vtkAreaContourSpectrumFilter.cxx b/Filters/General/vtkAreaContourSpectrumFilter.cxx similarity index 100% rename from Graphics/vtkAreaContourSpectrumFilter.cxx rename to Filters/General/vtkAreaContourSpectrumFilter.cxx diff --git a/Graphics/vtkAreaContourSpectrumFilter.h b/Filters/General/vtkAreaContourSpectrumFilter.h similarity index 100% rename from Graphics/vtkAreaContourSpectrumFilter.h rename to Filters/General/vtkAreaContourSpectrumFilter.h diff --git a/Graphics/vtkAxes.cxx b/Filters/General/vtkAxes.cxx similarity index 100% rename from Graphics/vtkAxes.cxx rename to Filters/General/vtkAxes.cxx diff --git a/Graphics/vtkAxes.h b/Filters/General/vtkAxes.h similarity index 100% rename from Graphics/vtkAxes.h rename to Filters/General/vtkAxes.h diff --git a/Graphics/vtkBlankStructuredGrid.cxx b/Filters/General/vtkBlankStructuredGrid.cxx similarity index 100% rename from Graphics/vtkBlankStructuredGrid.cxx rename to Filters/General/vtkBlankStructuredGrid.cxx diff --git a/Graphics/vtkBlankStructuredGrid.h b/Filters/General/vtkBlankStructuredGrid.h similarity index 100% rename from Graphics/vtkBlankStructuredGrid.h rename to Filters/General/vtkBlankStructuredGrid.h diff --git a/Graphics/vtkBlankStructuredGridWithImage.cxx b/Filters/General/vtkBlankStructuredGridWithImage.cxx similarity index 100% rename from Graphics/vtkBlankStructuredGridWithImage.cxx rename to Filters/General/vtkBlankStructuredGridWithImage.cxx diff --git a/Graphics/vtkBlankStructuredGridWithImage.h b/Filters/General/vtkBlankStructuredGridWithImage.h similarity index 100% rename from Graphics/vtkBlankStructuredGridWithImage.h rename to Filters/General/vtkBlankStructuredGridWithImage.h diff --git a/Graphics/vtkBlockIdScalars.cxx b/Filters/General/vtkBlockIdScalars.cxx similarity index 100% rename from Graphics/vtkBlockIdScalars.cxx rename to Filters/General/vtkBlockIdScalars.cxx diff --git a/Graphics/vtkBlockIdScalars.h b/Filters/General/vtkBlockIdScalars.h similarity index 100% rename from Graphics/vtkBlockIdScalars.h rename to Filters/General/vtkBlockIdScalars.h diff --git a/Graphics/vtkBooleanOperationPolyDataFilter.cxx b/Filters/General/vtkBooleanOperationPolyDataFilter.cxx similarity index 100% rename from Graphics/vtkBooleanOperationPolyDataFilter.cxx rename to Filters/General/vtkBooleanOperationPolyDataFilter.cxx diff --git a/Graphics/vtkBooleanOperationPolyDataFilter.h b/Filters/General/vtkBooleanOperationPolyDataFilter.h similarity index 100% rename from Graphics/vtkBooleanOperationPolyDataFilter.h rename to Filters/General/vtkBooleanOperationPolyDataFilter.h diff --git a/Graphics/vtkBoxClipDataSet.cxx b/Filters/General/vtkBoxClipDataSet.cxx similarity index 100% rename from Graphics/vtkBoxClipDataSet.cxx rename to Filters/General/vtkBoxClipDataSet.cxx diff --git a/Graphics/vtkBoxClipDataSet.h b/Filters/General/vtkBoxClipDataSet.h similarity index 100% rename from Graphics/vtkBoxClipDataSet.h rename to Filters/General/vtkBoxClipDataSet.h diff --git a/Graphics/vtkBrownianPoints.cxx b/Filters/General/vtkBrownianPoints.cxx similarity index 100% rename from Graphics/vtkBrownianPoints.cxx rename to Filters/General/vtkBrownianPoints.cxx diff --git a/Graphics/vtkBrownianPoints.h b/Filters/General/vtkBrownianPoints.h similarity index 100% rename from Graphics/vtkBrownianPoints.h rename to Filters/General/vtkBrownianPoints.h diff --git a/Graphics/vtkCellCenters.cxx b/Filters/General/vtkCellCenters.cxx similarity index 100% rename from Graphics/vtkCellCenters.cxx rename to Filters/General/vtkCellCenters.cxx diff --git a/Graphics/vtkCellCenters.h b/Filters/General/vtkCellCenters.h similarity index 100% rename from Graphics/vtkCellCenters.h rename to Filters/General/vtkCellCenters.h diff --git a/Graphics/vtkCellDerivatives.cxx b/Filters/General/vtkCellDerivatives.cxx similarity index 100% rename from Graphics/vtkCellDerivatives.cxx rename to Filters/General/vtkCellDerivatives.cxx diff --git a/Graphics/vtkCellDerivatives.h b/Filters/General/vtkCellDerivatives.h similarity index 100% rename from Graphics/vtkCellDerivatives.h rename to Filters/General/vtkCellDerivatives.h diff --git a/Graphics/vtkCellLocatorInterpolatedVelocityField.cxx b/Filters/General/vtkCellLocatorInterpolatedVelocityField.cxx similarity index 100% rename from Graphics/vtkCellLocatorInterpolatedVelocityField.cxx rename to Filters/General/vtkCellLocatorInterpolatedVelocityField.cxx diff --git a/Graphics/vtkCellLocatorInterpolatedVelocityField.h b/Filters/General/vtkCellLocatorInterpolatedVelocityField.h similarity index 100% rename from Graphics/vtkCellLocatorInterpolatedVelocityField.h rename to Filters/General/vtkCellLocatorInterpolatedVelocityField.h diff --git a/Filtering/vtkCellTreeLocator.cxx b/Filters/General/vtkCellTreeLocator.cxx similarity index 100% rename from Filtering/vtkCellTreeLocator.cxx rename to Filters/General/vtkCellTreeLocator.cxx diff --git a/Filtering/vtkCellTreeLocator.h b/Filters/General/vtkCellTreeLocator.h similarity index 100% rename from Filtering/vtkCellTreeLocator.h rename to Filters/General/vtkCellTreeLocator.h diff --git a/Graphics/vtkClipClosedSurface.cxx b/Filters/General/vtkClipClosedSurface.cxx similarity index 100% rename from Graphics/vtkClipClosedSurface.cxx rename to Filters/General/vtkClipClosedSurface.cxx diff --git a/Graphics/vtkClipClosedSurface.h b/Filters/General/vtkClipClosedSurface.h similarity index 100% rename from Graphics/vtkClipClosedSurface.h rename to Filters/General/vtkClipClosedSurface.h diff --git a/Graphics/vtkClipConvexPolyData.cxx b/Filters/General/vtkClipConvexPolyData.cxx similarity index 100% rename from Graphics/vtkClipConvexPolyData.cxx rename to Filters/General/vtkClipConvexPolyData.cxx diff --git a/Graphics/vtkClipConvexPolyData.h b/Filters/General/vtkClipConvexPolyData.h similarity index 100% rename from Graphics/vtkClipConvexPolyData.h rename to Filters/General/vtkClipConvexPolyData.h diff --git a/Graphics/vtkClipDataSet.cxx b/Filters/General/vtkClipDataSet.cxx similarity index 100% rename from Graphics/vtkClipDataSet.cxx rename to Filters/General/vtkClipDataSet.cxx diff --git a/Graphics/vtkClipDataSet.h b/Filters/General/vtkClipDataSet.h similarity index 100% rename from Graphics/vtkClipDataSet.h rename to Filters/General/vtkClipDataSet.h diff --git a/Graphics/vtkClipVolume.cxx b/Filters/General/vtkClipVolume.cxx similarity index 100% rename from Graphics/vtkClipVolume.cxx rename to Filters/General/vtkClipVolume.cxx diff --git a/Graphics/vtkClipVolume.h b/Filters/General/vtkClipVolume.h similarity index 100% rename from Graphics/vtkClipVolume.h rename to Filters/General/vtkClipVolume.h diff --git a/Graphics/vtkCoincidentPoints.cxx b/Filters/General/vtkCoincidentPoints.cxx similarity index 100% rename from Graphics/vtkCoincidentPoints.cxx rename to Filters/General/vtkCoincidentPoints.cxx diff --git a/Graphics/vtkCoincidentPoints.h b/Filters/General/vtkCoincidentPoints.h similarity index 100% rename from Graphics/vtkCoincidentPoints.h rename to Filters/General/vtkCoincidentPoints.h diff --git a/Graphics/vtkCursor2D.cxx b/Filters/General/vtkCursor2D.cxx similarity index 100% rename from Graphics/vtkCursor2D.cxx rename to Filters/General/vtkCursor2D.cxx diff --git a/Graphics/vtkCursor2D.h b/Filters/General/vtkCursor2D.h similarity index 100% rename from Graphics/vtkCursor2D.h rename to Filters/General/vtkCursor2D.h diff --git a/Graphics/vtkCursor3D.cxx b/Filters/General/vtkCursor3D.cxx similarity index 100% rename from Graphics/vtkCursor3D.cxx rename to Filters/General/vtkCursor3D.cxx diff --git a/Graphics/vtkCursor3D.h b/Filters/General/vtkCursor3D.h similarity index 100% rename from Graphics/vtkCursor3D.h rename to Filters/General/vtkCursor3D.h diff --git a/Graphics/vtkCurvatures.cxx b/Filters/General/vtkCurvatures.cxx similarity index 100% rename from Graphics/vtkCurvatures.cxx rename to Filters/General/vtkCurvatures.cxx diff --git a/Graphics/vtkCurvatures.h b/Filters/General/vtkCurvatures.h similarity index 100% rename from Graphics/vtkCurvatures.h rename to Filters/General/vtkCurvatures.h diff --git a/Graphics/vtkDashedStreamLine.cxx b/Filters/General/vtkDashedStreamLine.cxx similarity index 100% rename from Graphics/vtkDashedStreamLine.cxx rename to Filters/General/vtkDashedStreamLine.cxx diff --git a/Graphics/vtkDashedStreamLine.h b/Filters/General/vtkDashedStreamLine.h similarity index 100% rename from Graphics/vtkDashedStreamLine.h rename to Filters/General/vtkDashedStreamLine.h diff --git a/Graphics/vtkDataSetGradient.cxx b/Filters/General/vtkDataSetGradient.cxx similarity index 100% rename from Graphics/vtkDataSetGradient.cxx rename to Filters/General/vtkDataSetGradient.cxx diff --git a/Graphics/vtkDataSetGradient.h b/Filters/General/vtkDataSetGradient.h similarity index 100% rename from Graphics/vtkDataSetGradient.h rename to Filters/General/vtkDataSetGradient.h diff --git a/Graphics/vtkDataSetGradientPrecompute.cxx b/Filters/General/vtkDataSetGradientPrecompute.cxx similarity index 100% rename from Graphics/vtkDataSetGradientPrecompute.cxx rename to Filters/General/vtkDataSetGradientPrecompute.cxx diff --git a/Graphics/vtkDataSetGradientPrecompute.h b/Filters/General/vtkDataSetGradientPrecompute.h similarity index 100% rename from Graphics/vtkDataSetGradientPrecompute.h rename to Filters/General/vtkDataSetGradientPrecompute.h diff --git a/Graphics/vtkDataSetTriangleFilter.cxx b/Filters/General/vtkDataSetTriangleFilter.cxx similarity index 100% rename from Graphics/vtkDataSetTriangleFilter.cxx rename to Filters/General/vtkDataSetTriangleFilter.cxx diff --git a/Graphics/vtkDataSetTriangleFilter.h b/Filters/General/vtkDataSetTriangleFilter.h similarity index 100% rename from Graphics/vtkDataSetTriangleFilter.h rename to Filters/General/vtkDataSetTriangleFilter.h diff --git a/Graphics/vtkDensifyPolyData.cxx b/Filters/General/vtkDensifyPolyData.cxx similarity index 100% rename from Graphics/vtkDensifyPolyData.cxx rename to Filters/General/vtkDensifyPolyData.cxx diff --git a/Graphics/vtkDensifyPolyData.h b/Filters/General/vtkDensifyPolyData.h similarity index 100% rename from Graphics/vtkDensifyPolyData.h rename to Filters/General/vtkDensifyPolyData.h diff --git a/Graphics/vtkDicer.cxx b/Filters/General/vtkDicer.cxx similarity index 100% rename from Graphics/vtkDicer.cxx rename to Filters/General/vtkDicer.cxx diff --git a/Graphics/vtkDicer.h b/Filters/General/vtkDicer.h similarity index 100% rename from Graphics/vtkDicer.h rename to Filters/General/vtkDicer.h diff --git a/Graphics/vtkDiscreteMarchingCubes.cxx b/Filters/General/vtkDiscreteMarchingCubes.cxx similarity index 100% rename from Graphics/vtkDiscreteMarchingCubes.cxx rename to Filters/General/vtkDiscreteMarchingCubes.cxx diff --git a/Graphics/vtkDiscreteMarchingCubes.h b/Filters/General/vtkDiscreteMarchingCubes.h similarity index 100% rename from Graphics/vtkDiscreteMarchingCubes.h rename to Filters/General/vtkDiscreteMarchingCubes.h diff --git a/Graphics/vtkDistancePolyDataFilter.cxx b/Filters/General/vtkDistancePolyDataFilter.cxx similarity index 100% rename from Graphics/vtkDistancePolyDataFilter.cxx rename to Filters/General/vtkDistancePolyDataFilter.cxx diff --git a/Graphics/vtkDistancePolyDataFilter.h b/Filters/General/vtkDistancePolyDataFilter.h similarity index 100% rename from Graphics/vtkDistancePolyDataFilter.h rename to Filters/General/vtkDistancePolyDataFilter.h diff --git a/Graphics/vtkEdgePoints.cxx b/Filters/General/vtkEdgePoints.cxx similarity index 100% rename from Graphics/vtkEdgePoints.cxx rename to Filters/General/vtkEdgePoints.cxx diff --git a/Graphics/vtkEdgePoints.h b/Filters/General/vtkEdgePoints.h similarity index 100% rename from Graphics/vtkEdgePoints.h rename to Filters/General/vtkEdgePoints.h diff --git a/Infovis/vtkExtractArray.cxx b/Filters/General/vtkExtractArray.cxx similarity index 100% rename from Infovis/vtkExtractArray.cxx rename to Filters/General/vtkExtractArray.cxx diff --git a/Infovis/vtkExtractArray.h b/Filters/General/vtkExtractArray.h similarity index 100% rename from Infovis/vtkExtractArray.h rename to Filters/General/vtkExtractArray.h diff --git a/Graphics/vtkGradientFilter.cxx b/Filters/General/vtkGradientFilter.cxx similarity index 100% rename from Graphics/vtkGradientFilter.cxx rename to Filters/General/vtkGradientFilter.cxx diff --git a/Graphics/vtkGradientFilter.h b/Filters/General/vtkGradientFilter.h similarity index 100% rename from Graphics/vtkGradientFilter.h rename to Filters/General/vtkGradientFilter.h diff --git a/Graphics/vtkGraphLayoutFilter.cxx b/Filters/General/vtkGraphLayoutFilter.cxx similarity index 100% rename from Graphics/vtkGraphLayoutFilter.cxx rename to Filters/General/vtkGraphLayoutFilter.cxx diff --git a/Graphics/vtkGraphLayoutFilter.h b/Filters/General/vtkGraphLayoutFilter.h similarity index 100% rename from Graphics/vtkGraphLayoutFilter.h rename to Filters/General/vtkGraphLayoutFilter.h diff --git a/Graphics/vtkGraphToPoints.cxx b/Filters/General/vtkGraphToPoints.cxx similarity index 100% rename from Graphics/vtkGraphToPoints.cxx rename to Filters/General/vtkGraphToPoints.cxx diff --git a/Graphics/vtkGraphToPoints.h b/Filters/General/vtkGraphToPoints.h similarity index 100% rename from Graphics/vtkGraphToPoints.h rename to Filters/General/vtkGraphToPoints.h diff --git a/Filtering/vtkGraphWeightEuclideanDistanceFilter.cxx b/Filters/General/vtkGraphWeightEuclideanDistanceFilter.cxx similarity index 100% rename from Filtering/vtkGraphWeightEuclideanDistanceFilter.cxx rename to Filters/General/vtkGraphWeightEuclideanDistanceFilter.cxx diff --git a/Filtering/vtkGraphWeightEuclideanDistanceFilter.h b/Filters/General/vtkGraphWeightEuclideanDistanceFilter.h similarity index 100% rename from Filtering/vtkGraphWeightEuclideanDistanceFilter.h rename to Filters/General/vtkGraphWeightEuclideanDistanceFilter.h diff --git a/Filtering/vtkGraphWeightFilter.cxx b/Filters/General/vtkGraphWeightFilter.cxx similarity index 100% rename from Filtering/vtkGraphWeightFilter.cxx rename to Filters/General/vtkGraphWeightFilter.cxx diff --git a/Filtering/vtkGraphWeightFilter.h b/Filters/General/vtkGraphWeightFilter.h similarity index 100% rename from Filtering/vtkGraphWeightFilter.h rename to Filters/General/vtkGraphWeightFilter.h diff --git a/Graphics/vtkHierarchicalDataLevelFilter.cxx b/Filters/General/vtkHierarchicalDataLevelFilter.cxx similarity index 100% rename from Graphics/vtkHierarchicalDataLevelFilter.cxx rename to Filters/General/vtkHierarchicalDataLevelFilter.cxx diff --git a/Graphics/vtkHierarchicalDataLevelFilter.h b/Filters/General/vtkHierarchicalDataLevelFilter.h similarity index 100% rename from Graphics/vtkHierarchicalDataLevelFilter.h rename to Filters/General/vtkHierarchicalDataLevelFilter.h diff --git a/Graphics/vtkHyperStreamline.cxx b/Filters/General/vtkHyperStreamline.cxx similarity index 100% rename from Graphics/vtkHyperStreamline.cxx rename to Filters/General/vtkHyperStreamline.cxx diff --git a/Graphics/vtkHyperStreamline.h b/Filters/General/vtkHyperStreamline.h similarity index 100% rename from Graphics/vtkHyperStreamline.h rename to Filters/General/vtkHyperStreamline.h diff --git a/Graphics/vtkIconGlyphFilter.cxx b/Filters/General/vtkIconGlyphFilter.cxx similarity index 100% rename from Graphics/vtkIconGlyphFilter.cxx rename to Filters/General/vtkIconGlyphFilter.cxx diff --git a/Graphics/vtkIconGlyphFilter.h b/Filters/General/vtkIconGlyphFilter.h similarity index 100% rename from Graphics/vtkIconGlyphFilter.h rename to Filters/General/vtkIconGlyphFilter.h diff --git a/Graphics/vtkImageDataToPointSet.cxx b/Filters/General/vtkImageDataToPointSet.cxx similarity index 100% rename from Graphics/vtkImageDataToPointSet.cxx rename to Filters/General/vtkImageDataToPointSet.cxx diff --git a/Graphics/vtkImageDataToPointSet.h b/Filters/General/vtkImageDataToPointSet.h similarity index 100% rename from Graphics/vtkImageDataToPointSet.h rename to Filters/General/vtkImageDataToPointSet.h diff --git a/Graphics/vtkImageMarchingCubes.cxx b/Filters/General/vtkImageMarchingCubes.cxx similarity index 100% rename from Graphics/vtkImageMarchingCubes.cxx rename to Filters/General/vtkImageMarchingCubes.cxx diff --git a/Graphics/vtkImageMarchingCubes.h b/Filters/General/vtkImageMarchingCubes.h similarity index 100% rename from Graphics/vtkImageMarchingCubes.h rename to Filters/General/vtkImageMarchingCubes.h diff --git a/Graphics/vtkInterpolateDataSetAttributes.cxx b/Filters/General/vtkInterpolateDataSetAttributes.cxx similarity index 100% rename from Graphics/vtkInterpolateDataSetAttributes.cxx rename to Filters/General/vtkInterpolateDataSetAttributes.cxx diff --git a/Graphics/vtkInterpolateDataSetAttributes.h b/Filters/General/vtkInterpolateDataSetAttributes.h similarity index 100% rename from Graphics/vtkInterpolateDataSetAttributes.h rename to Filters/General/vtkInterpolateDataSetAttributes.h diff --git a/Graphics/vtkInterpolatingSubdivisionFilter.cxx b/Filters/General/vtkInterpolatingSubdivisionFilter.cxx similarity index 100% rename from Graphics/vtkInterpolatingSubdivisionFilter.cxx rename to Filters/General/vtkInterpolatingSubdivisionFilter.cxx diff --git a/Graphics/vtkInterpolatingSubdivisionFilter.h b/Filters/General/vtkInterpolatingSubdivisionFilter.h similarity index 100% rename from Graphics/vtkInterpolatingSubdivisionFilter.h rename to Filters/General/vtkInterpolatingSubdivisionFilter.h diff --git a/Graphics/vtkIntersectionPolyDataFilter.cxx b/Filters/General/vtkIntersectionPolyDataFilter.cxx similarity index 100% rename from Graphics/vtkIntersectionPolyDataFilter.cxx rename to Filters/General/vtkIntersectionPolyDataFilter.cxx diff --git a/Graphics/vtkIntersectionPolyDataFilter.h b/Filters/General/vtkIntersectionPolyDataFilter.h similarity index 100% rename from Graphics/vtkIntersectionPolyDataFilter.h rename to Filters/General/vtkIntersectionPolyDataFilter.h diff --git a/Graphics/vtkKdTreeSelector.cxx b/Filters/General/vtkKdTreeSelector.cxx similarity index 100% rename from Graphics/vtkKdTreeSelector.cxx rename to Filters/General/vtkKdTreeSelector.cxx diff --git a/Graphics/vtkKdTreeSelector.h b/Filters/General/vtkKdTreeSelector.h similarity index 100% rename from Graphics/vtkKdTreeSelector.h rename to Filters/General/vtkKdTreeSelector.h diff --git a/Graphics/vtkLevelIdScalars.cxx b/Filters/General/vtkLevelIdScalars.cxx similarity index 100% rename from Graphics/vtkLevelIdScalars.cxx rename to Filters/General/vtkLevelIdScalars.cxx diff --git a/Graphics/vtkLevelIdScalars.h b/Filters/General/vtkLevelIdScalars.h similarity index 100% rename from Graphics/vtkLevelIdScalars.h rename to Filters/General/vtkLevelIdScalars.h diff --git a/Graphics/vtkLinkEdgels.cxx b/Filters/General/vtkLinkEdgels.cxx similarity index 100% rename from Graphics/vtkLinkEdgels.cxx rename to Filters/General/vtkLinkEdgels.cxx diff --git a/Graphics/vtkLinkEdgels.h b/Filters/General/vtkLinkEdgels.h similarity index 100% rename from Graphics/vtkLinkEdgels.h rename to Filters/General/vtkLinkEdgels.h diff --git a/Graphics/vtkMarchingContourFilter.cxx b/Filters/General/vtkMarchingContourFilter.cxx similarity index 100% rename from Graphics/vtkMarchingContourFilter.cxx rename to Filters/General/vtkMarchingContourFilter.cxx diff --git a/Graphics/vtkMarchingContourFilter.h b/Filters/General/vtkMarchingContourFilter.h similarity index 100% rename from Graphics/vtkMarchingContourFilter.h rename to Filters/General/vtkMarchingContourFilter.h diff --git a/Infovis/vtkMatricizeArray.cxx b/Filters/General/vtkMatricizeArray.cxx similarity index 100% rename from Infovis/vtkMatricizeArray.cxx rename to Filters/General/vtkMatricizeArray.cxx diff --git a/Infovis/vtkMatricizeArray.h b/Filters/General/vtkMatricizeArray.h similarity index 100% rename from Infovis/vtkMatricizeArray.h rename to Filters/General/vtkMatricizeArray.h diff --git a/Graphics/vtkMergeCells.cxx b/Filters/General/vtkMergeCells.cxx similarity index 100% rename from Graphics/vtkMergeCells.cxx rename to Filters/General/vtkMergeCells.cxx diff --git a/Graphics/vtkMergeCells.h b/Filters/General/vtkMergeCells.h similarity index 100% rename from Graphics/vtkMergeCells.h rename to Filters/General/vtkMergeCells.h diff --git a/Graphics/vtkModelMetadata.cxx b/Filters/General/vtkModelMetadata.cxx similarity index 100% rename from Graphics/vtkModelMetadata.cxx rename to Filters/General/vtkModelMetadata.cxx diff --git a/Graphics/vtkModelMetadata.h b/Filters/General/vtkModelMetadata.h similarity index 100% rename from Graphics/vtkModelMetadata.h rename to Filters/General/vtkModelMetadata.h diff --git a/Graphics/vtkModifiedBSPTree.cxx b/Filters/General/vtkModifiedBSPTree.cxx similarity index 100% rename from Graphics/vtkModifiedBSPTree.cxx rename to Filters/General/vtkModifiedBSPTree.cxx diff --git a/Graphics/vtkModifiedBSPTree.h b/Filters/General/vtkModifiedBSPTree.h similarity index 100% rename from Graphics/vtkModifiedBSPTree.h rename to Filters/General/vtkModifiedBSPTree.h diff --git a/Graphics/vtkMultiBlockDataGroupFilter.cxx b/Filters/General/vtkMultiBlockDataGroupFilter.cxx similarity index 100% rename from Graphics/vtkMultiBlockDataGroupFilter.cxx rename to Filters/General/vtkMultiBlockDataGroupFilter.cxx diff --git a/Graphics/vtkMultiBlockDataGroupFilter.h b/Filters/General/vtkMultiBlockDataGroupFilter.h similarity index 100% rename from Graphics/vtkMultiBlockDataGroupFilter.h rename to Filters/General/vtkMultiBlockDataGroupFilter.h diff --git a/Graphics/vtkMultiBlockMergeFilter.cxx b/Filters/General/vtkMultiBlockMergeFilter.cxx similarity index 100% rename from Graphics/vtkMultiBlockMergeFilter.cxx rename to Filters/General/vtkMultiBlockMergeFilter.cxx diff --git a/Graphics/vtkMultiBlockMergeFilter.h b/Filters/General/vtkMultiBlockMergeFilter.h similarity index 100% rename from Graphics/vtkMultiBlockMergeFilter.h rename to Filters/General/vtkMultiBlockMergeFilter.h diff --git a/Graphics/vtkMultiThreshold.cxx b/Filters/General/vtkMultiThreshold.cxx similarity index 100% rename from Graphics/vtkMultiThreshold.cxx rename to Filters/General/vtkMultiThreshold.cxx diff --git a/Graphics/vtkMultiThreshold.h b/Filters/General/vtkMultiThreshold.h similarity index 100% rename from Graphics/vtkMultiThreshold.h rename to Filters/General/vtkMultiThreshold.h diff --git a/Filtering/vtkNonOverlappingAMRAlgorithm.cxx b/Filters/General/vtkNonOverlappingAMRAlgorithm.cxx similarity index 100% rename from Filtering/vtkNonOverlappingAMRAlgorithm.cxx rename to Filters/General/vtkNonOverlappingAMRAlgorithm.cxx diff --git a/Filtering/vtkNonOverlappingAMRAlgorithm.h b/Filters/General/vtkNonOverlappingAMRAlgorithm.h similarity index 100% rename from Filtering/vtkNonOverlappingAMRAlgorithm.h rename to Filters/General/vtkNonOverlappingAMRAlgorithm.h diff --git a/Graphics/vtkNonOverlappingAMRLevelIdScalars.cxx b/Filters/General/vtkNonOverlappingAMRLevelIdScalars.cxx similarity index 100% rename from Graphics/vtkNonOverlappingAMRLevelIdScalars.cxx rename to Filters/General/vtkNonOverlappingAMRLevelIdScalars.cxx diff --git a/Graphics/vtkNonOverlappingAMRLevelIdScalars.h b/Filters/General/vtkNonOverlappingAMRLevelIdScalars.h similarity index 100% rename from Graphics/vtkNonOverlappingAMRLevelIdScalars.h rename to Filters/General/vtkNonOverlappingAMRLevelIdScalars.h diff --git a/Infovis/vtkNormalizeMatrixVectors.cxx b/Filters/General/vtkNormalizeMatrixVectors.cxx similarity index 100% rename from Infovis/vtkNormalizeMatrixVectors.cxx rename to Filters/General/vtkNormalizeMatrixVectors.cxx diff --git a/Infovis/vtkNormalizeMatrixVectors.h b/Filters/General/vtkNormalizeMatrixVectors.h similarity index 100% rename from Infovis/vtkNormalizeMatrixVectors.h rename to Filters/General/vtkNormalizeMatrixVectors.h diff --git a/Graphics/vtkOBBDicer.cxx b/Filters/General/vtkOBBDicer.cxx similarity index 100% rename from Graphics/vtkOBBDicer.cxx rename to Filters/General/vtkOBBDicer.cxx diff --git a/Graphics/vtkOBBDicer.h b/Filters/General/vtkOBBDicer.h similarity index 100% rename from Graphics/vtkOBBDicer.h rename to Filters/General/vtkOBBDicer.h diff --git a/Graphics/vtkOBBTree.cxx b/Filters/General/vtkOBBTree.cxx similarity index 100% rename from Graphics/vtkOBBTree.cxx rename to Filters/General/vtkOBBTree.cxx diff --git a/Graphics/vtkOBBTree.h b/Filters/General/vtkOBBTree.h similarity index 100% rename from Graphics/vtkOBBTree.h rename to Filters/General/vtkOBBTree.h diff --git a/Graphics/vtkOutlineCornerFilter.cxx b/Filters/General/vtkOutlineCornerFilter.cxx similarity index 100% rename from Graphics/vtkOutlineCornerFilter.cxx rename to Filters/General/vtkOutlineCornerFilter.cxx diff --git a/Graphics/vtkOutlineCornerFilter.h b/Filters/General/vtkOutlineCornerFilter.h similarity index 100% rename from Graphics/vtkOutlineCornerFilter.h rename to Filters/General/vtkOutlineCornerFilter.h diff --git a/Filtering/vtkOverlappingAMRAlgorithm.cxx b/Filters/General/vtkOverlappingAMRAlgorithm.cxx similarity index 100% rename from Filtering/vtkOverlappingAMRAlgorithm.cxx rename to Filters/General/vtkOverlappingAMRAlgorithm.cxx diff --git a/Filtering/vtkOverlappingAMRAlgorithm.h b/Filters/General/vtkOverlappingAMRAlgorithm.h similarity index 100% rename from Filtering/vtkOverlappingAMRAlgorithm.h rename to Filters/General/vtkOverlappingAMRAlgorithm.h diff --git a/Graphics/vtkOverlappingAMRLevelIdScalars.cxx b/Filters/General/vtkOverlappingAMRLevelIdScalars.cxx similarity index 100% rename from Graphics/vtkOverlappingAMRLevelIdScalars.cxx rename to Filters/General/vtkOverlappingAMRLevelIdScalars.cxx diff --git a/Graphics/vtkOverlappingAMRLevelIdScalars.h b/Filters/General/vtkOverlappingAMRLevelIdScalars.h similarity index 100% rename from Graphics/vtkOverlappingAMRLevelIdScalars.h rename to Filters/General/vtkOverlappingAMRLevelIdScalars.h diff --git a/Infovis/vtkPassArrays.cxx b/Filters/General/vtkPassArrays.cxx similarity index 100% rename from Infovis/vtkPassArrays.cxx rename to Filters/General/vtkPassArrays.cxx diff --git a/Infovis/vtkPassArrays.h b/Filters/General/vtkPassArrays.h similarity index 100% rename from Infovis/vtkPassArrays.h rename to Filters/General/vtkPassArrays.h diff --git a/Infovis/vtkPassThrough.cxx b/Filters/General/vtkPassThrough.cxx similarity index 100% rename from Infovis/vtkPassThrough.cxx rename to Filters/General/vtkPassThrough.cxx diff --git a/Infovis/vtkPassThrough.h b/Filters/General/vtkPassThrough.h similarity index 100% rename from Infovis/vtkPassThrough.h rename to Filters/General/vtkPassThrough.h diff --git a/Graphics/vtkPolyDataStreamer.cxx b/Filters/General/vtkPolyDataStreamer.cxx similarity index 100% rename from Graphics/vtkPolyDataStreamer.cxx rename to Filters/General/vtkPolyDataStreamer.cxx diff --git a/Graphics/vtkPolyDataStreamer.h b/Filters/General/vtkPolyDataStreamer.h similarity index 100% rename from Graphics/vtkPolyDataStreamer.h rename to Filters/General/vtkPolyDataStreamer.h diff --git a/Graphics/vtkPolyDataToReebGraphFilter.cxx b/Filters/General/vtkPolyDataToReebGraphFilter.cxx similarity index 100% rename from Graphics/vtkPolyDataToReebGraphFilter.cxx rename to Filters/General/vtkPolyDataToReebGraphFilter.cxx diff --git a/Graphics/vtkPolyDataToReebGraphFilter.h b/Filters/General/vtkPolyDataToReebGraphFilter.h similarity index 100% rename from Graphics/vtkPolyDataToReebGraphFilter.h rename to Filters/General/vtkPolyDataToReebGraphFilter.h diff --git a/Graphics/vtkProbePolyhedron.cxx b/Filters/General/vtkProbePolyhedron.cxx similarity index 100% rename from Graphics/vtkProbePolyhedron.cxx rename to Filters/General/vtkProbePolyhedron.cxx diff --git a/Graphics/vtkProbePolyhedron.h b/Filters/General/vtkProbePolyhedron.h similarity index 100% rename from Graphics/vtkProbePolyhedron.h rename to Filters/General/vtkProbePolyhedron.h diff --git a/Graphics/vtkQuadraturePointInterpolator.cxx b/Filters/General/vtkQuadraturePointInterpolator.cxx similarity index 100% rename from Graphics/vtkQuadraturePointInterpolator.cxx rename to Filters/General/vtkQuadraturePointInterpolator.cxx diff --git a/Graphics/vtkQuadraturePointInterpolator.h b/Filters/General/vtkQuadraturePointInterpolator.h similarity index 100% rename from Graphics/vtkQuadraturePointInterpolator.h rename to Filters/General/vtkQuadraturePointInterpolator.h diff --git a/Graphics/vtkQuadraturePointsGenerator.cxx b/Filters/General/vtkQuadraturePointsGenerator.cxx similarity index 100% rename from Graphics/vtkQuadraturePointsGenerator.cxx rename to Filters/General/vtkQuadraturePointsGenerator.cxx diff --git a/Graphics/vtkQuadraturePointsGenerator.h b/Filters/General/vtkQuadraturePointsGenerator.h similarity index 100% rename from Graphics/vtkQuadraturePointsGenerator.h rename to Filters/General/vtkQuadraturePointsGenerator.h diff --git a/Graphics/vtkQuadraturePointsUtilities.hxx b/Filters/General/vtkQuadraturePointsUtilities.hxx similarity index 100% rename from Graphics/vtkQuadraturePointsUtilities.hxx rename to Filters/General/vtkQuadraturePointsUtilities.hxx diff --git a/Graphics/vtkQuadratureSchemeDictionaryGenerator.cxx b/Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx similarity index 100% rename from Graphics/vtkQuadratureSchemeDictionaryGenerator.cxx rename to Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx diff --git a/Graphics/vtkQuadratureSchemeDictionaryGenerator.h b/Filters/General/vtkQuadratureSchemeDictionaryGenerator.h similarity index 100% rename from Graphics/vtkQuadratureSchemeDictionaryGenerator.h rename to Filters/General/vtkQuadratureSchemeDictionaryGenerator.h diff --git a/Graphics/vtkQuantizePolyDataPoints.cxx b/Filters/General/vtkQuantizePolyDataPoints.cxx similarity index 100% rename from Graphics/vtkQuantizePolyDataPoints.cxx rename to Filters/General/vtkQuantizePolyDataPoints.cxx diff --git a/Graphics/vtkQuantizePolyDataPoints.h b/Filters/General/vtkQuantizePolyDataPoints.h similarity index 100% rename from Graphics/vtkQuantizePolyDataPoints.h rename to Filters/General/vtkQuantizePolyDataPoints.h diff --git a/Graphics/vtkRandomAttributeGenerator.cxx b/Filters/General/vtkRandomAttributeGenerator.cxx similarity index 100% rename from Graphics/vtkRandomAttributeGenerator.cxx rename to Filters/General/vtkRandomAttributeGenerator.cxx diff --git a/Graphics/vtkRandomAttributeGenerator.h b/Filters/General/vtkRandomAttributeGenerator.h similarity index 100% rename from Graphics/vtkRandomAttributeGenerator.h rename to Filters/General/vtkRandomAttributeGenerator.h diff --git a/Graphics/vtkRectilinearGridClip.cxx b/Filters/General/vtkRectilinearGridClip.cxx similarity index 100% rename from Graphics/vtkRectilinearGridClip.cxx rename to Filters/General/vtkRectilinearGridClip.cxx diff --git a/Graphics/vtkRectilinearGridClip.h b/Filters/General/vtkRectilinearGridClip.h similarity index 100% rename from Graphics/vtkRectilinearGridClip.h rename to Filters/General/vtkRectilinearGridClip.h diff --git a/Graphics/vtkRectilinearGridToPointSet.cxx b/Filters/General/vtkRectilinearGridToPointSet.cxx similarity index 100% rename from Graphics/vtkRectilinearGridToPointSet.cxx rename to Filters/General/vtkRectilinearGridToPointSet.cxx diff --git a/Graphics/vtkRectilinearGridToPointSet.h b/Filters/General/vtkRectilinearGridToPointSet.h similarity index 100% rename from Graphics/vtkRectilinearGridToPointSet.h rename to Filters/General/vtkRectilinearGridToPointSet.h diff --git a/Graphics/vtkRectilinearGridToTetrahedra.cxx b/Filters/General/vtkRectilinearGridToTetrahedra.cxx similarity index 100% rename from Graphics/vtkRectilinearGridToTetrahedra.cxx rename to Filters/General/vtkRectilinearGridToTetrahedra.cxx diff --git a/Graphics/vtkRectilinearGridToTetrahedra.h b/Filters/General/vtkRectilinearGridToTetrahedra.h similarity index 100% rename from Graphics/vtkRectilinearGridToTetrahedra.h rename to Filters/General/vtkRectilinearGridToTetrahedra.h diff --git a/Graphics/vtkRecursiveDividingCubes.cxx b/Filters/General/vtkRecursiveDividingCubes.cxx similarity index 100% rename from Graphics/vtkRecursiveDividingCubes.cxx rename to Filters/General/vtkRecursiveDividingCubes.cxx diff --git a/Graphics/vtkRecursiveDividingCubes.h b/Filters/General/vtkRecursiveDividingCubes.h similarity index 100% rename from Graphics/vtkRecursiveDividingCubes.h rename to Filters/General/vtkRecursiveDividingCubes.h diff --git a/Graphics/vtkReflectionFilter.cxx b/Filters/General/vtkReflectionFilter.cxx similarity index 100% rename from Graphics/vtkReflectionFilter.cxx rename to Filters/General/vtkReflectionFilter.cxx diff --git a/Graphics/vtkReflectionFilter.h b/Filters/General/vtkReflectionFilter.h similarity index 100% rename from Graphics/vtkReflectionFilter.h rename to Filters/General/vtkReflectionFilter.h diff --git a/Graphics/vtkRotationFilter.cxx b/Filters/General/vtkRotationFilter.cxx similarity index 100% rename from Graphics/vtkRotationFilter.cxx rename to Filters/General/vtkRotationFilter.cxx diff --git a/Graphics/vtkRotationFilter.h b/Filters/General/vtkRotationFilter.h similarity index 100% rename from Graphics/vtkRotationFilter.h rename to Filters/General/vtkRotationFilter.h diff --git a/Infovis/vtkSCurveSpline.cxx b/Filters/General/vtkSCurveSpline.cxx similarity index 100% rename from Infovis/vtkSCurveSpline.cxx rename to Filters/General/vtkSCurveSpline.cxx diff --git a/Infovis/vtkSCurveSpline.h b/Filters/General/vtkSCurveSpline.h similarity index 100% rename from Infovis/vtkSCurveSpline.h rename to Filters/General/vtkSCurveSpline.h diff --git a/Graphics/vtkShrinkFilter.cxx b/Filters/General/vtkShrinkFilter.cxx similarity index 100% rename from Graphics/vtkShrinkFilter.cxx rename to Filters/General/vtkShrinkFilter.cxx diff --git a/Graphics/vtkShrinkFilter.h b/Filters/General/vtkShrinkFilter.h similarity index 100% rename from Graphics/vtkShrinkFilter.h rename to Filters/General/vtkShrinkFilter.h diff --git a/Graphics/vtkShrinkPolyData.cxx b/Filters/General/vtkShrinkPolyData.cxx similarity index 100% rename from Graphics/vtkShrinkPolyData.cxx rename to Filters/General/vtkShrinkPolyData.cxx diff --git a/Graphics/vtkShrinkPolyData.h b/Filters/General/vtkShrinkPolyData.h similarity index 100% rename from Graphics/vtkShrinkPolyData.h rename to Filters/General/vtkShrinkPolyData.h diff --git a/Graphics/vtkSliceCubes.cxx b/Filters/General/vtkSliceCubes.cxx similarity index 100% rename from Graphics/vtkSliceCubes.cxx rename to Filters/General/vtkSliceCubes.cxx diff --git a/Graphics/vtkSliceCubes.h b/Filters/General/vtkSliceCubes.h similarity index 100% rename from Graphics/vtkSliceCubes.h rename to Filters/General/vtkSliceCubes.h diff --git a/Graphics/vtkSpatialRepresentationFilter.cxx b/Filters/General/vtkSpatialRepresentationFilter.cxx similarity index 100% rename from Graphics/vtkSpatialRepresentationFilter.cxx rename to Filters/General/vtkSpatialRepresentationFilter.cxx diff --git a/Graphics/vtkSpatialRepresentationFilter.h b/Filters/General/vtkSpatialRepresentationFilter.h similarity index 100% rename from Graphics/vtkSpatialRepresentationFilter.h rename to Filters/General/vtkSpatialRepresentationFilter.h diff --git a/Graphics/vtkSplineFilter.cxx b/Filters/General/vtkSplineFilter.cxx similarity index 100% rename from Graphics/vtkSplineFilter.cxx rename to Filters/General/vtkSplineFilter.cxx diff --git a/Graphics/vtkSplineFilter.h b/Filters/General/vtkSplineFilter.h similarity index 100% rename from Graphics/vtkSplineFilter.h rename to Filters/General/vtkSplineFilter.h diff --git a/Infovis/vtkSplitColumnComponents.cxx b/Filters/General/vtkSplitColumnComponents.cxx similarity index 100% rename from Infovis/vtkSplitColumnComponents.cxx rename to Filters/General/vtkSplitColumnComponents.cxx diff --git a/Infovis/vtkSplitColumnComponents.h b/Filters/General/vtkSplitColumnComponents.h similarity index 100% rename from Infovis/vtkSplitColumnComponents.h rename to Filters/General/vtkSplitColumnComponents.h diff --git a/Graphics/vtkSplitField.cxx b/Filters/General/vtkSplitField.cxx similarity index 100% rename from Graphics/vtkSplitField.cxx rename to Filters/General/vtkSplitField.cxx diff --git a/Graphics/vtkSplitField.h b/Filters/General/vtkSplitField.h similarity index 100% rename from Graphics/vtkSplitField.h rename to Filters/General/vtkSplitField.h diff --git a/Graphics/vtkStreamTracer.cxx b/Filters/General/vtkStreamTracer.cxx similarity index 100% rename from Graphics/vtkStreamTracer.cxx rename to Filters/General/vtkStreamTracer.cxx diff --git a/Graphics/vtkStreamTracer.h b/Filters/General/vtkStreamTracer.h similarity index 100% rename from Graphics/vtkStreamTracer.h rename to Filters/General/vtkStreamTracer.h diff --git a/Graphics/vtkStructuredGridClip.cxx b/Filters/General/vtkStructuredGridClip.cxx similarity index 100% rename from Graphics/vtkStructuredGridClip.cxx rename to Filters/General/vtkStructuredGridClip.cxx diff --git a/Graphics/vtkStructuredGridClip.h b/Filters/General/vtkStructuredGridClip.h similarity index 100% rename from Graphics/vtkStructuredGridClip.h rename to Filters/General/vtkStructuredGridClip.h diff --git a/Graphics/vtkSubPixelPositionEdgels.cxx b/Filters/General/vtkSubPixelPositionEdgels.cxx similarity index 100% rename from Graphics/vtkSubPixelPositionEdgels.cxx rename to Filters/General/vtkSubPixelPositionEdgels.cxx diff --git a/Graphics/vtkSubPixelPositionEdgels.h b/Filters/General/vtkSubPixelPositionEdgels.h similarity index 100% rename from Graphics/vtkSubPixelPositionEdgels.h rename to Filters/General/vtkSubPixelPositionEdgels.h diff --git a/Graphics/vtkTableBasedClipCases.h b/Filters/General/vtkTableBasedClipCases.h similarity index 100% rename from Graphics/vtkTableBasedClipCases.h rename to Filters/General/vtkTableBasedClipCases.h diff --git a/Graphics/vtkTableBasedClipDataSet.cxx b/Filters/General/vtkTableBasedClipDataSet.cxx similarity index 100% rename from Graphics/vtkTableBasedClipDataSet.cxx rename to Filters/General/vtkTableBasedClipDataSet.cxx diff --git a/Graphics/vtkTableBasedClipDataSet.h b/Filters/General/vtkTableBasedClipDataSet.h similarity index 100% rename from Graphics/vtkTableBasedClipDataSet.h rename to Filters/General/vtkTableBasedClipDataSet.h diff --git a/Graphics/vtkTableToPolyData.cxx b/Filters/General/vtkTableToPolyData.cxx similarity index 100% rename from Graphics/vtkTableToPolyData.cxx rename to Filters/General/vtkTableToPolyData.cxx diff --git a/Graphics/vtkTableToPolyData.h b/Filters/General/vtkTableToPolyData.h similarity index 100% rename from Graphics/vtkTableToPolyData.h rename to Filters/General/vtkTableToPolyData.h diff --git a/Graphics/vtkTableToStructuredGrid.cxx b/Filters/General/vtkTableToStructuredGrid.cxx similarity index 100% rename from Graphics/vtkTableToStructuredGrid.cxx rename to Filters/General/vtkTableToStructuredGrid.cxx diff --git a/Graphics/vtkTableToStructuredGrid.h b/Filters/General/vtkTableToStructuredGrid.h similarity index 100% rename from Graphics/vtkTableToStructuredGrid.h rename to Filters/General/vtkTableToStructuredGrid.h diff --git a/Graphics/vtkTemporalPathLineFilter.cxx b/Filters/General/vtkTemporalPathLineFilter.cxx similarity index 100% rename from Graphics/vtkTemporalPathLineFilter.cxx rename to Filters/General/vtkTemporalPathLineFilter.cxx diff --git a/Graphics/vtkTemporalPathLineFilter.h b/Filters/General/vtkTemporalPathLineFilter.h similarity index 100% rename from Graphics/vtkTemporalPathLineFilter.h rename to Filters/General/vtkTemporalPathLineFilter.h diff --git a/Graphics/vtkTemporalStatistics.cxx b/Filters/General/vtkTemporalStatistics.cxx similarity index 100% rename from Graphics/vtkTemporalStatistics.cxx rename to Filters/General/vtkTemporalStatistics.cxx diff --git a/Graphics/vtkTemporalStatistics.h b/Filters/General/vtkTemporalStatistics.h similarity index 100% rename from Graphics/vtkTemporalStatistics.h rename to Filters/General/vtkTemporalStatistics.h diff --git a/Graphics/vtkTessellatorFilter.cxx b/Filters/General/vtkTessellatorFilter.cxx similarity index 100% rename from Graphics/vtkTessellatorFilter.cxx rename to Filters/General/vtkTessellatorFilter.cxx diff --git a/Graphics/vtkTessellatorFilter.h b/Filters/General/vtkTessellatorFilter.h similarity index 100% rename from Graphics/vtkTessellatorFilter.h rename to Filters/General/vtkTessellatorFilter.h diff --git a/Graphics/vtkTimeSourceExample.cxx b/Filters/General/vtkTimeSourceExample.cxx similarity index 100% rename from Graphics/vtkTimeSourceExample.cxx rename to Filters/General/vtkTimeSourceExample.cxx diff --git a/Graphics/vtkTimeSourceExample.h b/Filters/General/vtkTimeSourceExample.h similarity index 100% rename from Graphics/vtkTimeSourceExample.h rename to Filters/General/vtkTimeSourceExample.h diff --git a/Graphics/vtkTransformFilter.cxx b/Filters/General/vtkTransformFilter.cxx similarity index 100% rename from Graphics/vtkTransformFilter.cxx rename to Filters/General/vtkTransformFilter.cxx diff --git a/Graphics/vtkTransformFilter.h b/Filters/General/vtkTransformFilter.h similarity index 100% rename from Graphics/vtkTransformFilter.h rename to Filters/General/vtkTransformFilter.h diff --git a/Graphics/vtkTransformPolyDataFilter.cxx b/Filters/General/vtkTransformPolyDataFilter.cxx similarity index 100% rename from Graphics/vtkTransformPolyDataFilter.cxx rename to Filters/General/vtkTransformPolyDataFilter.cxx diff --git a/Graphics/vtkTransformPolyDataFilter.h b/Filters/General/vtkTransformPolyDataFilter.h similarity index 100% rename from Graphics/vtkTransformPolyDataFilter.h rename to Filters/General/vtkTransformPolyDataFilter.h diff --git a/Graphics/vtkUncertaintyTubeFilter.cxx b/Filters/General/vtkUncertaintyTubeFilter.cxx similarity index 100% rename from Graphics/vtkUncertaintyTubeFilter.cxx rename to Filters/General/vtkUncertaintyTubeFilter.cxx diff --git a/Graphics/vtkUncertaintyTubeFilter.h b/Filters/General/vtkUncertaintyTubeFilter.h similarity index 100% rename from Graphics/vtkUncertaintyTubeFilter.h rename to Filters/General/vtkUncertaintyTubeFilter.h diff --git a/Filtering/vtkUniformGridAMRAlgorithm.cxx b/Filters/General/vtkUniformGridAMRAlgorithm.cxx similarity index 100% rename from Filtering/vtkUniformGridAMRAlgorithm.cxx rename to Filters/General/vtkUniformGridAMRAlgorithm.cxx diff --git a/Filtering/vtkUniformGridAMRAlgorithm.h b/Filters/General/vtkUniformGridAMRAlgorithm.h similarity index 100% rename from Filtering/vtkUniformGridAMRAlgorithm.h rename to Filters/General/vtkUniformGridAMRAlgorithm.h diff --git a/Graphics/vtkVertexGlyphFilter.cxx b/Filters/General/vtkVertexGlyphFilter.cxx similarity index 100% rename from Graphics/vtkVertexGlyphFilter.cxx rename to Filters/General/vtkVertexGlyphFilter.cxx diff --git a/Graphics/vtkVertexGlyphFilter.h b/Filters/General/vtkVertexGlyphFilter.h similarity index 100% rename from Graphics/vtkVertexGlyphFilter.h rename to Filters/General/vtkVertexGlyphFilter.h diff --git a/Graphics/vtkVolumeContourSpectrumFilter.cxx b/Filters/General/vtkVolumeContourSpectrumFilter.cxx similarity index 100% rename from Graphics/vtkVolumeContourSpectrumFilter.cxx rename to Filters/General/vtkVolumeContourSpectrumFilter.cxx diff --git a/Graphics/vtkVolumeContourSpectrumFilter.h b/Filters/General/vtkVolumeContourSpectrumFilter.h similarity index 100% rename from Graphics/vtkVolumeContourSpectrumFilter.h rename to Filters/General/vtkVolumeContourSpectrumFilter.h diff --git a/Graphics/vtkVoxelContoursToSurfaceFilter.cxx b/Filters/General/vtkVoxelContoursToSurfaceFilter.cxx similarity index 100% rename from Graphics/vtkVoxelContoursToSurfaceFilter.cxx rename to Filters/General/vtkVoxelContoursToSurfaceFilter.cxx diff --git a/Graphics/vtkVoxelContoursToSurfaceFilter.h b/Filters/General/vtkVoxelContoursToSurfaceFilter.h similarity index 100% rename from Graphics/vtkVoxelContoursToSurfaceFilter.h rename to Filters/General/vtkVoxelContoursToSurfaceFilter.h diff --git a/Graphics/vtkWarpLens.cxx b/Filters/General/vtkWarpLens.cxx similarity index 100% rename from Graphics/vtkWarpLens.cxx rename to Filters/General/vtkWarpLens.cxx diff --git a/Graphics/vtkWarpLens.h b/Filters/General/vtkWarpLens.h similarity index 100% rename from Graphics/vtkWarpLens.h rename to Filters/General/vtkWarpLens.h diff --git a/Graphics/vtkWarpScalar.cxx b/Filters/General/vtkWarpScalar.cxx similarity index 100% rename from Graphics/vtkWarpScalar.cxx rename to Filters/General/vtkWarpScalar.cxx diff --git a/Graphics/vtkWarpScalar.h b/Filters/General/vtkWarpScalar.h similarity index 100% rename from Graphics/vtkWarpScalar.h rename to Filters/General/vtkWarpScalar.h diff --git a/Graphics/vtkWarpTo.cxx b/Filters/General/vtkWarpTo.cxx similarity index 100% rename from Graphics/vtkWarpTo.cxx rename to Filters/General/vtkWarpTo.cxx diff --git a/Graphics/vtkWarpTo.h b/Filters/General/vtkWarpTo.h similarity index 100% rename from Graphics/vtkWarpTo.h rename to Filters/General/vtkWarpTo.h diff --git a/Graphics/vtkWarpVector.cxx b/Filters/General/vtkWarpVector.cxx similarity index 100% rename from Graphics/vtkWarpVector.cxx rename to Filters/General/vtkWarpVector.cxx diff --git a/Graphics/vtkWarpVector.h b/Filters/General/vtkWarpVector.h similarity index 100% rename from Graphics/vtkWarpVector.h rename to Filters/General/vtkWarpVector.h diff --git a/Graphics/vtkYoungsMaterialInterface.cxx b/Filters/General/vtkYoungsMaterialInterface.cxx similarity index 100% rename from Graphics/vtkYoungsMaterialInterface.cxx rename to Filters/General/vtkYoungsMaterialInterface.cxx diff --git a/Graphics/vtkYoungsMaterialInterface.h b/Filters/General/vtkYoungsMaterialInterface.h similarity index 100% rename from Graphics/vtkYoungsMaterialInterface.h rename to Filters/General/vtkYoungsMaterialInterface.h diff --git a/GenericFiltering/Testing/Cxx/TestGenericClip.cxx b/Filters/Generic/Testing/Cxx/TestGenericClip.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/TestGenericClip.cxx rename to Filters/Generic/Testing/Cxx/TestGenericClip.cxx diff --git a/GenericFiltering/Testing/Cxx/TestGenericContourFilter.cxx b/Filters/Generic/Testing/Cxx/TestGenericContourFilter.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/TestGenericContourFilter.cxx rename to Filters/Generic/Testing/Cxx/TestGenericContourFilter.cxx diff --git a/GenericFiltering/Testing/Cxx/TestGenericCutter.cxx b/Filters/Generic/Testing/Cxx/TestGenericCutter.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/TestGenericCutter.cxx rename to Filters/Generic/Testing/Cxx/TestGenericCutter.cxx diff --git a/GenericFiltering/Testing/Cxx/TestGenericDataSetTessellator.cxx b/Filters/Generic/Testing/Cxx/TestGenericDataSetTessellator.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/TestGenericDataSetTessellator.cxx rename to Filters/Generic/Testing/Cxx/TestGenericDataSetTessellator.cxx diff --git a/GenericFiltering/Testing/Cxx/TestGenericGeometryFilter.cxx b/Filters/Generic/Testing/Cxx/TestGenericGeometryFilter.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/TestGenericGeometryFilter.cxx rename to Filters/Generic/Testing/Cxx/TestGenericGeometryFilter.cxx diff --git a/GenericFiltering/Testing/Cxx/TestGenericGlyph3DFilter.cxx b/Filters/Generic/Testing/Cxx/TestGenericGlyph3DFilter.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/TestGenericGlyph3DFilter.cxx rename to Filters/Generic/Testing/Cxx/TestGenericGlyph3DFilter.cxx diff --git a/GenericFiltering/Testing/Cxx/TestGenericProbeFilter.cxx b/Filters/Generic/Testing/Cxx/TestGenericProbeFilter.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/TestGenericProbeFilter.cxx rename to Filters/Generic/Testing/Cxx/TestGenericProbeFilter.cxx diff --git a/GenericFiltering/Testing/Cxx/TestGenericStreamTracer.cxx b/Filters/Generic/Testing/Cxx/TestGenericStreamTracer.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/TestGenericStreamTracer.cxx rename to Filters/Generic/Testing/Cxx/TestGenericStreamTracer.cxx diff --git a/GenericFiltering/Testing/Cxx/otherCreation.cxx b/Filters/Generic/Testing/Cxx/otherCreation.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/otherCreation.cxx rename to Filters/Generic/Testing/Cxx/otherCreation.cxx diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeAttribute.cxx b/Filters/Generic/Testing/Cxx/vtkBridgeAttribute.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeAttribute.cxx rename to Filters/Generic/Testing/Cxx/vtkBridgeAttribute.cxx diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeAttribute.h b/Filters/Generic/Testing/Cxx/vtkBridgeAttribute.h similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeAttribute.h rename to Filters/Generic/Testing/Cxx/vtkBridgeAttribute.h diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCell.cxx b/Filters/Generic/Testing/Cxx/vtkBridgeCell.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeCell.cxx rename to Filters/Generic/Testing/Cxx/vtkBridgeCell.cxx diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCell.h b/Filters/Generic/Testing/Cxx/vtkBridgeCell.h similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeCell.h rename to Filters/Generic/Testing/Cxx/vtkBridgeCell.h diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIterator.cxx b/Filters/Generic/Testing/Cxx/vtkBridgeCellIterator.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeCellIterator.cxx rename to Filters/Generic/Testing/Cxx/vtkBridgeCellIterator.cxx diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIterator.h b/Filters/Generic/Testing/Cxx/vtkBridgeCellIterator.h similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeCellIterator.h rename to Filters/Generic/Testing/Cxx/vtkBridgeCellIterator.h diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.cxx b/Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.cxx rename to Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.cxx diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.h b/Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.h similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.h rename to Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.h diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellList.cxx b/Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOnCellList.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellList.cxx rename to Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOnCellList.cxx diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellList.h b/Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOnCellList.h similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellList.h rename to Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOnCellList.h diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.cxx b/Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.cxx rename to Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.cxx diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.h b/Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.h similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.h rename to Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.h diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOne.cxx b/Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOne.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOne.cxx rename to Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOne.cxx diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOne.h b/Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOne.h similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOne.h rename to Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorOne.h diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorStrategy.cxx b/Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorStrategy.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorStrategy.cxx rename to Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorStrategy.cxx diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorStrategy.h b/Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorStrategy.h similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorStrategy.h rename to Filters/Generic/Testing/Cxx/vtkBridgeCellIteratorStrategy.h diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.cxx b/Filters/Generic/Testing/Cxx/vtkBridgeDataSet.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeDataSet.cxx rename to Filters/Generic/Testing/Cxx/vtkBridgeDataSet.cxx diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.h b/Filters/Generic/Testing/Cxx/vtkBridgeDataSet.h similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeDataSet.h rename to Filters/Generic/Testing/Cxx/vtkBridgeDataSet.h diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeExport.h b/Filters/Generic/Testing/Cxx/vtkBridgeExport.h similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgeExport.h rename to Filters/Generic/Testing/Cxx/vtkBridgeExport.h diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIterator.cxx b/Filters/Generic/Testing/Cxx/vtkBridgePointIterator.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgePointIterator.cxx rename to Filters/Generic/Testing/Cxx/vtkBridgePointIterator.cxx diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIterator.h b/Filters/Generic/Testing/Cxx/vtkBridgePointIterator.h similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgePointIterator.h rename to Filters/Generic/Testing/Cxx/vtkBridgePointIterator.h diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnCell.cxx b/Filters/Generic/Testing/Cxx/vtkBridgePointIteratorOnCell.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnCell.cxx rename to Filters/Generic/Testing/Cxx/vtkBridgePointIteratorOnCell.cxx diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnCell.h b/Filters/Generic/Testing/Cxx/vtkBridgePointIteratorOnCell.h similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnCell.h rename to Filters/Generic/Testing/Cxx/vtkBridgePointIteratorOnCell.h diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnDataSet.cxx b/Filters/Generic/Testing/Cxx/vtkBridgePointIteratorOnDataSet.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnDataSet.cxx rename to Filters/Generic/Testing/Cxx/vtkBridgePointIteratorOnDataSet.cxx diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnDataSet.h b/Filters/Generic/Testing/Cxx/vtkBridgePointIteratorOnDataSet.h similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnDataSet.h rename to Filters/Generic/Testing/Cxx/vtkBridgePointIteratorOnDataSet.h diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOne.cxx b/Filters/Generic/Testing/Cxx/vtkBridgePointIteratorOne.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOne.cxx rename to Filters/Generic/Testing/Cxx/vtkBridgePointIteratorOne.cxx diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOne.h b/Filters/Generic/Testing/Cxx/vtkBridgePointIteratorOne.h similarity index 100% rename from GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOne.h rename to Filters/Generic/Testing/Cxx/vtkBridgePointIteratorOne.h diff --git a/GenericFiltering/vtkGenericClip.cxx b/Filters/Generic/vtkGenericClip.cxx similarity index 100% rename from GenericFiltering/vtkGenericClip.cxx rename to Filters/Generic/vtkGenericClip.cxx diff --git a/GenericFiltering/vtkGenericClip.h b/Filters/Generic/vtkGenericClip.h similarity index 100% rename from GenericFiltering/vtkGenericClip.h rename to Filters/Generic/vtkGenericClip.h diff --git a/GenericFiltering/vtkGenericContourFilter.cxx b/Filters/Generic/vtkGenericContourFilter.cxx similarity index 100% rename from GenericFiltering/vtkGenericContourFilter.cxx rename to Filters/Generic/vtkGenericContourFilter.cxx diff --git a/GenericFiltering/vtkGenericContourFilter.h b/Filters/Generic/vtkGenericContourFilter.h similarity index 100% rename from GenericFiltering/vtkGenericContourFilter.h rename to Filters/Generic/vtkGenericContourFilter.h diff --git a/GenericFiltering/vtkGenericCutter.cxx b/Filters/Generic/vtkGenericCutter.cxx similarity index 100% rename from GenericFiltering/vtkGenericCutter.cxx rename to Filters/Generic/vtkGenericCutter.cxx diff --git a/GenericFiltering/vtkGenericCutter.h b/Filters/Generic/vtkGenericCutter.h similarity index 100% rename from GenericFiltering/vtkGenericCutter.h rename to Filters/Generic/vtkGenericCutter.h diff --git a/GenericFiltering/vtkGenericDataSetTessellator.cxx b/Filters/Generic/vtkGenericDataSetTessellator.cxx similarity index 100% rename from GenericFiltering/vtkGenericDataSetTessellator.cxx rename to Filters/Generic/vtkGenericDataSetTessellator.cxx diff --git a/GenericFiltering/vtkGenericDataSetTessellator.h b/Filters/Generic/vtkGenericDataSetTessellator.h similarity index 100% rename from GenericFiltering/vtkGenericDataSetTessellator.h rename to Filters/Generic/vtkGenericDataSetTessellator.h diff --git a/GenericFiltering/vtkGenericGeometryFilter.cxx b/Filters/Generic/vtkGenericGeometryFilter.cxx similarity index 100% rename from GenericFiltering/vtkGenericGeometryFilter.cxx rename to Filters/Generic/vtkGenericGeometryFilter.cxx diff --git a/GenericFiltering/vtkGenericGeometryFilter.h b/Filters/Generic/vtkGenericGeometryFilter.h similarity index 100% rename from GenericFiltering/vtkGenericGeometryFilter.h rename to Filters/Generic/vtkGenericGeometryFilter.h diff --git a/GenericFiltering/vtkGenericGlyph3DFilter.cxx b/Filters/Generic/vtkGenericGlyph3DFilter.cxx similarity index 100% rename from GenericFiltering/vtkGenericGlyph3DFilter.cxx rename to Filters/Generic/vtkGenericGlyph3DFilter.cxx diff --git a/GenericFiltering/vtkGenericGlyph3DFilter.h b/Filters/Generic/vtkGenericGlyph3DFilter.h similarity index 100% rename from GenericFiltering/vtkGenericGlyph3DFilter.h rename to Filters/Generic/vtkGenericGlyph3DFilter.h diff --git a/GenericFiltering/vtkGenericOutlineFilter.cxx b/Filters/Generic/vtkGenericOutlineFilter.cxx similarity index 100% rename from GenericFiltering/vtkGenericOutlineFilter.cxx rename to Filters/Generic/vtkGenericOutlineFilter.cxx diff --git a/GenericFiltering/vtkGenericOutlineFilter.h b/Filters/Generic/vtkGenericOutlineFilter.h similarity index 100% rename from GenericFiltering/vtkGenericOutlineFilter.h rename to Filters/Generic/vtkGenericOutlineFilter.h diff --git a/GenericFiltering/vtkGenericProbeFilter.cxx b/Filters/Generic/vtkGenericProbeFilter.cxx similarity index 100% rename from GenericFiltering/vtkGenericProbeFilter.cxx rename to Filters/Generic/vtkGenericProbeFilter.cxx diff --git a/GenericFiltering/vtkGenericProbeFilter.h b/Filters/Generic/vtkGenericProbeFilter.h similarity index 100% rename from GenericFiltering/vtkGenericProbeFilter.h rename to Filters/Generic/vtkGenericProbeFilter.h diff --git a/GenericFiltering/vtkGenericStreamTracer.cxx b/Filters/Generic/vtkGenericStreamTracer.cxx similarity index 100% rename from GenericFiltering/vtkGenericStreamTracer.cxx rename to Filters/Generic/vtkGenericStreamTracer.cxx diff --git a/GenericFiltering/vtkGenericStreamTracer.h b/Filters/Generic/vtkGenericStreamTracer.h similarity index 100% rename from GenericFiltering/vtkGenericStreamTracer.h rename to Filters/Generic/vtkGenericStreamTracer.h diff --git a/Graphics/Testing/Cxx/TestExtractSurfaceNonLinearSubdivision.cxx b/Filters/Geometry/Testing/Cxx/TestExtractSurfaceNonLinearSubdivision.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestExtractSurfaceNonLinearSubdivision.cxx rename to Filters/Geometry/Testing/Cxx/TestExtractSurfaceNonLinearSubdivision.cxx diff --git a/Filtering/Testing/Cxx/TestRectilinearGridPartitioner.cxx b/Filters/Geometry/Testing/Cxx/TestRectilinearGridPartitioner.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestRectilinearGridPartitioner.cxx rename to Filters/Geometry/Testing/Cxx/TestRectilinearGridPartitioner.cxx diff --git a/Filtering/Testing/Cxx/TestStructuredGridConnectivity.cxx b/Filters/Geometry/Testing/Cxx/TestStructuredGridConnectivity.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestStructuredGridConnectivity.cxx rename to Filters/Geometry/Testing/Cxx/TestStructuredGridConnectivity.cxx diff --git a/Filtering/Testing/Cxx/TestStructuredGridGhostDataGenerator.cxx b/Filters/Geometry/Testing/Cxx/TestStructuredGridGhostDataGenerator.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestStructuredGridGhostDataGenerator.cxx rename to Filters/Geometry/Testing/Cxx/TestStructuredGridGhostDataGenerator.cxx diff --git a/Filtering/Testing/Cxx/TestStructuredGridPartitioner.cxx b/Filters/Geometry/Testing/Cxx/TestStructuredGridPartitioner.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestStructuredGridPartitioner.cxx rename to Filters/Geometry/Testing/Cxx/TestStructuredGridPartitioner.cxx diff --git a/Filtering/Testing/Cxx/TestUniformGridGhostDataGenerator.cxx b/Filters/Geometry/Testing/Cxx/TestUniformGridGhostDataGenerator.cxx similarity index 100% rename from Filtering/Testing/Cxx/TestUniformGridGhostDataGenerator.cxx rename to Filters/Geometry/Testing/Cxx/TestUniformGridGhostDataGenerator.cxx diff --git a/Graphics/Testing/Cxx/TestUnstructuredGridGeometryFilter.cxx b/Filters/Geometry/Testing/Cxx/TestUnstructuredGridGeometryFilter.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestUnstructuredGridGeometryFilter.cxx rename to Filters/Geometry/Testing/Cxx/TestUnstructuredGridGeometryFilter.cxx diff --git a/Graphics/Testing/Tcl/dataSetSurfaceFilter.tcl b/Filters/Geometry/Testing/Tcl/dataSetSurfaceFilter.tcl similarity index 100% rename from Graphics/Testing/Tcl/dataSetSurfaceFilter.tcl rename to Filters/Geometry/Testing/Tcl/dataSetSurfaceFilter.tcl diff --git a/Graphics/Testing/Tcl/geomFilter.tcl b/Filters/Geometry/Testing/Tcl/geomFilter.tcl similarity index 100% rename from Graphics/Testing/Tcl/geomFilter.tcl rename to Filters/Geometry/Testing/Tcl/geomFilter.tcl diff --git a/Graphics/Testing/Tcl/officeStreamPoints.tcl b/Filters/Geometry/Testing/Tcl/officeStreamPoints.tcl similarity index 100% rename from Graphics/Testing/Tcl/officeStreamPoints.tcl rename to Filters/Geometry/Testing/Tcl/officeStreamPoints.tcl diff --git a/Graphics/Testing/Tcl/rectGrid.tcl b/Filters/Geometry/Testing/Tcl/rectGrid.tcl similarity index 100% rename from Graphics/Testing/Tcl/rectGrid.tcl rename to Filters/Geometry/Testing/Tcl/rectGrid.tcl diff --git a/Filtering/vtkAbstractGridConnectivity.cxx b/Filters/Geometry/vtkAbstractGridConnectivity.cxx similarity index 100% rename from Filtering/vtkAbstractGridConnectivity.cxx rename to Filters/Geometry/vtkAbstractGridConnectivity.cxx diff --git a/Filtering/vtkAbstractGridConnectivity.h b/Filters/Geometry/vtkAbstractGridConnectivity.h similarity index 100% rename from Filtering/vtkAbstractGridConnectivity.h rename to Filters/Geometry/vtkAbstractGridConnectivity.h diff --git a/Graphics/vtkCompositeDataGeometryFilter.cxx b/Filters/Geometry/vtkCompositeDataGeometryFilter.cxx similarity index 100% rename from Graphics/vtkCompositeDataGeometryFilter.cxx rename to Filters/Geometry/vtkCompositeDataGeometryFilter.cxx diff --git a/Graphics/vtkCompositeDataGeometryFilter.h b/Filters/Geometry/vtkCompositeDataGeometryFilter.h similarity index 100% rename from Graphics/vtkCompositeDataGeometryFilter.h rename to Filters/Geometry/vtkCompositeDataGeometryFilter.h diff --git a/Filtering/vtkDataSetGhostGenerator.cxx b/Filters/Geometry/vtkDataSetGhostGenerator.cxx similarity index 100% rename from Filtering/vtkDataSetGhostGenerator.cxx rename to Filters/Geometry/vtkDataSetGhostGenerator.cxx diff --git a/Filtering/vtkDataSetGhostGenerator.h b/Filters/Geometry/vtkDataSetGhostGenerator.h similarity index 100% rename from Filtering/vtkDataSetGhostGenerator.h rename to Filters/Geometry/vtkDataSetGhostGenerator.h diff --git a/Graphics/vtkDataSetSurfaceFilter.cxx b/Filters/Geometry/vtkDataSetSurfaceFilter.cxx similarity index 100% rename from Graphics/vtkDataSetSurfaceFilter.cxx rename to Filters/Geometry/vtkDataSetSurfaceFilter.cxx diff --git a/Graphics/vtkDataSetSurfaceFilter.h b/Filters/Geometry/vtkDataSetSurfaceFilter.h similarity index 100% rename from Graphics/vtkDataSetSurfaceFilter.h rename to Filters/Geometry/vtkDataSetSurfaceFilter.h diff --git a/Graphics/vtkGeometryFilter.cxx b/Filters/Geometry/vtkGeometryFilter.cxx similarity index 100% rename from Graphics/vtkGeometryFilter.cxx rename to Filters/Geometry/vtkGeometryFilter.cxx diff --git a/Graphics/vtkGeometryFilter.h b/Filters/Geometry/vtkGeometryFilter.h similarity index 100% rename from Graphics/vtkGeometryFilter.h rename to Filters/Geometry/vtkGeometryFilter.h diff --git a/Graphics/vtkHierarchicalDataSetGeometryFilter.cxx b/Filters/Geometry/vtkHierarchicalDataSetGeometryFilter.cxx similarity index 100% rename from Graphics/vtkHierarchicalDataSetGeometryFilter.cxx rename to Filters/Geometry/vtkHierarchicalDataSetGeometryFilter.cxx diff --git a/Graphics/vtkHierarchicalDataSetGeometryFilter.h b/Filters/Geometry/vtkHierarchicalDataSetGeometryFilter.h similarity index 100% rename from Graphics/vtkHierarchicalDataSetGeometryFilter.h rename to Filters/Geometry/vtkHierarchicalDataSetGeometryFilter.h diff --git a/Graphics/vtkImageDataGeometryFilter.cxx b/Filters/Geometry/vtkImageDataGeometryFilter.cxx similarity index 100% rename from Graphics/vtkImageDataGeometryFilter.cxx rename to Filters/Geometry/vtkImageDataGeometryFilter.cxx diff --git a/Graphics/vtkImageDataGeometryFilter.h b/Filters/Geometry/vtkImageDataGeometryFilter.h similarity index 100% rename from Graphics/vtkImageDataGeometryFilter.h rename to Filters/Geometry/vtkImageDataGeometryFilter.h diff --git a/Graphics/vtkRectilinearGridGeometryFilter.cxx b/Filters/Geometry/vtkRectilinearGridGeometryFilter.cxx similarity index 100% rename from Graphics/vtkRectilinearGridGeometryFilter.cxx rename to Filters/Geometry/vtkRectilinearGridGeometryFilter.cxx diff --git a/Graphics/vtkRectilinearGridGeometryFilter.h b/Filters/Geometry/vtkRectilinearGridGeometryFilter.h similarity index 100% rename from Graphics/vtkRectilinearGridGeometryFilter.h rename to Filters/Geometry/vtkRectilinearGridGeometryFilter.h diff --git a/Filtering/vtkRectilinearGridPartitioner.cxx b/Filters/Geometry/vtkRectilinearGridPartitioner.cxx similarity index 100% rename from Filtering/vtkRectilinearGridPartitioner.cxx rename to Filters/Geometry/vtkRectilinearGridPartitioner.cxx diff --git a/Filtering/vtkRectilinearGridPartitioner.h b/Filters/Geometry/vtkRectilinearGridPartitioner.h similarity index 100% rename from Filtering/vtkRectilinearGridPartitioner.h rename to Filters/Geometry/vtkRectilinearGridPartitioner.h diff --git a/Filtering/vtkStructuredGridConnectivity.cxx b/Filters/Geometry/vtkStructuredGridConnectivity.cxx similarity index 100% rename from Filtering/vtkStructuredGridConnectivity.cxx rename to Filters/Geometry/vtkStructuredGridConnectivity.cxx diff --git a/Filtering/vtkStructuredGridConnectivity.h b/Filters/Geometry/vtkStructuredGridConnectivity.h similarity index 100% rename from Filtering/vtkStructuredGridConnectivity.h rename to Filters/Geometry/vtkStructuredGridConnectivity.h diff --git a/Graphics/vtkStructuredGridGeometryFilter.cxx b/Filters/Geometry/vtkStructuredGridGeometryFilter.cxx similarity index 100% rename from Graphics/vtkStructuredGridGeometryFilter.cxx rename to Filters/Geometry/vtkStructuredGridGeometryFilter.cxx diff --git a/Graphics/vtkStructuredGridGeometryFilter.h b/Filters/Geometry/vtkStructuredGridGeometryFilter.h similarity index 100% rename from Graphics/vtkStructuredGridGeometryFilter.h rename to Filters/Geometry/vtkStructuredGridGeometryFilter.h diff --git a/Filtering/vtkStructuredGridGhostDataGenerator.cxx b/Filters/Geometry/vtkStructuredGridGhostDataGenerator.cxx similarity index 100% rename from Filtering/vtkStructuredGridGhostDataGenerator.cxx rename to Filters/Geometry/vtkStructuredGridGhostDataGenerator.cxx diff --git a/Filtering/vtkStructuredGridGhostDataGenerator.h b/Filters/Geometry/vtkStructuredGridGhostDataGenerator.h similarity index 100% rename from Filtering/vtkStructuredGridGhostDataGenerator.h rename to Filters/Geometry/vtkStructuredGridGhostDataGenerator.h diff --git a/Filtering/vtkStructuredGridPartitioner.cxx b/Filters/Geometry/vtkStructuredGridPartitioner.cxx similarity index 100% rename from Filtering/vtkStructuredGridPartitioner.cxx rename to Filters/Geometry/vtkStructuredGridPartitioner.cxx diff --git a/Filtering/vtkStructuredGridPartitioner.h b/Filters/Geometry/vtkStructuredGridPartitioner.h similarity index 100% rename from Filtering/vtkStructuredGridPartitioner.h rename to Filters/Geometry/vtkStructuredGridPartitioner.h diff --git a/Filtering/vtkStructuredNeighbor.cxx b/Filters/Geometry/vtkStructuredNeighbor.cxx similarity index 100% rename from Filtering/vtkStructuredNeighbor.cxx rename to Filters/Geometry/vtkStructuredNeighbor.cxx diff --git a/Filtering/vtkStructuredNeighbor.h b/Filters/Geometry/vtkStructuredNeighbor.h similarity index 100% rename from Filtering/vtkStructuredNeighbor.h rename to Filters/Geometry/vtkStructuredNeighbor.h diff --git a/Graphics/vtkStructuredPointsGeometryFilter.cxx b/Filters/Geometry/vtkStructuredPointsGeometryFilter.cxx similarity index 100% rename from Graphics/vtkStructuredPointsGeometryFilter.cxx rename to Filters/Geometry/vtkStructuredPointsGeometryFilter.cxx diff --git a/Graphics/vtkStructuredPointsGeometryFilter.h b/Filters/Geometry/vtkStructuredPointsGeometryFilter.h similarity index 100% rename from Graphics/vtkStructuredPointsGeometryFilter.h rename to Filters/Geometry/vtkStructuredPointsGeometryFilter.h diff --git a/Filtering/vtkUniformGridGhostDataGenerator.cxx b/Filters/Geometry/vtkUniformGridGhostDataGenerator.cxx similarity index 100% rename from Filtering/vtkUniformGridGhostDataGenerator.cxx rename to Filters/Geometry/vtkUniformGridGhostDataGenerator.cxx diff --git a/Filtering/vtkUniformGridGhostDataGenerator.h b/Filters/Geometry/vtkUniformGridGhostDataGenerator.h similarity index 100% rename from Filtering/vtkUniformGridGhostDataGenerator.h rename to Filters/Geometry/vtkUniformGridGhostDataGenerator.h diff --git a/Graphics/vtkUnstructuredGridGeometryFilter.cxx b/Filters/Geometry/vtkUnstructuredGridGeometryFilter.cxx similarity index 100% rename from Graphics/vtkUnstructuredGridGeometryFilter.cxx rename to Filters/Geometry/vtkUnstructuredGridGeometryFilter.cxx diff --git a/Graphics/vtkUnstructuredGridGeometryFilter.h b/Filters/Geometry/vtkUnstructuredGridGeometryFilter.h similarity index 100% rename from Graphics/vtkUnstructuredGridGeometryFilter.h rename to Filters/Geometry/vtkUnstructuredGridGeometryFilter.h diff --git a/Hybrid/Testing/Cxx/TestBSplineWarp.cxx b/Filters/Hybrid/Testing/Cxx/TestBSplineWarp.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestBSplineWarp.cxx rename to Filters/Hybrid/Testing/Cxx/TestBSplineWarp.cxx diff --git a/Hybrid/Testing/Cxx/TestImageDataLIC2D.cxx b/Filters/Hybrid/Testing/Cxx/TestImageDataLIC2D.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestImageDataLIC2D.cxx rename to Filters/Hybrid/Testing/Cxx/TestImageDataLIC2D.cxx diff --git a/Hybrid/Testing/Cxx/TestImageDataLIC2D.h b/Filters/Hybrid/Testing/Cxx/TestImageDataLIC2D.h similarity index 100% rename from Hybrid/Testing/Cxx/TestImageDataLIC2D.h rename to Filters/Hybrid/Testing/Cxx/TestImageDataLIC2D.h diff --git a/Hybrid/Testing/Cxx/TestPolyDataSilhouette.cxx b/Filters/Hybrid/Testing/Cxx/TestPolyDataSilhouette.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestPolyDataSilhouette.cxx rename to Filters/Hybrid/Testing/Cxx/TestPolyDataSilhouette.cxx diff --git a/Hybrid/Testing/Cxx/TestStructuredGridLIC2DSlice.h b/Filters/Hybrid/Testing/Cxx/TestStructuredGridLIC2DSlice.h similarity index 100% rename from Hybrid/Testing/Cxx/TestStructuredGridLIC2DSlice.h rename to Filters/Hybrid/Testing/Cxx/TestStructuredGridLIC2DSlice.h diff --git a/Hybrid/Testing/Cxx/TestStructuredGridLIC2DXSlice.cxx b/Filters/Hybrid/Testing/Cxx/TestStructuredGridLIC2DXSlice.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestStructuredGridLIC2DXSlice.cxx rename to Filters/Hybrid/Testing/Cxx/TestStructuredGridLIC2DXSlice.cxx diff --git a/Hybrid/Testing/Cxx/TestStructuredGridLIC2DYSlice.cxx b/Filters/Hybrid/Testing/Cxx/TestStructuredGridLIC2DYSlice.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestStructuredGridLIC2DYSlice.cxx rename to Filters/Hybrid/Testing/Cxx/TestStructuredGridLIC2DYSlice.cxx diff --git a/Hybrid/Testing/Cxx/TestStructuredGridLIC2DZSlice.cxx b/Filters/Hybrid/Testing/Cxx/TestStructuredGridLIC2DZSlice.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestStructuredGridLIC2DZSlice.cxx rename to Filters/Hybrid/Testing/Cxx/TestStructuredGridLIC2DZSlice.cxx diff --git a/Parallel/Testing/Cxx/TestTemporalCacheSimple.cxx b/Filters/Hybrid/Testing/Cxx/TestTemporalCacheSimple.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestTemporalCacheSimple.cxx rename to Filters/Hybrid/Testing/Cxx/TestTemporalCacheSimple.cxx diff --git a/Hybrid/Testing/Tcl/3DMorph.tcl b/Filters/Hybrid/Testing/Tcl/3DMorph.tcl similarity index 100% rename from Hybrid/Testing/Tcl/3DMorph.tcl rename to Filters/Hybrid/Testing/Tcl/3DMorph.tcl diff --git a/Hybrid/Testing/Tcl/TestFacetReader.tcl b/Filters/Hybrid/Testing/Tcl/TestFacetReader.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestFacetReader.tcl rename to Filters/Hybrid/Testing/Tcl/TestFacetReader.tcl diff --git a/Hybrid/Testing/Tcl/TestGreedyTerrainDecimation.tcl b/Filters/Hybrid/Testing/Tcl/TestGreedyTerrainDecimation.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestGreedyTerrainDecimation.tcl rename to Filters/Hybrid/Testing/Tcl/TestGreedyTerrainDecimation.tcl diff --git a/Hybrid/Testing/Tcl/TestGridWarp3D.tcl b/Filters/Hybrid/Testing/Tcl/TestGridWarp3D.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestGridWarp3D.tcl rename to Filters/Hybrid/Testing/Tcl/TestGridWarp3D.tcl diff --git a/Hybrid/Testing/Tcl/TestGridWarpCubic.tcl b/Filters/Hybrid/Testing/Tcl/TestGridWarpCubic.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestGridWarpCubic.tcl rename to Filters/Hybrid/Testing/Tcl/TestGridWarpCubic.tcl diff --git a/Hybrid/Testing/Tcl/TestGridWarpLinear.tcl b/Filters/Hybrid/Testing/Tcl/TestGridWarpLinear.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestGridWarpLinear.tcl rename to Filters/Hybrid/Testing/Tcl/TestGridWarpLinear.tcl diff --git a/Hybrid/Testing/Tcl/TestGridWarpNearest.tcl b/Filters/Hybrid/Testing/Tcl/TestGridWarpNearest.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestGridWarpNearest.tcl rename to Filters/Hybrid/Testing/Tcl/TestGridWarpNearest.tcl diff --git a/Hybrid/Testing/Tcl/TestImageStencilWithPolydata.tcl b/Filters/Hybrid/Testing/Tcl/TestImageStencilWithPolydata.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestImageStencilWithPolydata.tcl rename to Filters/Hybrid/Testing/Tcl/TestImageStencilWithPolydata.tcl diff --git a/Hybrid/Testing/Tcl/TestPCA.tcl b/Filters/Hybrid/Testing/Tcl/TestPCA.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestPCA.tcl rename to Filters/Hybrid/Testing/Tcl/TestPCA.tcl diff --git a/Hybrid/Testing/Tcl/TestProcrustes.tcl b/Filters/Hybrid/Testing/Tcl/TestProcrustes.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestProcrustes.tcl rename to Filters/Hybrid/Testing/Tcl/TestProcrustes.tcl diff --git a/Hybrid/Testing/Tcl/TestProcrustesRigidCentroid.tcl b/Filters/Hybrid/Testing/Tcl/TestProcrustesRigidCentroid.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestProcrustesRigidCentroid.tcl rename to Filters/Hybrid/Testing/Tcl/TestProcrustesRigidCentroid.tcl diff --git a/Hybrid/Testing/Tcl/TestProjectedTerrainPath.tcl b/Filters/Hybrid/Testing/Tcl/TestProjectedTerrainPath.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestProjectedTerrainPath.tcl rename to Filters/Hybrid/Testing/Tcl/TestProjectedTerrainPath.tcl diff --git a/Hybrid/Testing/Tcl/WarpPolyData.tcl b/Filters/Hybrid/Testing/Tcl/WarpPolyData.tcl similarity index 100% rename from Hybrid/Testing/Tcl/WarpPolyData.tcl rename to Filters/Hybrid/Testing/Tcl/WarpPolyData.tcl diff --git a/Hybrid/Testing/Tcl/appendImplicitModel.tcl b/Filters/Hybrid/Testing/Tcl/appendImplicitModel.tcl similarity index 100% rename from Hybrid/Testing/Tcl/appendImplicitModel.tcl rename to Filters/Hybrid/Testing/Tcl/appendImplicitModel.tcl diff --git a/Hybrid/Testing/Tcl/appendImplicitModelNoBounds.tcl b/Filters/Hybrid/Testing/Tcl/appendImplicitModelNoBounds.tcl similarity index 100% rename from Hybrid/Testing/Tcl/appendImplicitModelNoBounds.tcl rename to Filters/Hybrid/Testing/Tcl/appendImplicitModelNoBounds.tcl diff --git a/Hybrid/Testing/Tcl/banana.tcl b/Filters/Hybrid/Testing/Tcl/banana.tcl similarity index 100% rename from Hybrid/Testing/Tcl/banana.tcl rename to Filters/Hybrid/Testing/Tcl/banana.tcl diff --git a/Hybrid/Testing/Tcl/depthSort.tcl b/Filters/Hybrid/Testing/Tcl/depthSort.tcl similarity index 100% rename from Hybrid/Testing/Tcl/depthSort.tcl rename to Filters/Hybrid/Testing/Tcl/depthSort.tcl diff --git a/Hybrid/Testing/Tcl/earth.tcl b/Filters/Hybrid/Testing/Tcl/earth.tcl similarity index 100% rename from Hybrid/Testing/Tcl/earth.tcl rename to Filters/Hybrid/Testing/Tcl/earth.tcl diff --git a/Hybrid/Testing/Tcl/imageToPolyData.tcl b/Filters/Hybrid/Testing/Tcl/imageToPolyData.tcl similarity index 100% rename from Hybrid/Testing/Tcl/imageToPolyData.tcl rename to Filters/Hybrid/Testing/Tcl/imageToPolyData.tcl diff --git a/Hybrid/Testing/Tcl/largeImageOffset.tcl b/Filters/Hybrid/Testing/Tcl/largeImageOffset.tcl similarity index 100% rename from Hybrid/Testing/Tcl/largeImageOffset.tcl rename to Filters/Hybrid/Testing/Tcl/largeImageOffset.tcl diff --git a/Hybrid/Testing/Tcl/largeImageParallel.tcl b/Filters/Hybrid/Testing/Tcl/largeImageParallel.tcl similarity index 100% rename from Hybrid/Testing/Tcl/largeImageParallel.tcl rename to Filters/Hybrid/Testing/Tcl/largeImageParallel.tcl diff --git a/Hybrid/vtkBSplineTransform.cxx b/Filters/Hybrid/vtkBSplineTransform.cxx similarity index 100% rename from Hybrid/vtkBSplineTransform.cxx rename to Filters/Hybrid/vtkBSplineTransform.cxx diff --git a/Hybrid/vtkBSplineTransform.h b/Filters/Hybrid/vtkBSplineTransform.h similarity index 100% rename from Hybrid/vtkBSplineTransform.h rename to Filters/Hybrid/vtkBSplineTransform.h diff --git a/Hybrid/vtkDSPFilterDefinition.cxx b/Filters/Hybrid/vtkDSPFilterDefinition.cxx similarity index 100% rename from Hybrid/vtkDSPFilterDefinition.cxx rename to Filters/Hybrid/vtkDSPFilterDefinition.cxx diff --git a/Hybrid/vtkDSPFilterDefinition.h b/Filters/Hybrid/vtkDSPFilterDefinition.h similarity index 100% rename from Hybrid/vtkDSPFilterDefinition.h rename to Filters/Hybrid/vtkDSPFilterDefinition.h diff --git a/Hybrid/vtkDSPFilterGroup.cxx b/Filters/Hybrid/vtkDSPFilterGroup.cxx similarity index 100% rename from Hybrid/vtkDSPFilterGroup.cxx rename to Filters/Hybrid/vtkDSPFilterGroup.cxx diff --git a/Hybrid/vtkDSPFilterGroup.h b/Filters/Hybrid/vtkDSPFilterGroup.h similarity index 100% rename from Hybrid/vtkDSPFilterGroup.h rename to Filters/Hybrid/vtkDSPFilterGroup.h diff --git a/Hybrid/vtkDepthSortPolyData.cxx b/Filters/Hybrid/vtkDepthSortPolyData.cxx similarity index 100% rename from Hybrid/vtkDepthSortPolyData.cxx rename to Filters/Hybrid/vtkDepthSortPolyData.cxx diff --git a/Hybrid/vtkDepthSortPolyData.h b/Filters/Hybrid/vtkDepthSortPolyData.h similarity index 100% rename from Hybrid/vtkDepthSortPolyData.h rename to Filters/Hybrid/vtkDepthSortPolyData.h diff --git a/Hybrid/vtkEarthSource.cxx b/Filters/Hybrid/vtkEarthSource.cxx similarity index 100% rename from Hybrid/vtkEarthSource.cxx rename to Filters/Hybrid/vtkEarthSource.cxx diff --git a/Hybrid/vtkEarthSource.h b/Filters/Hybrid/vtkEarthSource.h similarity index 100% rename from Hybrid/vtkEarthSource.h rename to Filters/Hybrid/vtkEarthSource.h diff --git a/Hybrid/vtkFacetReader.cxx b/Filters/Hybrid/vtkFacetReader.cxx similarity index 100% rename from Hybrid/vtkFacetReader.cxx rename to Filters/Hybrid/vtkFacetReader.cxx diff --git a/Hybrid/vtkFacetReader.h b/Filters/Hybrid/vtkFacetReader.h similarity index 100% rename from Hybrid/vtkFacetReader.h rename to Filters/Hybrid/vtkFacetReader.h diff --git a/Hybrid/vtkGreedyTerrainDecimation.cxx b/Filters/Hybrid/vtkGreedyTerrainDecimation.cxx similarity index 100% rename from Hybrid/vtkGreedyTerrainDecimation.cxx rename to Filters/Hybrid/vtkGreedyTerrainDecimation.cxx diff --git a/Hybrid/vtkGreedyTerrainDecimation.h b/Filters/Hybrid/vtkGreedyTerrainDecimation.h similarity index 100% rename from Hybrid/vtkGreedyTerrainDecimation.h rename to Filters/Hybrid/vtkGreedyTerrainDecimation.h diff --git a/Hybrid/vtkGridTransform.cxx b/Filters/Hybrid/vtkGridTransform.cxx similarity index 100% rename from Hybrid/vtkGridTransform.cxx rename to Filters/Hybrid/vtkGridTransform.cxx diff --git a/Hybrid/vtkGridTransform.h b/Filters/Hybrid/vtkGridTransform.h similarity index 100% rename from Hybrid/vtkGridTransform.h rename to Filters/Hybrid/vtkGridTransform.h diff --git a/Hybrid/vtkImageDataLIC2D.cxx b/Filters/Hybrid/vtkImageDataLIC2D.cxx similarity index 100% rename from Hybrid/vtkImageDataLIC2D.cxx rename to Filters/Hybrid/vtkImageDataLIC2D.cxx diff --git a/Hybrid/vtkImageDataLIC2D.h b/Filters/Hybrid/vtkImageDataLIC2D.h similarity index 100% rename from Hybrid/vtkImageDataLIC2D.h rename to Filters/Hybrid/vtkImageDataLIC2D.h diff --git a/Hybrid/vtkImageDataLIC2DExtentTranslator.cxx b/Filters/Hybrid/vtkImageDataLIC2DExtentTranslator.cxx similarity index 100% rename from Hybrid/vtkImageDataLIC2DExtentTranslator.cxx rename to Filters/Hybrid/vtkImageDataLIC2DExtentTranslator.cxx diff --git a/Hybrid/vtkImageDataLIC2DExtentTranslator.h b/Filters/Hybrid/vtkImageDataLIC2DExtentTranslator.h similarity index 100% rename from Hybrid/vtkImageDataLIC2DExtentTranslator.h rename to Filters/Hybrid/vtkImageDataLIC2DExtentTranslator.h diff --git a/Hybrid/vtkImageToPolyDataFilter.cxx b/Filters/Hybrid/vtkImageToPolyDataFilter.cxx similarity index 100% rename from Hybrid/vtkImageToPolyDataFilter.cxx rename to Filters/Hybrid/vtkImageToPolyDataFilter.cxx diff --git a/Hybrid/vtkImageToPolyDataFilter.h b/Filters/Hybrid/vtkImageToPolyDataFilter.h similarity index 100% rename from Hybrid/vtkImageToPolyDataFilter.h rename to Filters/Hybrid/vtkImageToPolyDataFilter.h diff --git a/Hybrid/vtkImplicitModeller.cxx b/Filters/Hybrid/vtkImplicitModeller.cxx similarity index 100% rename from Hybrid/vtkImplicitModeller.cxx rename to Filters/Hybrid/vtkImplicitModeller.cxx diff --git a/Hybrid/vtkImplicitModeller.h b/Filters/Hybrid/vtkImplicitModeller.h similarity index 100% rename from Hybrid/vtkImplicitModeller.h rename to Filters/Hybrid/vtkImplicitModeller.h diff --git a/Hybrid/vtkPCAAnalysisFilter.cxx b/Filters/Hybrid/vtkPCAAnalysisFilter.cxx similarity index 100% rename from Hybrid/vtkPCAAnalysisFilter.cxx rename to Filters/Hybrid/vtkPCAAnalysisFilter.cxx diff --git a/Hybrid/vtkPCAAnalysisFilter.h b/Filters/Hybrid/vtkPCAAnalysisFilter.h similarity index 100% rename from Hybrid/vtkPCAAnalysisFilter.h rename to Filters/Hybrid/vtkPCAAnalysisFilter.h diff --git a/Hybrid/vtkPolyDataSilhouette.cxx b/Filters/Hybrid/vtkPolyDataSilhouette.cxx similarity index 100% rename from Hybrid/vtkPolyDataSilhouette.cxx rename to Filters/Hybrid/vtkPolyDataSilhouette.cxx diff --git a/Hybrid/vtkPolyDataSilhouette.h b/Filters/Hybrid/vtkPolyDataSilhouette.h similarity index 100% rename from Hybrid/vtkPolyDataSilhouette.h rename to Filters/Hybrid/vtkPolyDataSilhouette.h diff --git a/Hybrid/vtkProcrustesAlignmentFilter.cxx b/Filters/Hybrid/vtkProcrustesAlignmentFilter.cxx similarity index 100% rename from Hybrid/vtkProcrustesAlignmentFilter.cxx rename to Filters/Hybrid/vtkProcrustesAlignmentFilter.cxx diff --git a/Hybrid/vtkProcrustesAlignmentFilter.h b/Filters/Hybrid/vtkProcrustesAlignmentFilter.h similarity index 100% rename from Hybrid/vtkProcrustesAlignmentFilter.h rename to Filters/Hybrid/vtkProcrustesAlignmentFilter.h diff --git a/Hybrid/vtkProjectedTerrainPath.cxx b/Filters/Hybrid/vtkProjectedTerrainPath.cxx similarity index 100% rename from Hybrid/vtkProjectedTerrainPath.cxx rename to Filters/Hybrid/vtkProjectedTerrainPath.cxx diff --git a/Hybrid/vtkProjectedTerrainPath.h b/Filters/Hybrid/vtkProjectedTerrainPath.h similarity index 100% rename from Hybrid/vtkProjectedTerrainPath.h rename to Filters/Hybrid/vtkProjectedTerrainPath.h diff --git a/Hybrid/vtkRenderLargeImage.cxx b/Filters/Hybrid/vtkRenderLargeImage.cxx similarity index 100% rename from Hybrid/vtkRenderLargeImage.cxx rename to Filters/Hybrid/vtkRenderLargeImage.cxx diff --git a/Hybrid/vtkRenderLargeImage.h b/Filters/Hybrid/vtkRenderLargeImage.h similarity index 100% rename from Hybrid/vtkRenderLargeImage.h rename to Filters/Hybrid/vtkRenderLargeImage.h diff --git a/Hybrid/vtkStructuredGridLIC2D.cxx b/Filters/Hybrid/vtkStructuredGridLIC2D.cxx similarity index 100% rename from Hybrid/vtkStructuredGridLIC2D.cxx rename to Filters/Hybrid/vtkStructuredGridLIC2D.cxx diff --git a/Hybrid/vtkStructuredGridLIC2D.h b/Filters/Hybrid/vtkStructuredGridLIC2D.h similarity index 100% rename from Hybrid/vtkStructuredGridLIC2D.h rename to Filters/Hybrid/vtkStructuredGridLIC2D.h diff --git a/Hybrid/vtkStructuredGridLIC2D_fs.glsl b/Filters/Hybrid/vtkStructuredGridLIC2D_fs.glsl similarity index 100% rename from Hybrid/vtkStructuredGridLIC2D_fs.glsl rename to Filters/Hybrid/vtkStructuredGridLIC2D_fs.glsl diff --git a/Hybrid/vtkTemporalDataSetCache.cxx b/Filters/Hybrid/vtkTemporalDataSetCache.cxx similarity index 100% rename from Hybrid/vtkTemporalDataSetCache.cxx rename to Filters/Hybrid/vtkTemporalDataSetCache.cxx diff --git a/Hybrid/vtkTemporalDataSetCache.h b/Filters/Hybrid/vtkTemporalDataSetCache.h similarity index 100% rename from Hybrid/vtkTemporalDataSetCache.h rename to Filters/Hybrid/vtkTemporalDataSetCache.h diff --git a/Hybrid/vtkTemporalInterpolator.cxx b/Filters/Hybrid/vtkTemporalInterpolator.cxx similarity index 100% rename from Hybrid/vtkTemporalInterpolator.cxx rename to Filters/Hybrid/vtkTemporalInterpolator.cxx diff --git a/Hybrid/vtkTemporalInterpolator.h b/Filters/Hybrid/vtkTemporalInterpolator.h similarity index 100% rename from Hybrid/vtkTemporalInterpolator.h rename to Filters/Hybrid/vtkTemporalInterpolator.h diff --git a/Hybrid/vtkTemporalShiftScale.cxx b/Filters/Hybrid/vtkTemporalShiftScale.cxx similarity index 100% rename from Hybrid/vtkTemporalShiftScale.cxx rename to Filters/Hybrid/vtkTemporalShiftScale.cxx diff --git a/Hybrid/vtkTemporalShiftScale.h b/Filters/Hybrid/vtkTemporalShiftScale.h similarity index 100% rename from Hybrid/vtkTemporalShiftScale.h rename to Filters/Hybrid/vtkTemporalShiftScale.h diff --git a/Hybrid/vtkTemporalSnapToTimeStep.cxx b/Filters/Hybrid/vtkTemporalSnapToTimeStep.cxx similarity index 100% rename from Hybrid/vtkTemporalSnapToTimeStep.cxx rename to Filters/Hybrid/vtkTemporalSnapToTimeStep.cxx diff --git a/Hybrid/vtkTemporalSnapToTimeStep.h b/Filters/Hybrid/vtkTemporalSnapToTimeStep.h similarity index 100% rename from Hybrid/vtkTemporalSnapToTimeStep.h rename to Filters/Hybrid/vtkTemporalSnapToTimeStep.h diff --git a/Hybrid/vtkTransformToGrid.cxx b/Filters/Hybrid/vtkTransformToGrid.cxx similarity index 100% rename from Hybrid/vtkTransformToGrid.cxx rename to Filters/Hybrid/vtkTransformToGrid.cxx diff --git a/Hybrid/vtkTransformToGrid.h b/Filters/Hybrid/vtkTransformToGrid.h similarity index 100% rename from Hybrid/vtkTransformToGrid.h rename to Filters/Hybrid/vtkTransformToGrid.h diff --git a/Hybrid/vtkWeightedTransformFilter.cxx b/Filters/Hybrid/vtkWeightedTransformFilter.cxx similarity index 100% rename from Hybrid/vtkWeightedTransformFilter.cxx rename to Filters/Hybrid/vtkWeightedTransformFilter.cxx diff --git a/Hybrid/vtkWeightedTransformFilter.h b/Filters/Hybrid/vtkWeightedTransformFilter.h similarity index 100% rename from Hybrid/vtkWeightedTransformFilter.h rename to Filters/Hybrid/vtkWeightedTransformFilter.h diff --git a/Graphics/Testing/Cxx/TestClipHyperOctree.cxx b/Filters/HyperOctree/Testing/Cxx/TestClipHyperOctree.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestClipHyperOctree.cxx rename to Filters/HyperOctree/Testing/Cxx/TestClipHyperOctree.cxx diff --git a/Graphics/Testing/Cxx/TestHyperOctreeContourFilter.cxx b/Filters/HyperOctree/Testing/Cxx/TestHyperOctreeContourFilter.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestHyperOctreeContourFilter.cxx rename to Filters/HyperOctree/Testing/Cxx/TestHyperOctreeContourFilter.cxx diff --git a/Graphics/Testing/Cxx/TestHyperOctreeCutter.cxx b/Filters/HyperOctree/Testing/Cxx/TestHyperOctreeCutter.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestHyperOctreeCutter.cxx rename to Filters/HyperOctree/Testing/Cxx/TestHyperOctreeCutter.cxx diff --git a/Graphics/Testing/Cxx/TestHyperOctreeDual.cxx b/Filters/HyperOctree/Testing/Cxx/TestHyperOctreeDual.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestHyperOctreeDual.cxx rename to Filters/HyperOctree/Testing/Cxx/TestHyperOctreeDual.cxx diff --git a/Graphics/Testing/Cxx/TestHyperOctreeSurfaceFilter.cxx b/Filters/HyperOctree/Testing/Cxx/TestHyperOctreeSurfaceFilter.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestHyperOctreeSurfaceFilter.cxx rename to Filters/HyperOctree/Testing/Cxx/TestHyperOctreeSurfaceFilter.cxx diff --git a/Graphics/Testing/Cxx/TestHyperOctreeToUniformGrid.cxx b/Filters/HyperOctree/Testing/Cxx/TestHyperOctreeToUniformGrid.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestHyperOctreeToUniformGrid.cxx rename to Filters/HyperOctree/Testing/Cxx/TestHyperOctreeToUniformGrid.cxx diff --git a/Graphics/vtkClipHyperOctree.cxx b/Filters/HyperOctree/vtkClipHyperOctree.cxx similarity index 100% rename from Graphics/vtkClipHyperOctree.cxx rename to Filters/HyperOctree/vtkClipHyperOctree.cxx diff --git a/Graphics/vtkClipHyperOctree.h b/Filters/HyperOctree/vtkClipHyperOctree.h similarity index 100% rename from Graphics/vtkClipHyperOctree.h rename to Filters/HyperOctree/vtkClipHyperOctree.h diff --git a/Graphics/vtkHyperOctreeClipCutPointsGrabber.cxx b/Filters/HyperOctree/vtkHyperOctreeClipCutPointsGrabber.cxx similarity index 100% rename from Graphics/vtkHyperOctreeClipCutPointsGrabber.cxx rename to Filters/HyperOctree/vtkHyperOctreeClipCutPointsGrabber.cxx diff --git a/Graphics/vtkHyperOctreeClipCutPointsGrabber.h b/Filters/HyperOctree/vtkHyperOctreeClipCutPointsGrabber.h similarity index 100% rename from Graphics/vtkHyperOctreeClipCutPointsGrabber.h rename to Filters/HyperOctree/vtkHyperOctreeClipCutPointsGrabber.h diff --git a/Graphics/vtkHyperOctreeContourFilter.cxx b/Filters/HyperOctree/vtkHyperOctreeContourFilter.cxx similarity index 100% rename from Graphics/vtkHyperOctreeContourFilter.cxx rename to Filters/HyperOctree/vtkHyperOctreeContourFilter.cxx diff --git a/Graphics/vtkHyperOctreeContourFilter.h b/Filters/HyperOctree/vtkHyperOctreeContourFilter.h similarity index 100% rename from Graphics/vtkHyperOctreeContourFilter.h rename to Filters/HyperOctree/vtkHyperOctreeContourFilter.h diff --git a/Graphics/vtkHyperOctreeCutter.cxx b/Filters/HyperOctree/vtkHyperOctreeCutter.cxx similarity index 100% rename from Graphics/vtkHyperOctreeCutter.cxx rename to Filters/HyperOctree/vtkHyperOctreeCutter.cxx diff --git a/Graphics/vtkHyperOctreeCutter.h b/Filters/HyperOctree/vtkHyperOctreeCutter.h similarity index 100% rename from Graphics/vtkHyperOctreeCutter.h rename to Filters/HyperOctree/vtkHyperOctreeCutter.h diff --git a/Graphics/vtkHyperOctreeDepth.cxx b/Filters/HyperOctree/vtkHyperOctreeDepth.cxx similarity index 100% rename from Graphics/vtkHyperOctreeDepth.cxx rename to Filters/HyperOctree/vtkHyperOctreeDepth.cxx diff --git a/Graphics/vtkHyperOctreeDepth.h b/Filters/HyperOctree/vtkHyperOctreeDepth.h similarity index 100% rename from Graphics/vtkHyperOctreeDepth.h rename to Filters/HyperOctree/vtkHyperOctreeDepth.h diff --git a/Graphics/vtkHyperOctreeDualGridContourFilter.cxx b/Filters/HyperOctree/vtkHyperOctreeDualGridContourFilter.cxx similarity index 100% rename from Graphics/vtkHyperOctreeDualGridContourFilter.cxx rename to Filters/HyperOctree/vtkHyperOctreeDualGridContourFilter.cxx diff --git a/Graphics/vtkHyperOctreeDualGridContourFilter.h b/Filters/HyperOctree/vtkHyperOctreeDualGridContourFilter.h similarity index 100% rename from Graphics/vtkHyperOctreeDualGridContourFilter.h rename to Filters/HyperOctree/vtkHyperOctreeDualGridContourFilter.h diff --git a/Graphics/vtkHyperOctreeLimiter.cxx b/Filters/HyperOctree/vtkHyperOctreeLimiter.cxx similarity index 100% rename from Graphics/vtkHyperOctreeLimiter.cxx rename to Filters/HyperOctree/vtkHyperOctreeLimiter.cxx diff --git a/Graphics/vtkHyperOctreeLimiter.h b/Filters/HyperOctree/vtkHyperOctreeLimiter.h similarity index 100% rename from Graphics/vtkHyperOctreeLimiter.h rename to Filters/HyperOctree/vtkHyperOctreeLimiter.h diff --git a/Graphics/vtkHyperOctreeSampleFunction.cxx b/Filters/HyperOctree/vtkHyperOctreeSampleFunction.cxx similarity index 100% rename from Graphics/vtkHyperOctreeSampleFunction.cxx rename to Filters/HyperOctree/vtkHyperOctreeSampleFunction.cxx diff --git a/Graphics/vtkHyperOctreeSampleFunction.h b/Filters/HyperOctree/vtkHyperOctreeSampleFunction.h similarity index 100% rename from Graphics/vtkHyperOctreeSampleFunction.h rename to Filters/HyperOctree/vtkHyperOctreeSampleFunction.h diff --git a/Graphics/vtkHyperOctreeSurfaceFilter.cxx b/Filters/HyperOctree/vtkHyperOctreeSurfaceFilter.cxx similarity index 100% rename from Graphics/vtkHyperOctreeSurfaceFilter.cxx rename to Filters/HyperOctree/vtkHyperOctreeSurfaceFilter.cxx diff --git a/Graphics/vtkHyperOctreeSurfaceFilter.h b/Filters/HyperOctree/vtkHyperOctreeSurfaceFilter.h similarity index 100% rename from Graphics/vtkHyperOctreeSurfaceFilter.h rename to Filters/HyperOctree/vtkHyperOctreeSurfaceFilter.h diff --git a/Graphics/vtkHyperOctreeToUniformGridFilter.cxx b/Filters/HyperOctree/vtkHyperOctreeToUniformGridFilter.cxx similarity index 100% rename from Graphics/vtkHyperOctreeToUniformGridFilter.cxx rename to Filters/HyperOctree/vtkHyperOctreeToUniformGridFilter.cxx diff --git a/Graphics/vtkHyperOctreeToUniformGridFilter.h b/Filters/HyperOctree/vtkHyperOctreeToUniformGridFilter.h similarity index 100% rename from Graphics/vtkHyperOctreeToUniformGridFilter.h rename to Filters/HyperOctree/vtkHyperOctreeToUniformGridFilter.h diff --git a/Infovis/vtkComputeHistogram2DOutliers.cxx b/Filters/Imaging/vtkComputeHistogram2DOutliers.cxx similarity index 100% rename from Infovis/vtkComputeHistogram2DOutliers.cxx rename to Filters/Imaging/vtkComputeHistogram2DOutliers.cxx diff --git a/Infovis/vtkComputeHistogram2DOutliers.h b/Filters/Imaging/vtkComputeHistogram2DOutliers.h similarity index 100% rename from Infovis/vtkComputeHistogram2DOutliers.h rename to Filters/Imaging/vtkComputeHistogram2DOutliers.h diff --git a/Infovis/vtkExtractHistogram2D.cxx b/Filters/Imaging/vtkExtractHistogram2D.cxx similarity index 100% rename from Infovis/vtkExtractHistogram2D.cxx rename to Filters/Imaging/vtkExtractHistogram2D.cxx diff --git a/Infovis/vtkExtractHistogram2D.h b/Filters/Imaging/vtkExtractHistogram2D.h similarity index 100% rename from Infovis/vtkExtractHistogram2D.h rename to Filters/Imaging/vtkExtractHistogram2D.h diff --git a/Infovis/vtkPairwiseExtractHistogram2D.cxx b/Filters/Imaging/vtkPairwiseExtractHistogram2D.cxx similarity index 100% rename from Infovis/vtkPairwiseExtractHistogram2D.cxx rename to Filters/Imaging/vtkPairwiseExtractHistogram2D.cxx diff --git a/Infovis/vtkPairwiseExtractHistogram2D.h b/Filters/Imaging/vtkPairwiseExtractHistogram2D.h similarity index 100% rename from Infovis/vtkPairwiseExtractHistogram2D.h rename to Filters/Imaging/vtkPairwiseExtractHistogram2D.h diff --git a/Graphics/Testing/Cxx/TestMatlabEngineFilter.cxx b/Filters/Matlab/Testing/Cxx/TestMatlabEngineFilter.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestMatlabEngineFilter.cxx rename to Filters/Matlab/Testing/Cxx/TestMatlabEngineFilter.cxx diff --git a/Graphics/Testing/Cxx/TestMatlabEngineInterface.cxx b/Filters/Matlab/Testing/Cxx/TestMatlabEngineInterface.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestMatlabEngineInterface.cxx rename to Filters/Matlab/Testing/Cxx/TestMatlabEngineInterface.cxx diff --git a/Graphics/vtkMatlabEngineFilter.cxx b/Filters/Matlab/vtkMatlabEngineFilter.cxx similarity index 100% rename from Graphics/vtkMatlabEngineFilter.cxx rename to Filters/Matlab/vtkMatlabEngineFilter.cxx diff --git a/Graphics/vtkMatlabEngineFilter.h b/Filters/Matlab/vtkMatlabEngineFilter.h similarity index 100% rename from Graphics/vtkMatlabEngineFilter.h rename to Filters/Matlab/vtkMatlabEngineFilter.h diff --git a/Graphics/vtkMatlabEngineInterface.cxx b/Filters/Matlab/vtkMatlabEngineInterface.cxx similarity index 100% rename from Graphics/vtkMatlabEngineInterface.cxx rename to Filters/Matlab/vtkMatlabEngineInterface.cxx diff --git a/Graphics/vtkMatlabEngineInterface.h b/Filters/Matlab/vtkMatlabEngineInterface.h similarity index 100% rename from Graphics/vtkMatlabEngineInterface.h rename to Filters/Matlab/vtkMatlabEngineInterface.h diff --git a/Graphics/vtkMatlabMexAdapter.cxx b/Filters/Matlab/vtkMatlabMexAdapter.cxx similarity index 100% rename from Graphics/vtkMatlabMexAdapter.cxx rename to Filters/Matlab/vtkMatlabMexAdapter.cxx diff --git a/Graphics/vtkMatlabMexAdapter.h b/Filters/Matlab/vtkMatlabMexAdapter.h similarity index 100% rename from Graphics/vtkMatlabMexAdapter.h rename to Filters/Matlab/vtkMatlabMexAdapter.h diff --git a/Graphics/Testing/Cxx/TestPolyDataPointSampler.cxx b/Filters/Modeling/Testing/Cxx/TestPolyDataPointSampler.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestPolyDataPointSampler.cxx rename to Filters/Modeling/Testing/Cxx/TestPolyDataPointSampler.cxx diff --git a/Graphics/Testing/Cxx/TestQuadRotationalExtrusion.cxx b/Filters/Modeling/Testing/Cxx/TestQuadRotationalExtrusion.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestQuadRotationalExtrusion.cxx rename to Filters/Modeling/Testing/Cxx/TestQuadRotationalExtrusion.cxx diff --git a/Graphics/Testing/Cxx/TestQuadRotationalExtrusionMultiBlock.cxx b/Filters/Modeling/Testing/Cxx/TestQuadRotationalExtrusionMultiBlock.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestQuadRotationalExtrusionMultiBlock.cxx rename to Filters/Modeling/Testing/Cxx/TestQuadRotationalExtrusionMultiBlock.cxx diff --git a/Graphics/Testing/Cxx/TestRotationalExtrusion.cxx b/Filters/Modeling/Testing/Cxx/TestRotationalExtrusion.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestRotationalExtrusion.cxx rename to Filters/Modeling/Testing/Cxx/TestRotationalExtrusion.cxx diff --git a/Graphics/Testing/Cxx/TestSelectEnclosedPoints.cxx b/Filters/Modeling/Testing/Cxx/TestSelectEnclosedPoints.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestSelectEnclosedPoints.cxx rename to Filters/Modeling/Testing/Cxx/TestSelectEnclosedPoints.cxx diff --git a/Graphics/Testing/Tcl/Hyper.tcl b/Filters/Modeling/Testing/Tcl/Hyper.tcl similarity index 100% rename from Graphics/Testing/Tcl/Hyper.tcl rename to Filters/Modeling/Testing/Tcl/Hyper.tcl diff --git a/Graphics/Testing/Tcl/HyperScalarBar.tcl b/Filters/Modeling/Testing/Tcl/HyperScalarBar.tcl similarity index 100% rename from Graphics/Testing/Tcl/HyperScalarBar.tcl rename to Filters/Modeling/Testing/Tcl/HyperScalarBar.tcl diff --git a/Graphics/Testing/Tcl/KlineBottle.tcl b/Filters/Modeling/Testing/Tcl/KlineBottle.tcl similarity index 100% rename from Graphics/Testing/Tcl/KlineBottle.tcl rename to Filters/Modeling/Testing/Tcl/KlineBottle.tcl diff --git a/Graphics/Testing/Tcl/TenEllip.tcl b/Filters/Modeling/Testing/Tcl/TenEllip.tcl similarity index 100% rename from Graphics/Testing/Tcl/TenEllip.tcl rename to Filters/Modeling/Testing/Tcl/TenEllip.tcl diff --git a/Graphics/Testing/Tcl/TestBandedContourFilter.tcl b/Filters/Modeling/Testing/Tcl/TestBandedContourFilter.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestBandedContourFilter.tcl rename to Filters/Modeling/Testing/Tcl/TestBandedContourFilter.tcl diff --git a/Graphics/Testing/Tcl/TestBoxFunction.tcl b/Filters/Modeling/Testing/Tcl/TestBoxFunction.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestBoxFunction.tcl rename to Filters/Modeling/Testing/Tcl/TestBoxFunction.tcl diff --git a/Graphics/Testing/Tcl/TestFillHolesFilter.tcl b/Filters/Modeling/Testing/Tcl/TestFillHolesFilter.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestFillHolesFilter.tcl rename to Filters/Modeling/Testing/Tcl/TestFillHolesFilter.tcl diff --git a/Graphics/Testing/Tcl/TestImageMarchingCubes.tcl b/Filters/Modeling/Testing/Tcl/TestImageMarchingCubes.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestImageMarchingCubes.tcl rename to Filters/Modeling/Testing/Tcl/TestImageMarchingCubes.tcl diff --git a/Graphics/Testing/Tcl/TestRibbonAndTube.tcl b/Filters/Modeling/Testing/Tcl/TestRibbonAndTube.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestRibbonAndTube.tcl rename to Filters/Modeling/Testing/Tcl/TestRibbonAndTube.tcl diff --git a/Graphics/Testing/Tcl/TestRuledSurface.tcl b/Filters/Modeling/Testing/Tcl/TestRuledSurface.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestRuledSurface.tcl rename to Filters/Modeling/Testing/Tcl/TestRuledSurface.tcl diff --git a/Graphics/Testing/Tcl/TestRuledSurface2.tcl b/Filters/Modeling/Testing/Tcl/TestRuledSurface2.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestRuledSurface2.tcl rename to Filters/Modeling/Testing/Tcl/TestRuledSurface2.tcl diff --git a/Graphics/Testing/Tcl/TestSpherePuzzle.tcl b/Filters/Modeling/Testing/Tcl/TestSpherePuzzle.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestSpherePuzzle.tcl rename to Filters/Modeling/Testing/Tcl/TestSpherePuzzle.tcl diff --git a/Graphics/Testing/Tcl/TestSpherePuzzleArrows.tcl b/Filters/Modeling/Testing/Tcl/TestSpherePuzzleArrows.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestSpherePuzzleArrows.tcl rename to Filters/Modeling/Testing/Tcl/TestSpherePuzzleArrows.tcl diff --git a/Hybrid/Testing/Tcl/camera.tcl b/Filters/Modeling/Testing/Tcl/camera.tcl similarity index 100% rename from Hybrid/Testing/Tcl/camera.tcl rename to Filters/Modeling/Testing/Tcl/camera.tcl diff --git a/Graphics/Testing/Tcl/contour2DAll.tcl b/Filters/Modeling/Testing/Tcl/contour2DAll.tcl similarity index 100% rename from Graphics/Testing/Tcl/contour2DAll.tcl rename to Filters/Modeling/Testing/Tcl/contour2DAll.tcl diff --git a/Graphics/Testing/Tcl/contour3DAll.tcl b/Filters/Modeling/Testing/Tcl/contour3DAll.tcl similarity index 100% rename from Graphics/Testing/Tcl/contour3DAll.tcl rename to Filters/Modeling/Testing/Tcl/contour3DAll.tcl diff --git a/Graphics/Testing/Tcl/eleState.tcl b/Filters/Modeling/Testing/Tcl/eleState.tcl similarity index 100% rename from Graphics/Testing/Tcl/eleState.tcl rename to Filters/Modeling/Testing/Tcl/eleState.tcl diff --git a/Graphics/Testing/Tcl/extrudeCopyCD.tcl b/Filters/Modeling/Testing/Tcl/extrudeCopyCD.tcl similarity index 100% rename from Graphics/Testing/Tcl/extrudeCopyCD.tcl rename to Filters/Modeling/Testing/Tcl/extrudeCopyCD.tcl diff --git a/Graphics/Testing/Tcl/schwarz.tcl b/Filters/Modeling/Testing/Tcl/schwarz.tcl similarity index 100% rename from Graphics/Testing/Tcl/schwarz.tcl rename to Filters/Modeling/Testing/Tcl/schwarz.tcl diff --git a/Graphics/Testing/Tcl/smoothCyl.tcl b/Filters/Modeling/Testing/Tcl/smoothCyl.tcl similarity index 100% rename from Graphics/Testing/Tcl/smoothCyl.tcl rename to Filters/Modeling/Testing/Tcl/smoothCyl.tcl diff --git a/Graphics/Testing/Tcl/smoothCyl2.tcl b/Filters/Modeling/Testing/Tcl/smoothCyl2.tcl similarity index 100% rename from Graphics/Testing/Tcl/smoothCyl2.tcl rename to Filters/Modeling/Testing/Tcl/smoothCyl2.tcl diff --git a/Graphics/Testing/Tcl/subDivideTetra.tcl b/Filters/Modeling/Testing/Tcl/subDivideTetra.tcl similarity index 100% rename from Graphics/Testing/Tcl/subDivideTetra.tcl rename to Filters/Modeling/Testing/Tcl/subDivideTetra.tcl diff --git a/Graphics/Testing/Tcl/subdividePointData.tcl b/Filters/Modeling/Testing/Tcl/subdividePointData.tcl similarity index 100% rename from Graphics/Testing/Tcl/subdividePointData.tcl rename to Filters/Modeling/Testing/Tcl/subdividePointData.tcl diff --git a/Graphics/Testing/Tcl/sync3dAll.tcl b/Filters/Modeling/Testing/Tcl/sync3dAll.tcl similarity index 100% rename from Graphics/Testing/Tcl/sync3dAll.tcl rename to Filters/Modeling/Testing/Tcl/sync3dAll.tcl diff --git a/Graphics/vtkBandedPolyDataContourFilter.cxx b/Filters/Modeling/vtkBandedPolyDataContourFilter.cxx similarity index 100% rename from Graphics/vtkBandedPolyDataContourFilter.cxx rename to Filters/Modeling/vtkBandedPolyDataContourFilter.cxx diff --git a/Graphics/vtkBandedPolyDataContourFilter.h b/Filters/Modeling/vtkBandedPolyDataContourFilter.h similarity index 100% rename from Graphics/vtkBandedPolyDataContourFilter.h rename to Filters/Modeling/vtkBandedPolyDataContourFilter.h diff --git a/Graphics/vtkButterflySubdivisionFilter.cxx b/Filters/Modeling/vtkButterflySubdivisionFilter.cxx similarity index 100% rename from Graphics/vtkButterflySubdivisionFilter.cxx rename to Filters/Modeling/vtkButterflySubdivisionFilter.cxx diff --git a/Graphics/vtkButterflySubdivisionFilter.h b/Filters/Modeling/vtkButterflySubdivisionFilter.h similarity index 100% rename from Graphics/vtkButterflySubdivisionFilter.h rename to Filters/Modeling/vtkButterflySubdivisionFilter.h diff --git a/Graphics/vtkDijkstraGraphGeodesicPath.cxx b/Filters/Modeling/vtkDijkstraGraphGeodesicPath.cxx similarity index 100% rename from Graphics/vtkDijkstraGraphGeodesicPath.cxx rename to Filters/Modeling/vtkDijkstraGraphGeodesicPath.cxx diff --git a/Graphics/vtkDijkstraGraphGeodesicPath.h b/Filters/Modeling/vtkDijkstraGraphGeodesicPath.h similarity index 100% rename from Graphics/vtkDijkstraGraphGeodesicPath.h rename to Filters/Modeling/vtkDijkstraGraphGeodesicPath.h diff --git a/Graphics/vtkDijkstraGraphInternals.h b/Filters/Modeling/vtkDijkstraGraphInternals.h similarity index 100% rename from Graphics/vtkDijkstraGraphInternals.h rename to Filters/Modeling/vtkDijkstraGraphInternals.h diff --git a/Graphics/vtkDijkstraImageGeodesicPath.cxx b/Filters/Modeling/vtkDijkstraImageGeodesicPath.cxx similarity index 100% rename from Graphics/vtkDijkstraImageGeodesicPath.cxx rename to Filters/Modeling/vtkDijkstraImageGeodesicPath.cxx diff --git a/Graphics/vtkDijkstraImageGeodesicPath.h b/Filters/Modeling/vtkDijkstraImageGeodesicPath.h similarity index 100% rename from Graphics/vtkDijkstraImageGeodesicPath.h rename to Filters/Modeling/vtkDijkstraImageGeodesicPath.h diff --git a/Graphics/vtkFillHolesFilter.cxx b/Filters/Modeling/vtkFillHolesFilter.cxx similarity index 100% rename from Graphics/vtkFillHolesFilter.cxx rename to Filters/Modeling/vtkFillHolesFilter.cxx diff --git a/Graphics/vtkFillHolesFilter.h b/Filters/Modeling/vtkFillHolesFilter.h similarity index 100% rename from Graphics/vtkFillHolesFilter.h rename to Filters/Modeling/vtkFillHolesFilter.h diff --git a/Graphics/vtkGeodesicPath.cxx b/Filters/Modeling/vtkGeodesicPath.cxx similarity index 100% rename from Graphics/vtkGeodesicPath.cxx rename to Filters/Modeling/vtkGeodesicPath.cxx diff --git a/Graphics/vtkGeodesicPath.h b/Filters/Modeling/vtkGeodesicPath.h similarity index 100% rename from Graphics/vtkGeodesicPath.h rename to Filters/Modeling/vtkGeodesicPath.h diff --git a/Graphics/vtkGraphGeodesicPath.cxx b/Filters/Modeling/vtkGraphGeodesicPath.cxx similarity index 100% rename from Graphics/vtkGraphGeodesicPath.cxx rename to Filters/Modeling/vtkGraphGeodesicPath.cxx diff --git a/Graphics/vtkGraphGeodesicPath.h b/Filters/Modeling/vtkGraphGeodesicPath.h similarity index 100% rename from Graphics/vtkGraphGeodesicPath.h rename to Filters/Modeling/vtkGraphGeodesicPath.h diff --git a/Graphics/vtkLinearExtrusionFilter.cxx b/Filters/Modeling/vtkLinearExtrusionFilter.cxx similarity index 100% rename from Graphics/vtkLinearExtrusionFilter.cxx rename to Filters/Modeling/vtkLinearExtrusionFilter.cxx diff --git a/Graphics/vtkLinearExtrusionFilter.h b/Filters/Modeling/vtkLinearExtrusionFilter.h similarity index 100% rename from Graphics/vtkLinearExtrusionFilter.h rename to Filters/Modeling/vtkLinearExtrusionFilter.h diff --git a/Graphics/vtkLinearSubdivisionFilter.cxx b/Filters/Modeling/vtkLinearSubdivisionFilter.cxx similarity index 100% rename from Graphics/vtkLinearSubdivisionFilter.cxx rename to Filters/Modeling/vtkLinearSubdivisionFilter.cxx diff --git a/Graphics/vtkLinearSubdivisionFilter.h b/Filters/Modeling/vtkLinearSubdivisionFilter.h similarity index 100% rename from Graphics/vtkLinearSubdivisionFilter.h rename to Filters/Modeling/vtkLinearSubdivisionFilter.h diff --git a/Graphics/vtkLoopSubdivisionFilter.cxx b/Filters/Modeling/vtkLoopSubdivisionFilter.cxx similarity index 100% rename from Graphics/vtkLoopSubdivisionFilter.cxx rename to Filters/Modeling/vtkLoopSubdivisionFilter.cxx diff --git a/Graphics/vtkLoopSubdivisionFilter.h b/Filters/Modeling/vtkLoopSubdivisionFilter.h similarity index 100% rename from Graphics/vtkLoopSubdivisionFilter.h rename to Filters/Modeling/vtkLoopSubdivisionFilter.h diff --git a/Graphics/vtkOutlineFilter.cxx b/Filters/Modeling/vtkOutlineFilter.cxx similarity index 100% rename from Graphics/vtkOutlineFilter.cxx rename to Filters/Modeling/vtkOutlineFilter.cxx diff --git a/Graphics/vtkOutlineFilter.h b/Filters/Modeling/vtkOutlineFilter.h similarity index 100% rename from Graphics/vtkOutlineFilter.h rename to Filters/Modeling/vtkOutlineFilter.h diff --git a/Graphics/vtkPolyDataPointSampler.cxx b/Filters/Modeling/vtkPolyDataPointSampler.cxx similarity index 100% rename from Graphics/vtkPolyDataPointSampler.cxx rename to Filters/Modeling/vtkPolyDataPointSampler.cxx diff --git a/Graphics/vtkPolyDataPointSampler.h b/Filters/Modeling/vtkPolyDataPointSampler.h similarity index 100% rename from Graphics/vtkPolyDataPointSampler.h rename to Filters/Modeling/vtkPolyDataPointSampler.h diff --git a/Graphics/vtkProjectedTexture.cxx b/Filters/Modeling/vtkProjectedTexture.cxx similarity index 100% rename from Graphics/vtkProjectedTexture.cxx rename to Filters/Modeling/vtkProjectedTexture.cxx diff --git a/Graphics/vtkProjectedTexture.h b/Filters/Modeling/vtkProjectedTexture.h similarity index 100% rename from Graphics/vtkProjectedTexture.h rename to Filters/Modeling/vtkProjectedTexture.h diff --git a/Graphics/vtkQuadRotationalExtrusionFilter.cxx b/Filters/Modeling/vtkQuadRotationalExtrusionFilter.cxx similarity index 100% rename from Graphics/vtkQuadRotationalExtrusionFilter.cxx rename to Filters/Modeling/vtkQuadRotationalExtrusionFilter.cxx diff --git a/Graphics/vtkQuadRotationalExtrusionFilter.h b/Filters/Modeling/vtkQuadRotationalExtrusionFilter.h similarity index 100% rename from Graphics/vtkQuadRotationalExtrusionFilter.h rename to Filters/Modeling/vtkQuadRotationalExtrusionFilter.h diff --git a/Graphics/vtkRibbonFilter.cxx b/Filters/Modeling/vtkRibbonFilter.cxx similarity index 100% rename from Graphics/vtkRibbonFilter.cxx rename to Filters/Modeling/vtkRibbonFilter.cxx diff --git a/Graphics/vtkRibbonFilter.h b/Filters/Modeling/vtkRibbonFilter.h similarity index 100% rename from Graphics/vtkRibbonFilter.h rename to Filters/Modeling/vtkRibbonFilter.h diff --git a/Graphics/vtkRotationalExtrusionFilter.cxx b/Filters/Modeling/vtkRotationalExtrusionFilter.cxx similarity index 100% rename from Graphics/vtkRotationalExtrusionFilter.cxx rename to Filters/Modeling/vtkRotationalExtrusionFilter.cxx diff --git a/Graphics/vtkRotationalExtrusionFilter.h b/Filters/Modeling/vtkRotationalExtrusionFilter.h similarity index 100% rename from Graphics/vtkRotationalExtrusionFilter.h rename to Filters/Modeling/vtkRotationalExtrusionFilter.h diff --git a/Graphics/vtkRuledSurfaceFilter.cxx b/Filters/Modeling/vtkRuledSurfaceFilter.cxx similarity index 100% rename from Graphics/vtkRuledSurfaceFilter.cxx rename to Filters/Modeling/vtkRuledSurfaceFilter.cxx diff --git a/Graphics/vtkRuledSurfaceFilter.h b/Filters/Modeling/vtkRuledSurfaceFilter.h similarity index 100% rename from Graphics/vtkRuledSurfaceFilter.h rename to Filters/Modeling/vtkRuledSurfaceFilter.h diff --git a/Graphics/vtkSectorSource.cxx b/Filters/Modeling/vtkSectorSource.cxx similarity index 100% rename from Graphics/vtkSectorSource.cxx rename to Filters/Modeling/vtkSectorSource.cxx diff --git a/Graphics/vtkSectorSource.h b/Filters/Modeling/vtkSectorSource.h similarity index 100% rename from Graphics/vtkSectorSource.h rename to Filters/Modeling/vtkSectorSource.h diff --git a/Graphics/vtkSelectEnclosedPoints.cxx b/Filters/Modeling/vtkSelectEnclosedPoints.cxx similarity index 100% rename from Graphics/vtkSelectEnclosedPoints.cxx rename to Filters/Modeling/vtkSelectEnclosedPoints.cxx diff --git a/Graphics/vtkSelectEnclosedPoints.h b/Filters/Modeling/vtkSelectEnclosedPoints.h similarity index 100% rename from Graphics/vtkSelectEnclosedPoints.h rename to Filters/Modeling/vtkSelectEnclosedPoints.h diff --git a/Graphics/vtkSelectPolyData.cxx b/Filters/Modeling/vtkSelectPolyData.cxx similarity index 100% rename from Graphics/vtkSelectPolyData.cxx rename to Filters/Modeling/vtkSelectPolyData.cxx diff --git a/Graphics/vtkSelectPolyData.h b/Filters/Modeling/vtkSelectPolyData.h similarity index 100% rename from Graphics/vtkSelectPolyData.h rename to Filters/Modeling/vtkSelectPolyData.h diff --git a/Graphics/vtkSpherePuzzle.cxx b/Filters/Modeling/vtkSpherePuzzle.cxx similarity index 100% rename from Graphics/vtkSpherePuzzle.cxx rename to Filters/Modeling/vtkSpherePuzzle.cxx diff --git a/Graphics/vtkSpherePuzzle.h b/Filters/Modeling/vtkSpherePuzzle.h similarity index 100% rename from Graphics/vtkSpherePuzzle.h rename to Filters/Modeling/vtkSpherePuzzle.h diff --git a/Graphics/vtkSpherePuzzleArrows.cxx b/Filters/Modeling/vtkSpherePuzzleArrows.cxx similarity index 100% rename from Graphics/vtkSpherePuzzleArrows.cxx rename to Filters/Modeling/vtkSpherePuzzleArrows.cxx diff --git a/Graphics/vtkSpherePuzzleArrows.h b/Filters/Modeling/vtkSpherePuzzleArrows.h similarity index 100% rename from Graphics/vtkSpherePuzzleArrows.h rename to Filters/Modeling/vtkSpherePuzzleArrows.h diff --git a/Graphics/vtkSubdivideTetra.cxx b/Filters/Modeling/vtkSubdivideTetra.cxx similarity index 100% rename from Graphics/vtkSubdivideTetra.cxx rename to Filters/Modeling/vtkSubdivideTetra.cxx diff --git a/Graphics/vtkSubdivideTetra.h b/Filters/Modeling/vtkSubdivideTetra.h similarity index 100% rename from Graphics/vtkSubdivideTetra.h rename to Filters/Modeling/vtkSubdivideTetra.h diff --git a/Parallel/Testing/Cxx/DistributedData.cxx b/Filters/Parallel/Testing/Cxx/DistributedData.cxx similarity index 100% rename from Parallel/Testing/Cxx/DistributedData.cxx rename to Filters/Parallel/Testing/Cxx/DistributedData.cxx diff --git a/Parallel/Testing/Cxx/DistributedDataRenderPass.cxx b/Filters/Parallel/Testing/Cxx/DistributedDataRenderPass.cxx similarity index 100% rename from Parallel/Testing/Cxx/DistributedDataRenderPass.cxx rename to Filters/Parallel/Testing/Cxx/DistributedDataRenderPass.cxx diff --git a/Parallel/Testing/Cxx/TestPStream.cxx b/Filters/Parallel/Testing/Cxx/TestPStream.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestPStream.cxx rename to Filters/Parallel/Testing/Cxx/TestPStream.cxx diff --git a/Parallel/Testing/Cxx/TestTemporalCacheTemporal.cxx b/Filters/Parallel/Testing/Cxx/TestTemporalCacheTemporal.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestTemporalCacheTemporal.cxx rename to Filters/Parallel/Testing/Cxx/TestTemporalCacheTemporal.cxx diff --git a/Parallel/Testing/Cxx/TestTemporalFractal.cxx b/Filters/Parallel/Testing/Cxx/TestTemporalFractal.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestTemporalFractal.cxx rename to Filters/Parallel/Testing/Cxx/TestTemporalFractal.cxx diff --git a/Parallel/Testing/Cxx/TransmitImageData.cxx b/Filters/Parallel/Testing/Cxx/TransmitImageData.cxx similarity index 100% rename from Parallel/Testing/Cxx/TransmitImageData.cxx rename to Filters/Parallel/Testing/Cxx/TransmitImageData.cxx diff --git a/Parallel/Testing/Cxx/TransmitImageDataRenderPass.cxx b/Filters/Parallel/Testing/Cxx/TransmitImageDataRenderPass.cxx similarity index 100% rename from Parallel/Testing/Cxx/TransmitImageDataRenderPass.cxx rename to Filters/Parallel/Testing/Cxx/TransmitImageDataRenderPass.cxx diff --git a/Parallel/Testing/Cxx/TransmitRectilinearGrid.cxx b/Filters/Parallel/Testing/Cxx/TransmitRectilinearGrid.cxx similarity index 100% rename from Parallel/Testing/Cxx/TransmitRectilinearGrid.cxx rename to Filters/Parallel/Testing/Cxx/TransmitRectilinearGrid.cxx diff --git a/Parallel/Testing/Cxx/TransmitStructuredGrid.cxx b/Filters/Parallel/Testing/Cxx/TransmitStructuredGrid.cxx similarity index 100% rename from Parallel/Testing/Cxx/TransmitStructuredGrid.cxx rename to Filters/Parallel/Testing/Cxx/TransmitStructuredGrid.cxx diff --git a/Parallel/Testing/Tcl/RectOutline.tcl b/Filters/Parallel/Testing/Tcl/RectOutline.tcl similarity index 100% rename from Parallel/Testing/Tcl/RectOutline.tcl rename to Filters/Parallel/Testing/Tcl/RectOutline.tcl diff --git a/Parallel/Testing/Tcl/TestCutMaterial.tcl b/Filters/Parallel/Testing/Tcl/TestCutMaterial.tcl similarity index 100% rename from Parallel/Testing/Tcl/TestCutMaterial.tcl rename to Filters/Parallel/Testing/Tcl/TestCutMaterial.tcl diff --git a/Parallel/Testing/Tcl/TestExtractCTHPart.tcl b/Filters/Parallel/Testing/Tcl/TestExtractCTHPart.tcl similarity index 100% rename from Parallel/Testing/Tcl/TestExtractCTHPart.tcl rename to Filters/Parallel/Testing/Tcl/TestExtractCTHPart.tcl diff --git a/Parallel/Testing/Tcl/TestExtrudePiece.tcl b/Filters/Parallel/Testing/Tcl/TestExtrudePiece.tcl similarity index 100% rename from Parallel/Testing/Tcl/TestExtrudePiece.tcl rename to Filters/Parallel/Testing/Tcl/TestExtrudePiece.tcl diff --git a/Parallel/Testing/Tcl/TestImageStreamer.tcl b/Filters/Parallel/Testing/Tcl/TestImageStreamer.tcl similarity index 100% rename from Parallel/Testing/Tcl/TestImageStreamer.tcl rename to Filters/Parallel/Testing/Tcl/TestImageStreamer.tcl diff --git a/Parallel/vtkBlockDistribution.h b/Filters/Parallel/vtkBlockDistribution.h similarity index 100% rename from Parallel/vtkBlockDistribution.h rename to Filters/Parallel/vtkBlockDistribution.h diff --git a/Parallel/vtkCachingInterpolatedVelocityField.cxx b/Filters/Parallel/vtkCachingInterpolatedVelocityField.cxx similarity index 100% rename from Parallel/vtkCachingInterpolatedVelocityField.cxx rename to Filters/Parallel/vtkCachingInterpolatedVelocityField.cxx diff --git a/Parallel/vtkCachingInterpolatedVelocityField.h b/Filters/Parallel/vtkCachingInterpolatedVelocityField.h similarity index 100% rename from Parallel/vtkCachingInterpolatedVelocityField.h rename to Filters/Parallel/vtkCachingInterpolatedVelocityField.h diff --git a/Parallel/vtkCollectGraph.cxx b/Filters/Parallel/vtkCollectGraph.cxx similarity index 100% rename from Parallel/vtkCollectGraph.cxx rename to Filters/Parallel/vtkCollectGraph.cxx diff --git a/Parallel/vtkCollectGraph.h b/Filters/Parallel/vtkCollectGraph.h similarity index 100% rename from Parallel/vtkCollectGraph.h rename to Filters/Parallel/vtkCollectGraph.h diff --git a/Parallel/vtkCollectPolyData.cxx b/Filters/Parallel/vtkCollectPolyData.cxx similarity index 100% rename from Parallel/vtkCollectPolyData.cxx rename to Filters/Parallel/vtkCollectPolyData.cxx diff --git a/Parallel/vtkCollectPolyData.h b/Filters/Parallel/vtkCollectPolyData.h similarity index 100% rename from Parallel/vtkCollectPolyData.h rename to Filters/Parallel/vtkCollectPolyData.h diff --git a/Parallel/vtkCollectTable.cxx b/Filters/Parallel/vtkCollectTable.cxx similarity index 100% rename from Parallel/vtkCollectTable.cxx rename to Filters/Parallel/vtkCollectTable.cxx diff --git a/Parallel/vtkCollectTable.h b/Filters/Parallel/vtkCollectTable.h similarity index 100% rename from Parallel/vtkCollectTable.h rename to Filters/Parallel/vtkCollectTable.h diff --git a/Parallel/vtkCutMaterial.cxx b/Filters/Parallel/vtkCutMaterial.cxx similarity index 100% rename from Parallel/vtkCutMaterial.cxx rename to Filters/Parallel/vtkCutMaterial.cxx diff --git a/Parallel/vtkCutMaterial.h b/Filters/Parallel/vtkCutMaterial.h similarity index 100% rename from Parallel/vtkCutMaterial.h rename to Filters/Parallel/vtkCutMaterial.h diff --git a/Parallel/vtkDistributedDataFilter.cxx b/Filters/Parallel/vtkDistributedDataFilter.cxx similarity index 100% rename from Parallel/vtkDistributedDataFilter.cxx rename to Filters/Parallel/vtkDistributedDataFilter.cxx diff --git a/Parallel/vtkDistributedDataFilter.h b/Filters/Parallel/vtkDistributedDataFilter.h similarity index 100% rename from Parallel/vtkDistributedDataFilter.h rename to Filters/Parallel/vtkDistributedDataFilter.h diff --git a/Parallel/vtkDistributedStreamTracer.cxx b/Filters/Parallel/vtkDistributedStreamTracer.cxx similarity index 100% rename from Parallel/vtkDistributedStreamTracer.cxx rename to Filters/Parallel/vtkDistributedStreamTracer.cxx diff --git a/Parallel/vtkDistributedStreamTracer.h b/Filters/Parallel/vtkDistributedStreamTracer.h similarity index 100% rename from Parallel/vtkDistributedStreamTracer.h rename to Filters/Parallel/vtkDistributedStreamTracer.h diff --git a/Parallel/vtkDuplicatePolyData.cxx b/Filters/Parallel/vtkDuplicatePolyData.cxx similarity index 100% rename from Parallel/vtkDuplicatePolyData.cxx rename to Filters/Parallel/vtkDuplicatePolyData.cxx diff --git a/Parallel/vtkDuplicatePolyData.h b/Filters/Parallel/vtkDuplicatePolyData.h similarity index 100% rename from Parallel/vtkDuplicatePolyData.h rename to Filters/Parallel/vtkDuplicatePolyData.h diff --git a/Parallel/vtkExtractCTHPart.cxx b/Filters/Parallel/vtkExtractCTHPart.cxx similarity index 100% rename from Parallel/vtkExtractCTHPart.cxx rename to Filters/Parallel/vtkExtractCTHPart.cxx diff --git a/Parallel/vtkExtractCTHPart.h b/Filters/Parallel/vtkExtractCTHPart.h similarity index 100% rename from Parallel/vtkExtractCTHPart.h rename to Filters/Parallel/vtkExtractCTHPart.h diff --git a/Parallel/vtkExtractPiece.cxx b/Filters/Parallel/vtkExtractPiece.cxx similarity index 100% rename from Parallel/vtkExtractPiece.cxx rename to Filters/Parallel/vtkExtractPiece.cxx diff --git a/Parallel/vtkExtractPiece.h b/Filters/Parallel/vtkExtractPiece.h similarity index 100% rename from Parallel/vtkExtractPiece.h rename to Filters/Parallel/vtkExtractPiece.h diff --git a/Parallel/vtkExtractPolyDataPiece.cxx b/Filters/Parallel/vtkExtractPolyDataPiece.cxx similarity index 100% rename from Parallel/vtkExtractPolyDataPiece.cxx rename to Filters/Parallel/vtkExtractPolyDataPiece.cxx diff --git a/Parallel/vtkExtractPolyDataPiece.h b/Filters/Parallel/vtkExtractPolyDataPiece.h similarity index 100% rename from Parallel/vtkExtractPolyDataPiece.h rename to Filters/Parallel/vtkExtractPolyDataPiece.h diff --git a/Parallel/vtkExtractUnstructuredGridPiece.cxx b/Filters/Parallel/vtkExtractUnstructuredGridPiece.cxx similarity index 100% rename from Parallel/vtkExtractUnstructuredGridPiece.cxx rename to Filters/Parallel/vtkExtractUnstructuredGridPiece.cxx diff --git a/Parallel/vtkExtractUnstructuredGridPiece.h b/Filters/Parallel/vtkExtractUnstructuredGridPiece.h similarity index 100% rename from Parallel/vtkExtractUnstructuredGridPiece.h rename to Filters/Parallel/vtkExtractUnstructuredGridPiece.h diff --git a/Parallel/vtkExtractUserDefinedPiece.cxx b/Filters/Parallel/vtkExtractUserDefinedPiece.cxx similarity index 100% rename from Parallel/vtkExtractUserDefinedPiece.cxx rename to Filters/Parallel/vtkExtractUserDefinedPiece.cxx diff --git a/Parallel/vtkExtractUserDefinedPiece.h b/Filters/Parallel/vtkExtractUserDefinedPiece.h similarity index 100% rename from Parallel/vtkExtractUserDefinedPiece.h rename to Filters/Parallel/vtkExtractUserDefinedPiece.h diff --git a/Parallel/vtkImageRenderManager.cxx b/Filters/Parallel/vtkImageRenderManager.cxx similarity index 100% rename from Parallel/vtkImageRenderManager.cxx rename to Filters/Parallel/vtkImageRenderManager.cxx diff --git a/Parallel/vtkImageRenderManager.h b/Filters/Parallel/vtkImageRenderManager.h similarity index 100% rename from Parallel/vtkImageRenderManager.h rename to Filters/Parallel/vtkImageRenderManager.h diff --git a/Parallel/vtkMemoryLimitImageDataStreamer.cxx b/Filters/Parallel/vtkMemoryLimitImageDataStreamer.cxx similarity index 100% rename from Parallel/vtkMemoryLimitImageDataStreamer.cxx rename to Filters/Parallel/vtkMemoryLimitImageDataStreamer.cxx diff --git a/Parallel/vtkMemoryLimitImageDataStreamer.h b/Filters/Parallel/vtkMemoryLimitImageDataStreamer.h similarity index 100% rename from Parallel/vtkMemoryLimitImageDataStreamer.h rename to Filters/Parallel/vtkMemoryLimitImageDataStreamer.h diff --git a/Parallel/vtkPCellDataToPointData.cxx b/Filters/Parallel/vtkPCellDataToPointData.cxx similarity index 100% rename from Parallel/vtkPCellDataToPointData.cxx rename to Filters/Parallel/vtkPCellDataToPointData.cxx diff --git a/Parallel/vtkPCellDataToPointData.h b/Filters/Parallel/vtkPCellDataToPointData.h similarity index 100% rename from Parallel/vtkPCellDataToPointData.h rename to Filters/Parallel/vtkPCellDataToPointData.h diff --git a/Parallel/vtkPCosmoHaloFinder.cxx b/Filters/Parallel/vtkPCosmoHaloFinder.cxx similarity index 100% rename from Parallel/vtkPCosmoHaloFinder.cxx rename to Filters/Parallel/vtkPCosmoHaloFinder.cxx diff --git a/Parallel/vtkPCosmoHaloFinder.h b/Filters/Parallel/vtkPCosmoHaloFinder.h similarity index 100% rename from Parallel/vtkPCosmoHaloFinder.h rename to Filters/Parallel/vtkPCosmoHaloFinder.h diff --git a/Parallel/vtkPExtractArraysOverTime.cxx b/Filters/Parallel/vtkPExtractArraysOverTime.cxx similarity index 100% rename from Parallel/vtkPExtractArraysOverTime.cxx rename to Filters/Parallel/vtkPExtractArraysOverTime.cxx diff --git a/Parallel/vtkPExtractArraysOverTime.h b/Filters/Parallel/vtkPExtractArraysOverTime.h similarity index 100% rename from Parallel/vtkPExtractArraysOverTime.h rename to Filters/Parallel/vtkPExtractArraysOverTime.h diff --git a/Parallel/vtkPKdTree.cxx b/Filters/Parallel/vtkPKdTree.cxx similarity index 100% rename from Parallel/vtkPKdTree.cxx rename to Filters/Parallel/vtkPKdTree.cxx diff --git a/Parallel/vtkPKdTree.h b/Filters/Parallel/vtkPKdTree.h similarity index 100% rename from Parallel/vtkPKdTree.h rename to Filters/Parallel/vtkPKdTree.h diff --git a/Parallel/vtkPLinearExtrusionFilter.cxx b/Filters/Parallel/vtkPLinearExtrusionFilter.cxx similarity index 100% rename from Parallel/vtkPLinearExtrusionFilter.cxx rename to Filters/Parallel/vtkPLinearExtrusionFilter.cxx diff --git a/Parallel/vtkPLinearExtrusionFilter.h b/Filters/Parallel/vtkPLinearExtrusionFilter.h similarity index 100% rename from Parallel/vtkPLinearExtrusionFilter.h rename to Filters/Parallel/vtkPLinearExtrusionFilter.h diff --git a/Parallel/vtkPMaskPoints.cxx b/Filters/Parallel/vtkPMaskPoints.cxx similarity index 100% rename from Parallel/vtkPMaskPoints.cxx rename to Filters/Parallel/vtkPMaskPoints.cxx diff --git a/Parallel/vtkPMaskPoints.h b/Filters/Parallel/vtkPMaskPoints.h similarity index 100% rename from Parallel/vtkPMaskPoints.h rename to Filters/Parallel/vtkPMaskPoints.h diff --git a/Parallel/vtkPOutlineCornerFilter.cxx b/Filters/Parallel/vtkPOutlineCornerFilter.cxx similarity index 100% rename from Parallel/vtkPOutlineCornerFilter.cxx rename to Filters/Parallel/vtkPOutlineCornerFilter.cxx diff --git a/Parallel/vtkPOutlineCornerFilter.h b/Filters/Parallel/vtkPOutlineCornerFilter.h similarity index 100% rename from Parallel/vtkPOutlineCornerFilter.h rename to Filters/Parallel/vtkPOutlineCornerFilter.h diff --git a/Parallel/vtkPOutlineFilter.cxx b/Filters/Parallel/vtkPOutlineFilter.cxx similarity index 100% rename from Parallel/vtkPOutlineFilter.cxx rename to Filters/Parallel/vtkPOutlineFilter.cxx diff --git a/Parallel/vtkPOutlineFilter.h b/Filters/Parallel/vtkPOutlineFilter.h similarity index 100% rename from Parallel/vtkPOutlineFilter.h rename to Filters/Parallel/vtkPOutlineFilter.h diff --git a/Parallel/vtkPPolyDataNormals.cxx b/Filters/Parallel/vtkPPolyDataNormals.cxx similarity index 100% rename from Parallel/vtkPPolyDataNormals.cxx rename to Filters/Parallel/vtkPPolyDataNormals.cxx diff --git a/Parallel/vtkPPolyDataNormals.h b/Filters/Parallel/vtkPPolyDataNormals.h similarity index 100% rename from Parallel/vtkPPolyDataNormals.h rename to Filters/Parallel/vtkPPolyDataNormals.h diff --git a/Parallel/vtkPProbeFilter.cxx b/Filters/Parallel/vtkPProbeFilter.cxx similarity index 100% rename from Parallel/vtkPProbeFilter.cxx rename to Filters/Parallel/vtkPProbeFilter.cxx diff --git a/Parallel/vtkPProbeFilter.h b/Filters/Parallel/vtkPProbeFilter.h similarity index 100% rename from Parallel/vtkPProbeFilter.h rename to Filters/Parallel/vtkPProbeFilter.h diff --git a/Parallel/vtkPReflectionFilter.cxx b/Filters/Parallel/vtkPReflectionFilter.cxx similarity index 100% rename from Parallel/vtkPReflectionFilter.cxx rename to Filters/Parallel/vtkPReflectionFilter.cxx diff --git a/Parallel/vtkPReflectionFilter.h b/Filters/Parallel/vtkPReflectionFilter.h similarity index 100% rename from Parallel/vtkPReflectionFilter.h rename to Filters/Parallel/vtkPReflectionFilter.h diff --git a/Parallel/vtkPSphereSource.cxx b/Filters/Parallel/vtkPSphereSource.cxx similarity index 100% rename from Parallel/vtkPSphereSource.cxx rename to Filters/Parallel/vtkPSphereSource.cxx diff --git a/Parallel/vtkPSphereSource.h b/Filters/Parallel/vtkPSphereSource.h similarity index 100% rename from Parallel/vtkPSphereSource.h rename to Filters/Parallel/vtkPSphereSource.h diff --git a/Parallel/vtkPStreamTracer.cxx b/Filters/Parallel/vtkPStreamTracer.cxx similarity index 100% rename from Parallel/vtkPStreamTracer.cxx rename to Filters/Parallel/vtkPStreamTracer.cxx diff --git a/Parallel/vtkPStreamTracer.h b/Filters/Parallel/vtkPStreamTracer.h similarity index 100% rename from Parallel/vtkPStreamTracer.h rename to Filters/Parallel/vtkPStreamTracer.h diff --git a/Parallel/vtkPTableToStructuredGrid.cxx b/Filters/Parallel/vtkPTableToStructuredGrid.cxx similarity index 100% rename from Parallel/vtkPTableToStructuredGrid.cxx rename to Filters/Parallel/vtkPTableToStructuredGrid.cxx diff --git a/Parallel/vtkPTableToStructuredGrid.h b/Filters/Parallel/vtkPTableToStructuredGrid.h similarity index 100% rename from Parallel/vtkPTableToStructuredGrid.h rename to Filters/Parallel/vtkPTableToStructuredGrid.h diff --git a/Parallel/vtkPYoungsMaterialInterface.cxx b/Filters/Parallel/vtkPYoungsMaterialInterface.cxx similarity index 100% rename from Parallel/vtkPYoungsMaterialInterface.cxx rename to Filters/Parallel/vtkPYoungsMaterialInterface.cxx diff --git a/Parallel/vtkPYoungsMaterialInterface.h b/Filters/Parallel/vtkPYoungsMaterialInterface.h similarity index 100% rename from Parallel/vtkPYoungsMaterialInterface.h rename to Filters/Parallel/vtkPYoungsMaterialInterface.h diff --git a/Parallel/vtkPassThroughFilter.cxx b/Filters/Parallel/vtkPassThroughFilter.cxx similarity index 100% rename from Parallel/vtkPassThroughFilter.cxx rename to Filters/Parallel/vtkPassThroughFilter.cxx diff --git a/Parallel/vtkPassThroughFilter.h b/Filters/Parallel/vtkPassThroughFilter.h similarity index 100% rename from Parallel/vtkPassThroughFilter.h rename to Filters/Parallel/vtkPassThroughFilter.h diff --git a/Parallel/vtkPieceRequestFilter.cxx b/Filters/Parallel/vtkPieceRequestFilter.cxx similarity index 100% rename from Parallel/vtkPieceRequestFilter.cxx rename to Filters/Parallel/vtkPieceRequestFilter.cxx diff --git a/Parallel/vtkPieceRequestFilter.h b/Filters/Parallel/vtkPieceRequestFilter.h similarity index 100% rename from Parallel/vtkPieceRequestFilter.h rename to Filters/Parallel/vtkPieceRequestFilter.h diff --git a/Parallel/vtkPieceScalars.cxx b/Filters/Parallel/vtkPieceScalars.cxx similarity index 100% rename from Parallel/vtkPieceScalars.cxx rename to Filters/Parallel/vtkPieceScalars.cxx diff --git a/Parallel/vtkPieceScalars.h b/Filters/Parallel/vtkPieceScalars.h similarity index 100% rename from Parallel/vtkPieceScalars.h rename to Filters/Parallel/vtkPieceScalars.h diff --git a/Parallel/vtkPipelineSize.cxx b/Filters/Parallel/vtkPipelineSize.cxx similarity index 100% rename from Parallel/vtkPipelineSize.cxx rename to Filters/Parallel/vtkPipelineSize.cxx diff --git a/Parallel/vtkPipelineSize.h b/Filters/Parallel/vtkPipelineSize.h similarity index 100% rename from Parallel/vtkPipelineSize.h rename to Filters/Parallel/vtkPipelineSize.h diff --git a/Parallel/vtkProcessIdScalars.cxx b/Filters/Parallel/vtkProcessIdScalars.cxx similarity index 100% rename from Parallel/vtkProcessIdScalars.cxx rename to Filters/Parallel/vtkProcessIdScalars.cxx diff --git a/Parallel/vtkProcessIdScalars.h b/Filters/Parallel/vtkProcessIdScalars.h similarity index 100% rename from Parallel/vtkProcessIdScalars.h rename to Filters/Parallel/vtkProcessIdScalars.h diff --git a/Parallel/vtkRectilinearGridOutlineFilter.cxx b/Filters/Parallel/vtkRectilinearGridOutlineFilter.cxx similarity index 100% rename from Parallel/vtkRectilinearGridOutlineFilter.cxx rename to Filters/Parallel/vtkRectilinearGridOutlineFilter.cxx diff --git a/Parallel/vtkRectilinearGridOutlineFilter.h b/Filters/Parallel/vtkRectilinearGridOutlineFilter.h similarity index 100% rename from Parallel/vtkRectilinearGridOutlineFilter.h rename to Filters/Parallel/vtkRectilinearGridOutlineFilter.h diff --git a/Parallel/vtkTemporalFractal.cxx b/Filters/Parallel/vtkTemporalFractal.cxx similarity index 100% rename from Parallel/vtkTemporalFractal.cxx rename to Filters/Parallel/vtkTemporalFractal.cxx diff --git a/Parallel/vtkTemporalFractal.h b/Filters/Parallel/vtkTemporalFractal.h similarity index 100% rename from Parallel/vtkTemporalFractal.h rename to Filters/Parallel/vtkTemporalFractal.h diff --git a/Parallel/vtkTemporalInterpolatedVelocityField.cxx b/Filters/Parallel/vtkTemporalInterpolatedVelocityField.cxx similarity index 100% rename from Parallel/vtkTemporalInterpolatedVelocityField.cxx rename to Filters/Parallel/vtkTemporalInterpolatedVelocityField.cxx diff --git a/Parallel/vtkTemporalInterpolatedVelocityField.h b/Filters/Parallel/vtkTemporalInterpolatedVelocityField.h similarity index 100% rename from Parallel/vtkTemporalInterpolatedVelocityField.h rename to Filters/Parallel/vtkTemporalInterpolatedVelocityField.h diff --git a/Parallel/vtkTemporalStreamTracer.cxx b/Filters/Parallel/vtkTemporalStreamTracer.cxx similarity index 100% rename from Parallel/vtkTemporalStreamTracer.cxx rename to Filters/Parallel/vtkTemporalStreamTracer.cxx diff --git a/Parallel/vtkTemporalStreamTracer.h b/Filters/Parallel/vtkTemporalStreamTracer.h similarity index 100% rename from Parallel/vtkTemporalStreamTracer.h rename to Filters/Parallel/vtkTemporalStreamTracer.h diff --git a/Parallel/vtkTransmitImageDataPiece.cxx b/Filters/Parallel/vtkTransmitImageDataPiece.cxx similarity index 100% rename from Parallel/vtkTransmitImageDataPiece.cxx rename to Filters/Parallel/vtkTransmitImageDataPiece.cxx diff --git a/Parallel/vtkTransmitImageDataPiece.h b/Filters/Parallel/vtkTransmitImageDataPiece.h similarity index 100% rename from Parallel/vtkTransmitImageDataPiece.h rename to Filters/Parallel/vtkTransmitImageDataPiece.h diff --git a/Parallel/vtkTransmitPolyDataPiece.cxx b/Filters/Parallel/vtkTransmitPolyDataPiece.cxx similarity index 100% rename from Parallel/vtkTransmitPolyDataPiece.cxx rename to Filters/Parallel/vtkTransmitPolyDataPiece.cxx diff --git a/Parallel/vtkTransmitPolyDataPiece.h b/Filters/Parallel/vtkTransmitPolyDataPiece.h similarity index 100% rename from Parallel/vtkTransmitPolyDataPiece.h rename to Filters/Parallel/vtkTransmitPolyDataPiece.h diff --git a/Parallel/vtkTransmitRectilinearGridPiece.cxx b/Filters/Parallel/vtkTransmitRectilinearGridPiece.cxx similarity index 100% rename from Parallel/vtkTransmitRectilinearGridPiece.cxx rename to Filters/Parallel/vtkTransmitRectilinearGridPiece.cxx diff --git a/Parallel/vtkTransmitRectilinearGridPiece.h b/Filters/Parallel/vtkTransmitRectilinearGridPiece.h similarity index 100% rename from Parallel/vtkTransmitRectilinearGridPiece.h rename to Filters/Parallel/vtkTransmitRectilinearGridPiece.h diff --git a/Parallel/vtkTransmitStructuredGridPiece.cxx b/Filters/Parallel/vtkTransmitStructuredGridPiece.cxx similarity index 100% rename from Parallel/vtkTransmitStructuredGridPiece.cxx rename to Filters/Parallel/vtkTransmitStructuredGridPiece.cxx diff --git a/Parallel/vtkTransmitStructuredGridPiece.h b/Filters/Parallel/vtkTransmitStructuredGridPiece.h similarity index 100% rename from Parallel/vtkTransmitStructuredGridPiece.h rename to Filters/Parallel/vtkTransmitStructuredGridPiece.h diff --git a/Parallel/vtkTransmitUnstructuredGridPiece.cxx b/Filters/Parallel/vtkTransmitUnstructuredGridPiece.cxx similarity index 100% rename from Parallel/vtkTransmitUnstructuredGridPiece.cxx rename to Filters/Parallel/vtkTransmitUnstructuredGridPiece.cxx diff --git a/Parallel/vtkTransmitUnstructuredGridPiece.h b/Filters/Parallel/vtkTransmitUnstructuredGridPiece.h similarity index 100% rename from Parallel/vtkTransmitUnstructuredGridPiece.h rename to Filters/Parallel/vtkTransmitUnstructuredGridPiece.h diff --git a/Parallel/Testing/Cxx/TestPStructuredGridConnectivity.cxx b/Filters/ParallelGeometry/Testing/Cxx/TestPStructuredGridConnectivity.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestPStructuredGridConnectivity.cxx rename to Filters/ParallelGeometry/Testing/Cxx/TestPStructuredGridConnectivity.cxx diff --git a/Parallel/Testing/Cxx/TestPStructuredGridGhostDataGenerator.cxx b/Filters/ParallelGeometry/Testing/Cxx/TestPStructuredGridGhostDataGenerator.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestPStructuredGridGhostDataGenerator.cxx rename to Filters/ParallelGeometry/Testing/Cxx/TestPStructuredGridGhostDataGenerator.cxx diff --git a/Parallel/Testing/Cxx/TestPUniformGridGhostDataGenerator.cxx b/Filters/ParallelGeometry/Testing/Cxx/TestPUniformGridGhostDataGenerator.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestPUniformGridGhostDataGenerator.cxx rename to Filters/ParallelGeometry/Testing/Cxx/TestPUniformGridGhostDataGenerator.cxx diff --git a/Parallel/vtkPDataSetGhostGenerator.cxx b/Filters/ParallelGeometry/vtkPDataSetGhostGenerator.cxx similarity index 100% rename from Parallel/vtkPDataSetGhostGenerator.cxx rename to Filters/ParallelGeometry/vtkPDataSetGhostGenerator.cxx diff --git a/Parallel/vtkPDataSetGhostGenerator.h b/Filters/ParallelGeometry/vtkPDataSetGhostGenerator.h similarity index 100% rename from Parallel/vtkPDataSetGhostGenerator.h rename to Filters/ParallelGeometry/vtkPDataSetGhostGenerator.h diff --git a/Parallel/vtkPStructuredGridConnectivity.cxx b/Filters/ParallelGeometry/vtkPStructuredGridConnectivity.cxx similarity index 100% rename from Parallel/vtkPStructuredGridConnectivity.cxx rename to Filters/ParallelGeometry/vtkPStructuredGridConnectivity.cxx diff --git a/Parallel/vtkPStructuredGridConnectivity.h b/Filters/ParallelGeometry/vtkPStructuredGridConnectivity.h similarity index 100% rename from Parallel/vtkPStructuredGridConnectivity.h rename to Filters/ParallelGeometry/vtkPStructuredGridConnectivity.h diff --git a/Parallel/vtkPStructuredGridGhostDataGenerator.cxx b/Filters/ParallelGeometry/vtkPStructuredGridGhostDataGenerator.cxx similarity index 100% rename from Parallel/vtkPStructuredGridGhostDataGenerator.cxx rename to Filters/ParallelGeometry/vtkPStructuredGridGhostDataGenerator.cxx diff --git a/Parallel/vtkPStructuredGridGhostDataGenerator.h b/Filters/ParallelGeometry/vtkPStructuredGridGhostDataGenerator.h similarity index 100% rename from Parallel/vtkPStructuredGridGhostDataGenerator.h rename to Filters/ParallelGeometry/vtkPStructuredGridGhostDataGenerator.h diff --git a/Parallel/vtkPUniformGridGhostDataGenerator.cxx b/Filters/ParallelGeometry/vtkPUniformGridGhostDataGenerator.cxx similarity index 100% rename from Parallel/vtkPUniformGridGhostDataGenerator.cxx rename to Filters/ParallelGeometry/vtkPUniformGridGhostDataGenerator.cxx diff --git a/Parallel/vtkPUniformGridGhostDataGenerator.h b/Filters/ParallelGeometry/vtkPUniformGridGhostDataGenerator.h similarity index 100% rename from Parallel/vtkPUniformGridGhostDataGenerator.h rename to Filters/ParallelGeometry/vtkPUniformGridGhostDataGenerator.h diff --git a/Infovis/vtkPComputeHistogram2DOutliers.cxx b/Filters/ParallelImaging/vtkPComputeHistogram2DOutliers.cxx similarity index 100% rename from Infovis/vtkPComputeHistogram2DOutliers.cxx rename to Filters/ParallelImaging/vtkPComputeHistogram2DOutliers.cxx diff --git a/Infovis/vtkPComputeHistogram2DOutliers.h b/Filters/ParallelImaging/vtkPComputeHistogram2DOutliers.h similarity index 100% rename from Infovis/vtkPComputeHistogram2DOutliers.h rename to Filters/ParallelImaging/vtkPComputeHistogram2DOutliers.h diff --git a/Infovis/vtkPExtractHistogram2D.cxx b/Filters/ParallelImaging/vtkPExtractHistogram2D.cxx similarity index 100% rename from Infovis/vtkPExtractHistogram2D.cxx rename to Filters/ParallelImaging/vtkPExtractHistogram2D.cxx diff --git a/Infovis/vtkPExtractHistogram2D.h b/Filters/ParallelImaging/vtkPExtractHistogram2D.h similarity index 100% rename from Infovis/vtkPExtractHistogram2D.h rename to Filters/ParallelImaging/vtkPExtractHistogram2D.h diff --git a/Infovis/vtkPPairwiseExtractHistogram2D.cxx b/Filters/ParallelImaging/vtkPPairwiseExtractHistogram2D.cxx similarity index 100% rename from Infovis/vtkPPairwiseExtractHistogram2D.cxx rename to Filters/ParallelImaging/vtkPPairwiseExtractHistogram2D.cxx diff --git a/Infovis/vtkPPairwiseExtractHistogram2D.h b/Filters/ParallelImaging/vtkPPairwiseExtractHistogram2D.h similarity index 100% rename from Infovis/vtkPPairwiseExtractHistogram2D.h rename to Filters/ParallelImaging/vtkPPairwiseExtractHistogram2D.h diff --git a/Infovis/Testing/Cxx/TestRandomPContingencyStatisticsMPI.cxx b/Filters/ParallelStatistics/Testing/Cxx/TestRandomPContingencyStatisticsMPI.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestRandomPContingencyStatisticsMPI.cxx rename to Filters/ParallelStatistics/Testing/Cxx/TestRandomPContingencyStatisticsMPI.cxx diff --git a/Infovis/Testing/Cxx/TestRandomPKMeansStatisticsMPI.cxx b/Filters/ParallelStatistics/Testing/Cxx/TestRandomPKMeansStatisticsMPI.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestRandomPKMeansStatisticsMPI.cxx rename to Filters/ParallelStatistics/Testing/Cxx/TestRandomPKMeansStatisticsMPI.cxx diff --git a/Infovis/Testing/Cxx/TestRandomPMomentStatisticsMPI.cxx b/Filters/ParallelStatistics/Testing/Cxx/TestRandomPMomentStatisticsMPI.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestRandomPMomentStatisticsMPI.cxx rename to Filters/ParallelStatistics/Testing/Cxx/TestRandomPMomentStatisticsMPI.cxx diff --git a/Infovis/Testing/Cxx/TestRandomPOrderStatisticsMPI.cxx b/Filters/ParallelStatistics/Testing/Cxx/TestRandomPOrderStatisticsMPI.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestRandomPOrderStatisticsMPI.cxx rename to Filters/ParallelStatistics/Testing/Cxx/TestRandomPOrderStatisticsMPI.cxx diff --git a/Infovis/Testing/Cxx/TestRealDataPDescriptiveStatisticsMPI.cxx b/Filters/ParallelStatistics/Testing/Cxx/TestRealDataPDescriptiveStatisticsMPI.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestRealDataPDescriptiveStatisticsMPI.cxx rename to Filters/ParallelStatistics/Testing/Cxx/TestRealDataPDescriptiveStatisticsMPI.cxx diff --git a/Infovis/vtkPBivariateLinearTableThreshold.cxx b/Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.cxx similarity index 100% rename from Infovis/vtkPBivariateLinearTableThreshold.cxx rename to Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.cxx diff --git a/Infovis/vtkPBivariateLinearTableThreshold.h b/Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.h similarity index 100% rename from Infovis/vtkPBivariateLinearTableThreshold.h rename to Filters/ParallelStatistics/vtkPBivariateLinearTableThreshold.h diff --git a/Infovis/vtkPContingencyStatistics.cxx b/Filters/ParallelStatistics/vtkPContingencyStatistics.cxx similarity index 100% rename from Infovis/vtkPContingencyStatistics.cxx rename to Filters/ParallelStatistics/vtkPContingencyStatistics.cxx diff --git a/Infovis/vtkPContingencyStatistics.h b/Filters/ParallelStatistics/vtkPContingencyStatistics.h similarity index 100% rename from Infovis/vtkPContingencyStatistics.h rename to Filters/ParallelStatistics/vtkPContingencyStatistics.h diff --git a/Infovis/vtkPCorrelativeStatistics.cxx b/Filters/ParallelStatistics/vtkPCorrelativeStatistics.cxx similarity index 100% rename from Infovis/vtkPCorrelativeStatistics.cxx rename to Filters/ParallelStatistics/vtkPCorrelativeStatistics.cxx diff --git a/Infovis/vtkPCorrelativeStatistics.h b/Filters/ParallelStatistics/vtkPCorrelativeStatistics.h similarity index 100% rename from Infovis/vtkPCorrelativeStatistics.h rename to Filters/ParallelStatistics/vtkPCorrelativeStatistics.h diff --git a/Infovis/vtkPDescriptiveStatistics.cxx b/Filters/ParallelStatistics/vtkPDescriptiveStatistics.cxx similarity index 100% rename from Infovis/vtkPDescriptiveStatistics.cxx rename to Filters/ParallelStatistics/vtkPDescriptiveStatistics.cxx diff --git a/Infovis/vtkPDescriptiveStatistics.h b/Filters/ParallelStatistics/vtkPDescriptiveStatistics.h similarity index 100% rename from Infovis/vtkPDescriptiveStatistics.h rename to Filters/ParallelStatistics/vtkPDescriptiveStatistics.h diff --git a/Infovis/vtkPKMeansStatistics.cxx b/Filters/ParallelStatistics/vtkPKMeansStatistics.cxx similarity index 100% rename from Infovis/vtkPKMeansStatistics.cxx rename to Filters/ParallelStatistics/vtkPKMeansStatistics.cxx diff --git a/Infovis/vtkPKMeansStatistics.h b/Filters/ParallelStatistics/vtkPKMeansStatistics.h similarity index 100% rename from Infovis/vtkPKMeansStatistics.h rename to Filters/ParallelStatistics/vtkPKMeansStatistics.h diff --git a/Infovis/vtkPMultiCorrelativeStatistics.cxx b/Filters/ParallelStatistics/vtkPMultiCorrelativeStatistics.cxx similarity index 100% rename from Infovis/vtkPMultiCorrelativeStatistics.cxx rename to Filters/ParallelStatistics/vtkPMultiCorrelativeStatistics.cxx diff --git a/Infovis/vtkPMultiCorrelativeStatistics.h b/Filters/ParallelStatistics/vtkPMultiCorrelativeStatistics.h similarity index 100% rename from Infovis/vtkPMultiCorrelativeStatistics.h rename to Filters/ParallelStatistics/vtkPMultiCorrelativeStatistics.h diff --git a/Infovis/vtkPOrderStatistics.cxx b/Filters/ParallelStatistics/vtkPOrderStatistics.cxx similarity index 100% rename from Infovis/vtkPOrderStatistics.cxx rename to Filters/ParallelStatistics/vtkPOrderStatistics.cxx diff --git a/Infovis/vtkPOrderStatistics.h b/Filters/ParallelStatistics/vtkPOrderStatistics.h similarity index 100% rename from Infovis/vtkPOrderStatistics.h rename to Filters/ParallelStatistics/vtkPOrderStatistics.h diff --git a/Infovis/vtkPPCAStatistics.cxx b/Filters/ParallelStatistics/vtkPPCAStatistics.cxx similarity index 100% rename from Infovis/vtkPPCAStatistics.cxx rename to Filters/ParallelStatistics/vtkPPCAStatistics.cxx diff --git a/Infovis/vtkPPCAStatistics.h b/Filters/ParallelStatistics/vtkPPCAStatistics.h similarity index 100% rename from Infovis/vtkPPCAStatistics.h rename to Filters/ParallelStatistics/vtkPPCAStatistics.h diff --git a/Graphics/Testing/Tcl/MultidimensionalSolution.tcl b/Filters/Programmable/Testing/Tcl/MultidimensionalSolution.tcl similarity index 100% rename from Graphics/Testing/Tcl/MultidimensionalSolution.tcl rename to Filters/Programmable/Testing/Tcl/MultidimensionalSolution.tcl diff --git a/Graphics/Testing/Tcl/progGlyphs.tcl b/Filters/Programmable/Testing/Tcl/progGlyphs.tcl similarity index 100% rename from Graphics/Testing/Tcl/progGlyphs.tcl rename to Filters/Programmable/Testing/Tcl/progGlyphs.tcl diff --git a/Graphics/Testing/Tcl/progGlyphsBySource.tcl b/Filters/Programmable/Testing/Tcl/progGlyphsBySource.tcl similarity index 100% rename from Graphics/Testing/Tcl/progGlyphsBySource.tcl rename to Filters/Programmable/Testing/Tcl/progGlyphsBySource.tcl diff --git a/Graphics/vtkProgrammableAttributeDataFilter.cxx b/Filters/Programmable/vtkProgrammableAttributeDataFilter.cxx similarity index 100% rename from Graphics/vtkProgrammableAttributeDataFilter.cxx rename to Filters/Programmable/vtkProgrammableAttributeDataFilter.cxx diff --git a/Graphics/vtkProgrammableAttributeDataFilter.h b/Filters/Programmable/vtkProgrammableAttributeDataFilter.h similarity index 100% rename from Graphics/vtkProgrammableAttributeDataFilter.h rename to Filters/Programmable/vtkProgrammableAttributeDataFilter.h diff --git a/Graphics/vtkProgrammableFilter.cxx b/Filters/Programmable/vtkProgrammableFilter.cxx similarity index 100% rename from Graphics/vtkProgrammableFilter.cxx rename to Filters/Programmable/vtkProgrammableFilter.cxx diff --git a/Graphics/vtkProgrammableFilter.h b/Filters/Programmable/vtkProgrammableFilter.h similarity index 100% rename from Graphics/vtkProgrammableFilter.h rename to Filters/Programmable/vtkProgrammableFilter.h diff --git a/Graphics/vtkProgrammableGlyphFilter.cxx b/Filters/Programmable/vtkProgrammableGlyphFilter.cxx similarity index 100% rename from Graphics/vtkProgrammableGlyphFilter.cxx rename to Filters/Programmable/vtkProgrammableGlyphFilter.cxx diff --git a/Graphics/vtkProgrammableGlyphFilter.h b/Filters/Programmable/vtkProgrammableGlyphFilter.h similarity index 100% rename from Graphics/vtkProgrammableGlyphFilter.h rename to Filters/Programmable/vtkProgrammableGlyphFilter.h diff --git a/Graphics/Testing/Cxx/TestReebGraph.cxx b/Filters/ReebGraph/Testing/Cxx/TestReebGraph.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestReebGraph.cxx rename to Filters/ReebGraph/Testing/Cxx/TestReebGraph.cxx diff --git a/Graphics/vtkReebGraphSimplificationFilter.cxx b/Filters/ReebGraph/vtkReebGraphSimplificationFilter.cxx similarity index 100% rename from Graphics/vtkReebGraphSimplificationFilter.cxx rename to Filters/ReebGraph/vtkReebGraphSimplificationFilter.cxx diff --git a/Graphics/vtkReebGraphSimplificationFilter.h b/Filters/ReebGraph/vtkReebGraphSimplificationFilter.h similarity index 100% rename from Graphics/vtkReebGraphSimplificationFilter.h rename to Filters/ReebGraph/vtkReebGraphSimplificationFilter.h diff --git a/Graphics/vtkReebGraphSurfaceSkeletonFilter.cxx b/Filters/ReebGraph/vtkReebGraphSurfaceSkeletonFilter.cxx similarity index 100% rename from Graphics/vtkReebGraphSurfaceSkeletonFilter.cxx rename to Filters/ReebGraph/vtkReebGraphSurfaceSkeletonFilter.cxx diff --git a/Graphics/vtkReebGraphSurfaceSkeletonFilter.h b/Filters/ReebGraph/vtkReebGraphSurfaceSkeletonFilter.h similarity index 100% rename from Graphics/vtkReebGraphSurfaceSkeletonFilter.h rename to Filters/ReebGraph/vtkReebGraphSurfaceSkeletonFilter.h diff --git a/Graphics/vtkReebGraphToJoinSplitTreeFilter.cxx b/Filters/ReebGraph/vtkReebGraphToJoinSplitTreeFilter.cxx similarity index 100% rename from Graphics/vtkReebGraphToJoinSplitTreeFilter.cxx rename to Filters/ReebGraph/vtkReebGraphToJoinSplitTreeFilter.cxx diff --git a/Graphics/vtkReebGraphToJoinSplitTreeFilter.h b/Filters/ReebGraph/vtkReebGraphToJoinSplitTreeFilter.h similarity index 100% rename from Graphics/vtkReebGraphToJoinSplitTreeFilter.h rename to Filters/ReebGraph/vtkReebGraphToJoinSplitTreeFilter.h diff --git a/Graphics/vtkReebGraphVolumeSkeletonFilter.cxx b/Filters/ReebGraph/vtkReebGraphVolumeSkeletonFilter.cxx similarity index 100% rename from Graphics/vtkReebGraphVolumeSkeletonFilter.cxx rename to Filters/ReebGraph/vtkReebGraphVolumeSkeletonFilter.cxx diff --git a/Graphics/vtkReebGraphVolumeSkeletonFilter.h b/Filters/ReebGraph/vtkReebGraphVolumeSkeletonFilter.h similarity index 100% rename from Graphics/vtkReebGraphVolumeSkeletonFilter.h rename to Filters/ReebGraph/vtkReebGraphVolumeSkeletonFilter.h diff --git a/Graphics/vtkUnstructuredGridToReebGraphFilter.cxx b/Filters/ReebGraph/vtkUnstructuredGridToReebGraphFilter.cxx similarity index 100% rename from Graphics/vtkUnstructuredGridToReebGraphFilter.cxx rename to Filters/ReebGraph/vtkUnstructuredGridToReebGraphFilter.cxx diff --git a/Graphics/vtkUnstructuredGridToReebGraphFilter.h b/Filters/ReebGraph/vtkUnstructuredGridToReebGraphFilter.h similarity index 100% rename from Graphics/vtkUnstructuredGridToReebGraphFilter.h rename to Filters/ReebGraph/vtkUnstructuredGridToReebGraphFilter.h diff --git a/Infovis/Testing/Cxx/ArrayAPIDenseCoordinates.cxx b/Filters/Sources/Testing/Cxx/ArrayAPIDenseCoordinates.cxx similarity index 100% rename from Infovis/Testing/Cxx/ArrayAPIDenseCoordinates.cxx rename to Filters/Sources/Testing/Cxx/ArrayAPIDenseCoordinates.cxx diff --git a/Infovis/Testing/Cxx/ArrayDiagonalMatrixSource.cxx b/Filters/Sources/Testing/Cxx/ArrayDiagonalMatrixSource.cxx similarity index 100% rename from Infovis/Testing/Cxx/ArrayDiagonalMatrixSource.cxx rename to Filters/Sources/Testing/Cxx/ArrayDiagonalMatrixSource.cxx diff --git a/Graphics/Testing/Cxx/TestLineSource.cxx b/Filters/Sources/Testing/Cxx/TestLineSource.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestLineSource.cxx rename to Filters/Sources/Testing/Cxx/TestLineSource.cxx diff --git a/Graphics/Testing/Cxx/TestTessellatedBoxSource.cxx b/Filters/Sources/Testing/Cxx/TestTessellatedBoxSource.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestTessellatedBoxSource.cxx rename to Filters/Sources/Testing/Cxx/TestTessellatedBoxSource.cxx diff --git a/Graphics/Testing/Tcl/Disk.tcl b/Filters/Sources/Testing/Tcl/Disk.tcl similarity index 100% rename from Graphics/Testing/Tcl/Disk.tcl rename to Filters/Sources/Testing/Tcl/Disk.tcl diff --git a/Graphics/Testing/Tcl/OSCone.tcl b/Filters/Sources/Testing/Tcl/OSCone.tcl similarity index 100% rename from Graphics/Testing/Tcl/OSCone.tcl rename to Filters/Sources/Testing/Tcl/OSCone.tcl diff --git a/Graphics/Testing/Tcl/TestButtonSource.tcl b/Filters/Sources/Testing/Tcl/TestButtonSource.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestButtonSource.tcl rename to Filters/Sources/Testing/Tcl/TestButtonSource.tcl diff --git a/Graphics/Testing/Tcl/TestParametricFunctions.tcl b/Filters/Sources/Testing/Tcl/TestParametricFunctions.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestParametricFunctions.tcl rename to Filters/Sources/Testing/Tcl/TestParametricFunctions.tcl diff --git a/Graphics/Testing/Tcl/TestPlatonicSolids.tcl b/Filters/Sources/Testing/Tcl/TestPlatonicSolids.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestPlatonicSolids.tcl rename to Filters/Sources/Testing/Tcl/TestPlatonicSolids.tcl diff --git a/Graphics/Testing/Tcl/TestRegularPolygonSource.tcl b/Filters/Sources/Testing/Tcl/TestRegularPolygonSource.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestRegularPolygonSource.tcl rename to Filters/Sources/Testing/Tcl/TestRegularPolygonSource.tcl diff --git a/Graphics/Testing/Tcl/coneResolution.tcl b/Filters/Sources/Testing/Tcl/coneResolution.tcl similarity index 100% rename from Graphics/Testing/Tcl/coneResolution.tcl rename to Filters/Sources/Testing/Tcl/coneResolution.tcl diff --git a/Graphics/Testing/Tcl/glyph2D.tcl b/Filters/Sources/Testing/Tcl/glyph2D.tcl similarity index 100% rename from Graphics/Testing/Tcl/glyph2D.tcl rename to Filters/Sources/Testing/Tcl/glyph2D.tcl diff --git a/Filtering/Testing/Tcl/squadViewer.tcl b/Filters/Sources/Testing/Tcl/squadViewer.tcl similarity index 100% rename from Filtering/Testing/Tcl/squadViewer.tcl rename to Filters/Sources/Testing/Tcl/squadViewer.tcl diff --git a/Graphics/vtkArcSource.cxx b/Filters/Sources/vtkArcSource.cxx similarity index 100% rename from Graphics/vtkArcSource.cxx rename to Filters/Sources/vtkArcSource.cxx diff --git a/Graphics/vtkArcSource.h b/Filters/Sources/vtkArcSource.h similarity index 100% rename from Graphics/vtkArcSource.h rename to Filters/Sources/vtkArcSource.h diff --git a/Graphics/vtkArrowSource.cxx b/Filters/Sources/vtkArrowSource.cxx similarity index 100% rename from Graphics/vtkArrowSource.cxx rename to Filters/Sources/vtkArrowSource.cxx diff --git a/Graphics/vtkArrowSource.h b/Filters/Sources/vtkArrowSource.h similarity index 100% rename from Graphics/vtkArrowSource.h rename to Filters/Sources/vtkArrowSource.h diff --git a/Graphics/vtkButtonSource.cxx b/Filters/Sources/vtkButtonSource.cxx similarity index 100% rename from Graphics/vtkButtonSource.cxx rename to Filters/Sources/vtkButtonSource.cxx diff --git a/Graphics/vtkButtonSource.h b/Filters/Sources/vtkButtonSource.h similarity index 100% rename from Graphics/vtkButtonSource.h rename to Filters/Sources/vtkButtonSource.h diff --git a/Graphics/vtkConeSource.cxx b/Filters/Sources/vtkConeSource.cxx similarity index 100% rename from Graphics/vtkConeSource.cxx rename to Filters/Sources/vtkConeSource.cxx diff --git a/Graphics/vtkConeSource.h b/Filters/Sources/vtkConeSource.h similarity index 100% rename from Graphics/vtkConeSource.h rename to Filters/Sources/vtkConeSource.h diff --git a/Graphics/vtkCubeSource.cxx b/Filters/Sources/vtkCubeSource.cxx similarity index 100% rename from Graphics/vtkCubeSource.cxx rename to Filters/Sources/vtkCubeSource.cxx diff --git a/Graphics/vtkCubeSource.h b/Filters/Sources/vtkCubeSource.h similarity index 100% rename from Graphics/vtkCubeSource.h rename to Filters/Sources/vtkCubeSource.h diff --git a/Graphics/vtkCylinderSource.cxx b/Filters/Sources/vtkCylinderSource.cxx similarity index 100% rename from Graphics/vtkCylinderSource.cxx rename to Filters/Sources/vtkCylinderSource.cxx diff --git a/Graphics/vtkCylinderSource.h b/Filters/Sources/vtkCylinderSource.h similarity index 100% rename from Graphics/vtkCylinderSource.h rename to Filters/Sources/vtkCylinderSource.h diff --git a/Infovis/vtkDiagonalMatrixSource.cxx b/Filters/Sources/vtkDiagonalMatrixSource.cxx similarity index 100% rename from Infovis/vtkDiagonalMatrixSource.cxx rename to Filters/Sources/vtkDiagonalMatrixSource.cxx diff --git a/Infovis/vtkDiagonalMatrixSource.h b/Filters/Sources/vtkDiagonalMatrixSource.h similarity index 100% rename from Infovis/vtkDiagonalMatrixSource.h rename to Filters/Sources/vtkDiagonalMatrixSource.h diff --git a/Graphics/vtkDiskSource.cxx b/Filters/Sources/vtkDiskSource.cxx similarity index 100% rename from Graphics/vtkDiskSource.cxx rename to Filters/Sources/vtkDiskSource.cxx diff --git a/Graphics/vtkDiskSource.h b/Filters/Sources/vtkDiskSource.h similarity index 100% rename from Graphics/vtkDiskSource.h rename to Filters/Sources/vtkDiskSource.h diff --git a/Graphics/vtkEllipticalButtonSource.cxx b/Filters/Sources/vtkEllipticalButtonSource.cxx similarity index 100% rename from Graphics/vtkEllipticalButtonSource.cxx rename to Filters/Sources/vtkEllipticalButtonSource.cxx diff --git a/Graphics/vtkEllipticalButtonSource.h b/Filters/Sources/vtkEllipticalButtonSource.h similarity index 100% rename from Graphics/vtkEllipticalButtonSource.h rename to Filters/Sources/vtkEllipticalButtonSource.h diff --git a/Graphics/vtkFrustumSource.cxx b/Filters/Sources/vtkFrustumSource.cxx similarity index 100% rename from Graphics/vtkFrustumSource.cxx rename to Filters/Sources/vtkFrustumSource.cxx diff --git a/Graphics/vtkFrustumSource.h b/Filters/Sources/vtkFrustumSource.h similarity index 100% rename from Graphics/vtkFrustumSource.h rename to Filters/Sources/vtkFrustumSource.h diff --git a/Graphics/vtkGlyphSource2D.cxx b/Filters/Sources/vtkGlyphSource2D.cxx similarity index 100% rename from Graphics/vtkGlyphSource2D.cxx rename to Filters/Sources/vtkGlyphSource2D.cxx diff --git a/Graphics/vtkGlyphSource2D.h b/Filters/Sources/vtkGlyphSource2D.h similarity index 100% rename from Graphics/vtkGlyphSource2D.h rename to Filters/Sources/vtkGlyphSource2D.h diff --git a/Graphics/vtkGraphToPolyData.cxx b/Filters/Sources/vtkGraphToPolyData.cxx similarity index 100% rename from Graphics/vtkGraphToPolyData.cxx rename to Filters/Sources/vtkGraphToPolyData.cxx diff --git a/Graphics/vtkGraphToPolyData.h b/Filters/Sources/vtkGraphToPolyData.h similarity index 100% rename from Graphics/vtkGraphToPolyData.h rename to Filters/Sources/vtkGraphToPolyData.h diff --git a/Graphics/vtkHyperOctreeFractalSource.cxx b/Filters/Sources/vtkHyperOctreeFractalSource.cxx similarity index 100% rename from Graphics/vtkHyperOctreeFractalSource.cxx rename to Filters/Sources/vtkHyperOctreeFractalSource.cxx diff --git a/Graphics/vtkHyperOctreeFractalSource.h b/Filters/Sources/vtkHyperOctreeFractalSource.h similarity index 100% rename from Graphics/vtkHyperOctreeFractalSource.h rename to Filters/Sources/vtkHyperOctreeFractalSource.h diff --git a/Graphics/vtkLineSource.cxx b/Filters/Sources/vtkLineSource.cxx similarity index 100% rename from Graphics/vtkLineSource.cxx rename to Filters/Sources/vtkLineSource.cxx diff --git a/Graphics/vtkLineSource.h b/Filters/Sources/vtkLineSource.h similarity index 100% rename from Graphics/vtkLineSource.h rename to Filters/Sources/vtkLineSource.h diff --git a/Graphics/vtkOutlineCornerSource.cxx b/Filters/Sources/vtkOutlineCornerSource.cxx similarity index 100% rename from Graphics/vtkOutlineCornerSource.cxx rename to Filters/Sources/vtkOutlineCornerSource.cxx diff --git a/Graphics/vtkOutlineCornerSource.h b/Filters/Sources/vtkOutlineCornerSource.h similarity index 100% rename from Graphics/vtkOutlineCornerSource.h rename to Filters/Sources/vtkOutlineCornerSource.h diff --git a/Graphics/vtkOutlineSource.cxx b/Filters/Sources/vtkOutlineSource.cxx similarity index 100% rename from Graphics/vtkOutlineSource.cxx rename to Filters/Sources/vtkOutlineSource.cxx diff --git a/Graphics/vtkOutlineSource.h b/Filters/Sources/vtkOutlineSource.h similarity index 100% rename from Graphics/vtkOutlineSource.h rename to Filters/Sources/vtkOutlineSource.h diff --git a/Graphics/vtkParametricFunctionSource.cxx b/Filters/Sources/vtkParametricFunctionSource.cxx similarity index 100% rename from Graphics/vtkParametricFunctionSource.cxx rename to Filters/Sources/vtkParametricFunctionSource.cxx diff --git a/Graphics/vtkParametricFunctionSource.h b/Filters/Sources/vtkParametricFunctionSource.h similarity index 100% rename from Graphics/vtkParametricFunctionSource.h rename to Filters/Sources/vtkParametricFunctionSource.h diff --git a/Graphics/vtkPlaneSource.cxx b/Filters/Sources/vtkPlaneSource.cxx similarity index 100% rename from Graphics/vtkPlaneSource.cxx rename to Filters/Sources/vtkPlaneSource.cxx diff --git a/Graphics/vtkPlaneSource.h b/Filters/Sources/vtkPlaneSource.h similarity index 100% rename from Graphics/vtkPlaneSource.h rename to Filters/Sources/vtkPlaneSource.h diff --git a/Graphics/vtkPlatonicSolidSource.cxx b/Filters/Sources/vtkPlatonicSolidSource.cxx similarity index 100% rename from Graphics/vtkPlatonicSolidSource.cxx rename to Filters/Sources/vtkPlatonicSolidSource.cxx diff --git a/Graphics/vtkPlatonicSolidSource.h b/Filters/Sources/vtkPlatonicSolidSource.h similarity index 100% rename from Graphics/vtkPlatonicSolidSource.h rename to Filters/Sources/vtkPlatonicSolidSource.h diff --git a/Graphics/vtkPointSource.cxx b/Filters/Sources/vtkPointSource.cxx similarity index 100% rename from Graphics/vtkPointSource.cxx rename to Filters/Sources/vtkPointSource.cxx diff --git a/Graphics/vtkPointSource.h b/Filters/Sources/vtkPointSource.h similarity index 100% rename from Graphics/vtkPointSource.h rename to Filters/Sources/vtkPointSource.h diff --git a/Graphics/vtkProgrammableDataObjectSource.cxx b/Filters/Sources/vtkProgrammableDataObjectSource.cxx similarity index 100% rename from Graphics/vtkProgrammableDataObjectSource.cxx rename to Filters/Sources/vtkProgrammableDataObjectSource.cxx diff --git a/Graphics/vtkProgrammableDataObjectSource.h b/Filters/Sources/vtkProgrammableDataObjectSource.h similarity index 100% rename from Graphics/vtkProgrammableDataObjectSource.h rename to Filters/Sources/vtkProgrammableDataObjectSource.h diff --git a/Graphics/vtkProgrammableSource.cxx b/Filters/Sources/vtkProgrammableSource.cxx similarity index 100% rename from Graphics/vtkProgrammableSource.cxx rename to Filters/Sources/vtkProgrammableSource.cxx diff --git a/Graphics/vtkProgrammableSource.h b/Filters/Sources/vtkProgrammableSource.h similarity index 100% rename from Graphics/vtkProgrammableSource.h rename to Filters/Sources/vtkProgrammableSource.h diff --git a/Graphics/vtkRectangularButtonSource.cxx b/Filters/Sources/vtkRectangularButtonSource.cxx similarity index 100% rename from Graphics/vtkRectangularButtonSource.cxx rename to Filters/Sources/vtkRectangularButtonSource.cxx diff --git a/Graphics/vtkRectangularButtonSource.h b/Filters/Sources/vtkRectangularButtonSource.h similarity index 100% rename from Graphics/vtkRectangularButtonSource.h rename to Filters/Sources/vtkRectangularButtonSource.h diff --git a/Graphics/vtkRegularPolygonSource.cxx b/Filters/Sources/vtkRegularPolygonSource.cxx similarity index 100% rename from Graphics/vtkRegularPolygonSource.cxx rename to Filters/Sources/vtkRegularPolygonSource.cxx diff --git a/Graphics/vtkRegularPolygonSource.h b/Filters/Sources/vtkRegularPolygonSource.h similarity index 100% rename from Graphics/vtkRegularPolygonSource.h rename to Filters/Sources/vtkRegularPolygonSource.h diff --git a/Graphics/vtkSelectionSource.cxx b/Filters/Sources/vtkSelectionSource.cxx similarity index 100% rename from Graphics/vtkSelectionSource.cxx rename to Filters/Sources/vtkSelectionSource.cxx diff --git a/Graphics/vtkSelectionSource.h b/Filters/Sources/vtkSelectionSource.h similarity index 100% rename from Graphics/vtkSelectionSource.h rename to Filters/Sources/vtkSelectionSource.h diff --git a/Graphics/vtkSphereSource.cxx b/Filters/Sources/vtkSphereSource.cxx similarity index 100% rename from Graphics/vtkSphereSource.cxx rename to Filters/Sources/vtkSphereSource.cxx diff --git a/Graphics/vtkSphereSource.h b/Filters/Sources/vtkSphereSource.h similarity index 100% rename from Graphics/vtkSphereSource.h rename to Filters/Sources/vtkSphereSource.h diff --git a/Graphics/vtkSuperquadricSource.cxx b/Filters/Sources/vtkSuperquadricSource.cxx similarity index 100% rename from Graphics/vtkSuperquadricSource.cxx rename to Filters/Sources/vtkSuperquadricSource.cxx diff --git a/Graphics/vtkSuperquadricSource.h b/Filters/Sources/vtkSuperquadricSource.h similarity index 100% rename from Graphics/vtkSuperquadricSource.h rename to Filters/Sources/vtkSuperquadricSource.h diff --git a/Graphics/vtkTessellatedBoxSource.cxx b/Filters/Sources/vtkTessellatedBoxSource.cxx similarity index 100% rename from Graphics/vtkTessellatedBoxSource.cxx rename to Filters/Sources/vtkTessellatedBoxSource.cxx diff --git a/Graphics/vtkTessellatedBoxSource.h b/Filters/Sources/vtkTessellatedBoxSource.h similarity index 100% rename from Graphics/vtkTessellatedBoxSource.h rename to Filters/Sources/vtkTessellatedBoxSource.h diff --git a/Graphics/vtkTextSource.cxx b/Filters/Sources/vtkTextSource.cxx similarity index 100% rename from Graphics/vtkTextSource.cxx rename to Filters/Sources/vtkTextSource.cxx diff --git a/Graphics/vtkTextSource.h b/Filters/Sources/vtkTextSource.h similarity index 100% rename from Graphics/vtkTextSource.h rename to Filters/Sources/vtkTextSource.h diff --git a/Graphics/vtkTexturedSphereSource.cxx b/Filters/Sources/vtkTexturedSphereSource.cxx similarity index 100% rename from Graphics/vtkTexturedSphereSource.cxx rename to Filters/Sources/vtkTexturedSphereSource.cxx diff --git a/Graphics/vtkTexturedSphereSource.h b/Filters/Sources/vtkTexturedSphereSource.h similarity index 100% rename from Graphics/vtkTexturedSphereSource.h rename to Filters/Sources/vtkTexturedSphereSource.h diff --git a/Infovis/Testing/Cxx/TestContingencyStatistics.cxx b/Filters/Statistics/Testing/Cxx/TestContingencyStatistics.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestContingencyStatistics.cxx rename to Filters/Statistics/Testing/Cxx/TestContingencyStatistics.cxx diff --git a/Infovis/Testing/Cxx/TestCorrelativeStatistics.cxx b/Filters/Statistics/Testing/Cxx/TestCorrelativeStatistics.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestCorrelativeStatistics.cxx rename to Filters/Statistics/Testing/Cxx/TestCorrelativeStatistics.cxx diff --git a/Infovis/Testing/Cxx/TestDescriptiveStatistics.cxx b/Filters/Statistics/Testing/Cxx/TestDescriptiveStatistics.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestDescriptiveStatistics.cxx rename to Filters/Statistics/Testing/Cxx/TestDescriptiveStatistics.cxx diff --git a/Infovis/Testing/Cxx/TestKMeansStatistics.cxx b/Filters/Statistics/Testing/Cxx/TestKMeansStatistics.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestKMeansStatistics.cxx rename to Filters/Statistics/Testing/Cxx/TestKMeansStatistics.cxx diff --git a/Infovis/Testing/Cxx/TestMultiCorrelativeStatistics.cxx b/Filters/Statistics/Testing/Cxx/TestMultiCorrelativeStatistics.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestMultiCorrelativeStatistics.cxx rename to Filters/Statistics/Testing/Cxx/TestMultiCorrelativeStatistics.cxx diff --git a/Infovis/Testing/Cxx/TestOrderStatistics.cxx b/Filters/Statistics/Testing/Cxx/TestOrderStatistics.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestOrderStatistics.cxx rename to Filters/Statistics/Testing/Cxx/TestOrderStatistics.cxx diff --git a/Infovis/Testing/Cxx/TestPCAStatistics.cxx b/Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestPCAStatistics.cxx rename to Filters/Statistics/Testing/Cxx/TestPCAStatistics.cxx diff --git a/Infovis/Testing/Python/kMeansDistanceCalculator.py b/Filters/Statistics/Testing/Python/kMeansDistanceCalculator.py similarity index 100% rename from Infovis/Testing/Python/kMeansDistanceCalculator.py rename to Filters/Statistics/Testing/Python/kMeansDistanceCalculator.py diff --git a/Infovis/vtkBivariateLinearTableThreshold.cxx b/Filters/Statistics/vtkBivariateLinearTableThreshold.cxx similarity index 100% rename from Infovis/vtkBivariateLinearTableThreshold.cxx rename to Filters/Statistics/vtkBivariateLinearTableThreshold.cxx diff --git a/Infovis/vtkBivariateLinearTableThreshold.h b/Filters/Statistics/vtkBivariateLinearTableThreshold.h similarity index 100% rename from Infovis/vtkBivariateLinearTableThreshold.h rename to Filters/Statistics/vtkBivariateLinearTableThreshold.h diff --git a/Infovis/vtkContingencyStatistics.cxx b/Filters/Statistics/vtkContingencyStatistics.cxx similarity index 100% rename from Infovis/vtkContingencyStatistics.cxx rename to Filters/Statistics/vtkContingencyStatistics.cxx diff --git a/Infovis/vtkContingencyStatistics.h b/Filters/Statistics/vtkContingencyStatistics.h similarity index 100% rename from Infovis/vtkContingencyStatistics.h rename to Filters/Statistics/vtkContingencyStatistics.h diff --git a/Infovis/vtkCorrelativeStatistics.cxx b/Filters/Statistics/vtkCorrelativeStatistics.cxx similarity index 100% rename from Infovis/vtkCorrelativeStatistics.cxx rename to Filters/Statistics/vtkCorrelativeStatistics.cxx diff --git a/Infovis/vtkCorrelativeStatistics.h b/Filters/Statistics/vtkCorrelativeStatistics.h similarity index 100% rename from Infovis/vtkCorrelativeStatistics.h rename to Filters/Statistics/vtkCorrelativeStatistics.h diff --git a/Infovis/vtkDescriptiveStatistics.cxx b/Filters/Statistics/vtkDescriptiveStatistics.cxx similarity index 100% rename from Infovis/vtkDescriptiveStatistics.cxx rename to Filters/Statistics/vtkDescriptiveStatistics.cxx diff --git a/Infovis/vtkDescriptiveStatistics.h b/Filters/Statistics/vtkDescriptiveStatistics.h similarity index 100% rename from Infovis/vtkDescriptiveStatistics.h rename to Filters/Statistics/vtkDescriptiveStatistics.h diff --git a/Infovis/vtkKMeansAssessFunctor.h b/Filters/Statistics/vtkKMeansAssessFunctor.h similarity index 100% rename from Infovis/vtkKMeansAssessFunctor.h rename to Filters/Statistics/vtkKMeansAssessFunctor.h diff --git a/Infovis/vtkKMeansDistanceFunctor.cxx b/Filters/Statistics/vtkKMeansDistanceFunctor.cxx similarity index 100% rename from Infovis/vtkKMeansDistanceFunctor.cxx rename to Filters/Statistics/vtkKMeansDistanceFunctor.cxx diff --git a/Infovis/vtkKMeansDistanceFunctor.h b/Filters/Statistics/vtkKMeansDistanceFunctor.h similarity index 100% rename from Infovis/vtkKMeansDistanceFunctor.h rename to Filters/Statistics/vtkKMeansDistanceFunctor.h diff --git a/Infovis/vtkKMeansDistanceFunctorCalculator.cxx b/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.cxx similarity index 100% rename from Infovis/vtkKMeansDistanceFunctorCalculator.cxx rename to Filters/Statistics/vtkKMeansDistanceFunctorCalculator.cxx diff --git a/Infovis/vtkKMeansDistanceFunctorCalculator.h b/Filters/Statistics/vtkKMeansDistanceFunctorCalculator.h similarity index 100% rename from Infovis/vtkKMeansDistanceFunctorCalculator.h rename to Filters/Statistics/vtkKMeansDistanceFunctorCalculator.h diff --git a/Infovis/vtkKMeansStatistics.cxx b/Filters/Statistics/vtkKMeansStatistics.cxx similarity index 100% rename from Infovis/vtkKMeansStatistics.cxx rename to Filters/Statistics/vtkKMeansStatistics.cxx diff --git a/Infovis/vtkKMeansStatistics.h b/Filters/Statistics/vtkKMeansStatistics.h similarity index 100% rename from Infovis/vtkKMeansStatistics.h rename to Filters/Statistics/vtkKMeansStatistics.h diff --git a/Infovis/vtkMultiCorrelativeStatistics.cxx b/Filters/Statistics/vtkMultiCorrelativeStatistics.cxx similarity index 100% rename from Infovis/vtkMultiCorrelativeStatistics.cxx rename to Filters/Statistics/vtkMultiCorrelativeStatistics.cxx diff --git a/Infovis/vtkMultiCorrelativeStatistics.h b/Filters/Statistics/vtkMultiCorrelativeStatistics.h similarity index 100% rename from Infovis/vtkMultiCorrelativeStatistics.h rename to Filters/Statistics/vtkMultiCorrelativeStatistics.h diff --git a/Infovis/vtkMultiCorrelativeStatisticsAssessFunctor.h b/Filters/Statistics/vtkMultiCorrelativeStatisticsAssessFunctor.h similarity index 100% rename from Infovis/vtkMultiCorrelativeStatisticsAssessFunctor.h rename to Filters/Statistics/vtkMultiCorrelativeStatisticsAssessFunctor.h diff --git a/Infovis/vtkOrderStatistics.cxx b/Filters/Statistics/vtkOrderStatistics.cxx similarity index 100% rename from Infovis/vtkOrderStatistics.cxx rename to Filters/Statistics/vtkOrderStatistics.cxx diff --git a/Infovis/vtkOrderStatistics.h b/Filters/Statistics/vtkOrderStatistics.h similarity index 100% rename from Infovis/vtkOrderStatistics.h rename to Filters/Statistics/vtkOrderStatistics.h diff --git a/Infovis/vtkPCAStatistics.cxx b/Filters/Statistics/vtkPCAStatistics.cxx similarity index 100% rename from Infovis/vtkPCAStatistics.cxx rename to Filters/Statistics/vtkPCAStatistics.cxx diff --git a/Infovis/vtkPCAStatistics.h b/Filters/Statistics/vtkPCAStatistics.h similarity index 100% rename from Infovis/vtkPCAStatistics.h rename to Filters/Statistics/vtkPCAStatistics.h diff --git a/Infovis/vtkStatisticsAlgorithm.cxx b/Filters/Statistics/vtkStatisticsAlgorithm.cxx similarity index 100% rename from Infovis/vtkStatisticsAlgorithm.cxx rename to Filters/Statistics/vtkStatisticsAlgorithm.cxx diff --git a/Infovis/vtkStatisticsAlgorithm.h b/Filters/Statistics/vtkStatisticsAlgorithm.h similarity index 100% rename from Infovis/vtkStatisticsAlgorithm.h rename to Filters/Statistics/vtkStatisticsAlgorithm.h diff --git a/Infovis/vtkStatisticsAlgorithmPrivate.h b/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h similarity index 100% rename from Infovis/vtkStatisticsAlgorithmPrivate.h rename to Filters/Statistics/vtkStatisticsAlgorithmPrivate.h diff --git a/Infovis/vtkStrahlerMetric.cxx b/Filters/Statistics/vtkStrahlerMetric.cxx similarity index 100% rename from Infovis/vtkStrahlerMetric.cxx rename to Filters/Statistics/vtkStrahlerMetric.cxx diff --git a/Infovis/vtkStrahlerMetric.h b/Filters/Statistics/vtkStrahlerMetric.h similarity index 100% rename from Infovis/vtkStrahlerMetric.h rename to Filters/Statistics/vtkStrahlerMetric.h diff --git a/Infovis/vtkStreamingStatistics.cxx b/Filters/Statistics/vtkStreamingStatistics.cxx similarity index 100% rename from Infovis/vtkStreamingStatistics.cxx rename to Filters/Statistics/vtkStreamingStatistics.cxx diff --git a/Infovis/vtkStreamingStatistics.h b/Filters/Statistics/vtkStreamingStatistics.h similarity index 100% rename from Infovis/vtkStreamingStatistics.h rename to Filters/Statistics/vtkStreamingStatistics.h diff --git a/Graphics/Testing/Cxx/TestRCalculatorFilter.cxx b/Filters/StatisticsGnuR/Testing/Cxx/TestRCalculatorFilter.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestRCalculatorFilter.cxx rename to Filters/StatisticsGnuR/Testing/Cxx/TestRCalculatorFilter.cxx diff --git a/Graphics/Testing/Cxx/TestRInterface.cxx b/Filters/StatisticsGnuR/Testing/Cxx/TestRInterface.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestRInterface.cxx rename to Filters/StatisticsGnuR/Testing/Cxx/TestRInterface.cxx diff --git a/Graphics/Testing/Cxx/TestRRandomTableSource.cxx b/Filters/StatisticsGnuR/Testing/Cxx/TestRRandomTableSource.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestRRandomTableSource.cxx rename to Filters/StatisticsGnuR/Testing/Cxx/TestRRandomTableSource.cxx diff --git a/Graphics/vtkRAdapter.cxx b/Filters/StatisticsGnuR/vtkRAdapter.cxx similarity index 100% rename from Graphics/vtkRAdapter.cxx rename to Filters/StatisticsGnuR/vtkRAdapter.cxx diff --git a/Graphics/vtkRAdapter.h b/Filters/StatisticsGnuR/vtkRAdapter.h similarity index 100% rename from Graphics/vtkRAdapter.h rename to Filters/StatisticsGnuR/vtkRAdapter.h diff --git a/Graphics/vtkRCalculatorFilter.cxx b/Filters/StatisticsGnuR/vtkRCalculatorFilter.cxx similarity index 100% rename from Graphics/vtkRCalculatorFilter.cxx rename to Filters/StatisticsGnuR/vtkRCalculatorFilter.cxx diff --git a/Graphics/vtkRCalculatorFilter.h b/Filters/StatisticsGnuR/vtkRCalculatorFilter.h similarity index 100% rename from Graphics/vtkRCalculatorFilter.h rename to Filters/StatisticsGnuR/vtkRCalculatorFilter.h diff --git a/Graphics/vtkRInterface.cxx b/Filters/StatisticsGnuR/vtkRInterface.cxx similarity index 100% rename from Graphics/vtkRInterface.cxx rename to Filters/StatisticsGnuR/vtkRInterface.cxx diff --git a/Graphics/vtkRInterface.h b/Filters/StatisticsGnuR/vtkRInterface.h similarity index 100% rename from Graphics/vtkRInterface.h rename to Filters/StatisticsGnuR/vtkRInterface.h diff --git a/Graphics/vtkRRandomTableSource.cxx b/Filters/StatisticsGnuR/vtkRRandomTableSource.cxx similarity index 100% rename from Graphics/vtkRRandomTableSource.cxx rename to Filters/StatisticsGnuR/vtkRRandomTableSource.cxx diff --git a/Graphics/vtkRRandomTableSource.h b/Filters/StatisticsGnuR/vtkRRandomTableSource.h similarity index 100% rename from Graphics/vtkRRandomTableSource.h rename to Filters/StatisticsGnuR/vtkRRandomTableSource.h diff --git a/Graphics/Testing/Tcl/AutomaticPlaneGeneration.tcl b/Filters/Texture/Testing/Tcl/AutomaticPlaneGeneration.tcl similarity index 100% rename from Graphics/Testing/Tcl/AutomaticPlaneGeneration.tcl rename to Filters/Texture/Testing/Tcl/AutomaticPlaneGeneration.tcl diff --git a/Graphics/Testing/Tcl/cylMap.tcl b/Filters/Texture/Testing/Tcl/cylMap.tcl similarity index 100% rename from Graphics/Testing/Tcl/cylMap.tcl rename to Filters/Texture/Testing/Tcl/cylMap.tcl diff --git a/Graphics/Testing/Tcl/socbal.tcl b/Filters/Texture/Testing/Tcl/socbal.tcl similarity index 100% rename from Graphics/Testing/Tcl/socbal.tcl rename to Filters/Texture/Testing/Tcl/socbal.tcl diff --git a/Graphics/Testing/Tcl/textureThreshold.tcl b/Filters/Texture/Testing/Tcl/textureThreshold.tcl similarity index 100% rename from Graphics/Testing/Tcl/textureThreshold.tcl rename to Filters/Texture/Testing/Tcl/textureThreshold.tcl diff --git a/Graphics/Testing/Tcl/triangularTCoords.tcl b/Filters/Texture/Testing/Tcl/triangularTCoords.tcl similarity index 100% rename from Graphics/Testing/Tcl/triangularTCoords.tcl rename to Filters/Texture/Testing/Tcl/triangularTCoords.tcl diff --git a/Graphics/vtkImplicitTextureCoords.cxx b/Filters/Texture/vtkImplicitTextureCoords.cxx similarity index 100% rename from Graphics/vtkImplicitTextureCoords.cxx rename to Filters/Texture/vtkImplicitTextureCoords.cxx diff --git a/Graphics/vtkImplicitTextureCoords.h b/Filters/Texture/vtkImplicitTextureCoords.h similarity index 100% rename from Graphics/vtkImplicitTextureCoords.h rename to Filters/Texture/vtkImplicitTextureCoords.h diff --git a/Graphics/vtkTextureMapToCylinder.cxx b/Filters/Texture/vtkTextureMapToCylinder.cxx similarity index 100% rename from Graphics/vtkTextureMapToCylinder.cxx rename to Filters/Texture/vtkTextureMapToCylinder.cxx diff --git a/Graphics/vtkTextureMapToCylinder.h b/Filters/Texture/vtkTextureMapToCylinder.h similarity index 100% rename from Graphics/vtkTextureMapToCylinder.h rename to Filters/Texture/vtkTextureMapToCylinder.h diff --git a/Graphics/vtkTextureMapToPlane.cxx b/Filters/Texture/vtkTextureMapToPlane.cxx similarity index 100% rename from Graphics/vtkTextureMapToPlane.cxx rename to Filters/Texture/vtkTextureMapToPlane.cxx diff --git a/Graphics/vtkTextureMapToPlane.h b/Filters/Texture/vtkTextureMapToPlane.h similarity index 100% rename from Graphics/vtkTextureMapToPlane.h rename to Filters/Texture/vtkTextureMapToPlane.h diff --git a/Graphics/vtkTextureMapToSphere.cxx b/Filters/Texture/vtkTextureMapToSphere.cxx similarity index 100% rename from Graphics/vtkTextureMapToSphere.cxx rename to Filters/Texture/vtkTextureMapToSphere.cxx diff --git a/Graphics/vtkTextureMapToSphere.h b/Filters/Texture/vtkTextureMapToSphere.h similarity index 100% rename from Graphics/vtkTextureMapToSphere.h rename to Filters/Texture/vtkTextureMapToSphere.h diff --git a/Graphics/vtkThresholdTextureCoords.cxx b/Filters/Texture/vtkThresholdTextureCoords.cxx similarity index 100% rename from Graphics/vtkThresholdTextureCoords.cxx rename to Filters/Texture/vtkThresholdTextureCoords.cxx diff --git a/Graphics/vtkThresholdTextureCoords.h b/Filters/Texture/vtkThresholdTextureCoords.h similarity index 100% rename from Graphics/vtkThresholdTextureCoords.h rename to Filters/Texture/vtkThresholdTextureCoords.h diff --git a/Graphics/vtkTransformTextureCoords.cxx b/Filters/Texture/vtkTransformTextureCoords.cxx similarity index 100% rename from Graphics/vtkTransformTextureCoords.cxx rename to Filters/Texture/vtkTransformTextureCoords.cxx diff --git a/Graphics/vtkTransformTextureCoords.h b/Filters/Texture/vtkTransformTextureCoords.h similarity index 100% rename from Graphics/vtkTransformTextureCoords.h rename to Filters/Texture/vtkTransformTextureCoords.h diff --git a/Graphics/vtkTriangularTCoords.cxx b/Filters/Texture/vtkTriangularTCoords.cxx similarity index 100% rename from Graphics/vtkTriangularTCoords.cxx rename to Filters/Texture/vtkTriangularTCoords.cxx diff --git a/Graphics/vtkTriangularTCoords.h b/Filters/Texture/vtkTriangularTCoords.h similarity index 100% rename from Graphics/vtkTriangularTCoords.h rename to Filters/Texture/vtkTriangularTCoords.h diff --git a/Graphics/Testing/Cxx/MeshQuality.cxx b/Filters/Verdict/Testing/Cxx/MeshQuality.cxx similarity index 100% rename from Graphics/Testing/Cxx/MeshQuality.cxx rename to Filters/Verdict/Testing/Cxx/MeshQuality.cxx diff --git a/Graphics/Testing/Python/meshQuality.py b/Filters/Verdict/Testing/Python/meshQuality.py similarity index 100% rename from Graphics/Testing/Python/meshQuality.py rename to Filters/Verdict/Testing/Python/meshQuality.py diff --git a/Graphics/vtkCellQuality.cxx b/Filters/Verdict/vtkCellQuality.cxx similarity index 100% rename from Graphics/vtkCellQuality.cxx rename to Filters/Verdict/vtkCellQuality.cxx diff --git a/Graphics/vtkCellQuality.h b/Filters/Verdict/vtkCellQuality.h similarity index 100% rename from Graphics/vtkCellQuality.h rename to Filters/Verdict/vtkCellQuality.h diff --git a/Graphics/vtkMatrixMathFilter.cxx b/Filters/Verdict/vtkMatrixMathFilter.cxx similarity index 100% rename from Graphics/vtkMatrixMathFilter.cxx rename to Filters/Verdict/vtkMatrixMathFilter.cxx diff --git a/Graphics/vtkMatrixMathFilter.h b/Filters/Verdict/vtkMatrixMathFilter.h similarity index 100% rename from Graphics/vtkMatrixMathFilter.h rename to Filters/Verdict/vtkMatrixMathFilter.h diff --git a/Graphics/vtkMeshQuality.cxx b/Filters/Verdict/vtkMeshQuality.cxx similarity index 100% rename from Graphics/vtkMeshQuality.cxx rename to Filters/Verdict/vtkMeshQuality.cxx diff --git a/Graphics/vtkMeshQuality.h b/Filters/Verdict/vtkMeshQuality.h similarity index 100% rename from Graphics/vtkMeshQuality.h rename to Filters/Verdict/vtkMeshQuality.h diff --git a/GUISupport/Qt/QVTKGraphicsItem.cxx b/GUISupport/QtOpenGL/QVTKGraphicsItem.cxx similarity index 100% rename from GUISupport/Qt/QVTKGraphicsItem.cxx rename to GUISupport/QtOpenGL/QVTKGraphicsItem.cxx diff --git a/GUISupport/Qt/QVTKGraphicsItem.h b/GUISupport/QtOpenGL/QVTKGraphicsItem.h similarity index 100% rename from GUISupport/Qt/QVTKGraphicsItem.h rename to GUISupport/QtOpenGL/QVTKGraphicsItem.h diff --git a/GUISupport/Qt/QVTKGraphicsItem.sip b/GUISupport/QtOpenGL/QVTKGraphicsItem.sip similarity index 100% rename from GUISupport/Qt/QVTKGraphicsItem.sip rename to GUISupport/QtOpenGL/QVTKGraphicsItem.sip diff --git a/GUISupport/Qt/QVTKWidget2.cxx b/GUISupport/QtOpenGL/QVTKWidget2.cxx similarity index 100% rename from GUISupport/Qt/QVTKWidget2.cxx rename to GUISupport/QtOpenGL/QVTKWidget2.cxx diff --git a/GUISupport/Qt/QVTKWidget2.h b/GUISupport/QtOpenGL/QVTKWidget2.h similarity index 100% rename from GUISupport/Qt/QVTKWidget2.h rename to GUISupport/QtOpenGL/QVTKWidget2.h diff --git a/GUISupport/Qt/QVTKWidget2.sip b/GUISupport/QtOpenGL/QVTKWidget2.sip similarity index 100% rename from GUISupport/Qt/QVTKWidget2.sip rename to GUISupport/QtOpenGL/QVTKWidget2.sip diff --git a/GUISupport/Qt/Testing/Cxx/TestQtSQLDatabase.cxx b/GUISupport/QtSQL/Testing/Cxx/TestQtSQLDatabase.cxx similarity index 100% rename from GUISupport/Qt/Testing/Cxx/TestQtSQLDatabase.cxx rename to GUISupport/QtSQL/Testing/Cxx/TestQtSQLDatabase.cxx diff --git a/GUISupport/Qt/vtkQtSQLDatabase.cxx b/GUISupport/QtSQL/vtkQtSQLDatabase.cxx similarity index 100% rename from GUISupport/Qt/vtkQtSQLDatabase.cxx rename to GUISupport/QtSQL/vtkQtSQLDatabase.cxx diff --git a/GUISupport/Qt/vtkQtSQLDatabase.h b/GUISupport/QtSQL/vtkQtSQLDatabase.h similarity index 100% rename from GUISupport/Qt/vtkQtSQLDatabase.h rename to GUISupport/QtSQL/vtkQtSQLDatabase.h diff --git a/GUISupport/Qt/vtkQtSQLQuery.cxx b/GUISupport/QtSQL/vtkQtSQLQuery.cxx similarity index 100% rename from GUISupport/Qt/vtkQtSQLQuery.cxx rename to GUISupport/QtSQL/vtkQtSQLQuery.cxx diff --git a/GUISupport/Qt/vtkQtSQLQuery.h b/GUISupport/QtSQL/vtkQtSQLQuery.h similarity index 100% rename from GUISupport/Qt/vtkQtSQLQuery.h rename to GUISupport/QtSQL/vtkQtSQLQuery.h diff --git a/GUISupport/Qt/vtkQtTimePointUtility.cxx b/GUISupport/QtSQL/vtkQtTimePointUtility.cxx similarity index 100% rename from GUISupport/Qt/vtkQtTimePointUtility.cxx rename to GUISupport/QtSQL/vtkQtTimePointUtility.cxx diff --git a/GUISupport/Qt/vtkQtTimePointUtility.h b/GUISupport/QtSQL/vtkQtTimePointUtility.h similarity index 100% rename from GUISupport/Qt/vtkQtTimePointUtility.h rename to GUISupport/QtSQL/vtkQtTimePointUtility.h diff --git a/GUISupport/Qt/vtkQtRichTextView.cxx b/GUISupport/QtWebkit/vtkQtRichTextView.cxx similarity index 100% rename from GUISupport/Qt/vtkQtRichTextView.cxx rename to GUISupport/QtWebkit/vtkQtRichTextView.cxx diff --git a/GUISupport/Qt/vtkQtRichTextView.h b/GUISupport/QtWebkit/vtkQtRichTextView.h similarity index 100% rename from GUISupport/Qt/vtkQtRichTextView.h rename to GUISupport/QtWebkit/vtkQtRichTextView.h diff --git a/GUISupport/Qt/vtkQtRichTextView.ui b/GUISupport/QtWebkit/vtkQtRichTextView.ui similarity index 100% rename from GUISupport/Qt/vtkQtRichTextView.ui rename to GUISupport/QtWebkit/vtkQtRichTextView.ui diff --git a/Geovis/CMakeLists.txt b/Geovis/Core/CMakeLists.txt similarity index 100% rename from Geovis/CMakeLists.txt rename to Geovis/Core/CMakeLists.txt diff --git a/Geovis/Testing/Cxx/TestCoincidentGeoGraphRepresentation2D.cxx b/Geovis/Core/Testing/Cxx/TestCoincidentGeoGraphRepresentation2D.cxx similarity index 100% rename from Geovis/Testing/Cxx/TestCoincidentGeoGraphRepresentation2D.cxx rename to Geovis/Core/Testing/Cxx/TestCoincidentGeoGraphRepresentation2D.cxx diff --git a/Geovis/Testing/Cxx/TestGeoAssignCoordinates.cxx b/Geovis/Core/Testing/Cxx/TestGeoAssignCoordinates.cxx similarity index 100% rename from Geovis/Testing/Cxx/TestGeoAssignCoordinates.cxx rename to Geovis/Core/Testing/Cxx/TestGeoAssignCoordinates.cxx diff --git a/Geovis/Testing/Cxx/TestGeoGraticule.cxx b/Geovis/Core/Testing/Cxx/TestGeoGraticule.cxx similarity index 100% rename from Geovis/Testing/Cxx/TestGeoGraticule.cxx rename to Geovis/Core/Testing/Cxx/TestGeoGraticule.cxx diff --git a/Geovis/Testing/Cxx/TestGeoProjection.cxx b/Geovis/Core/Testing/Cxx/TestGeoProjection.cxx similarity index 100% rename from Geovis/Testing/Cxx/TestGeoProjection.cxx rename to Geovis/Core/Testing/Cxx/TestGeoProjection.cxx diff --git a/Geovis/Testing/Cxx/TestGlobeSource.cxx b/Geovis/Core/Testing/Cxx/TestGlobeSource.cxx similarity index 100% rename from Geovis/Testing/Cxx/TestGlobeSource.cxx rename to Geovis/Core/Testing/Cxx/TestGlobeSource.cxx diff --git a/Geovis/Testing/Cxx/TestLabeledGeoView2D.cxx b/Geovis/Core/Testing/Cxx/TestLabeledGeoView2D.cxx similarity index 100% rename from Geovis/Testing/Cxx/TestLabeledGeoView2D.cxx rename to Geovis/Core/Testing/Cxx/TestLabeledGeoView2D.cxx diff --git a/Geovis/vtkCompassRepresentation.cxx b/Geovis/Core/vtkCompassRepresentation.cxx similarity index 100% rename from Geovis/vtkCompassRepresentation.cxx rename to Geovis/Core/vtkCompassRepresentation.cxx diff --git a/Geovis/vtkCompassRepresentation.h b/Geovis/Core/vtkCompassRepresentation.h similarity index 100% rename from Geovis/vtkCompassRepresentation.h rename to Geovis/Core/vtkCompassRepresentation.h diff --git a/Geovis/vtkCompassWidget.cxx b/Geovis/Core/vtkCompassWidget.cxx similarity index 100% rename from Geovis/vtkCompassWidget.cxx rename to Geovis/Core/vtkCompassWidget.cxx diff --git a/Geovis/vtkCompassWidget.h b/Geovis/Core/vtkCompassWidget.h similarity index 100% rename from Geovis/vtkCompassWidget.h rename to Geovis/Core/vtkCompassWidget.h diff --git a/Geovis/vtkGeoAdaptiveArcs.cxx b/Geovis/Core/vtkGeoAdaptiveArcs.cxx similarity index 100% rename from Geovis/vtkGeoAdaptiveArcs.cxx rename to Geovis/Core/vtkGeoAdaptiveArcs.cxx diff --git a/Geovis/vtkGeoAdaptiveArcs.h b/Geovis/Core/vtkGeoAdaptiveArcs.h similarity index 100% rename from Geovis/vtkGeoAdaptiveArcs.h rename to Geovis/Core/vtkGeoAdaptiveArcs.h diff --git a/Geovis/vtkGeoAlignedImageRepresentation.cxx b/Geovis/Core/vtkGeoAlignedImageRepresentation.cxx similarity index 100% rename from Geovis/vtkGeoAlignedImageRepresentation.cxx rename to Geovis/Core/vtkGeoAlignedImageRepresentation.cxx diff --git a/Geovis/vtkGeoAlignedImageRepresentation.h b/Geovis/Core/vtkGeoAlignedImageRepresentation.h similarity index 100% rename from Geovis/vtkGeoAlignedImageRepresentation.h rename to Geovis/Core/vtkGeoAlignedImageRepresentation.h diff --git a/Geovis/vtkGeoAlignedImageSource.cxx b/Geovis/Core/vtkGeoAlignedImageSource.cxx similarity index 100% rename from Geovis/vtkGeoAlignedImageSource.cxx rename to Geovis/Core/vtkGeoAlignedImageSource.cxx diff --git a/Geovis/vtkGeoAlignedImageSource.h b/Geovis/Core/vtkGeoAlignedImageSource.h similarity index 100% rename from Geovis/vtkGeoAlignedImageSource.h rename to Geovis/Core/vtkGeoAlignedImageSource.h diff --git a/Geovis/vtkGeoArcs.cxx b/Geovis/Core/vtkGeoArcs.cxx similarity index 100% rename from Geovis/vtkGeoArcs.cxx rename to Geovis/Core/vtkGeoArcs.cxx diff --git a/Geovis/vtkGeoArcs.h b/Geovis/Core/vtkGeoArcs.h similarity index 100% rename from Geovis/vtkGeoArcs.h rename to Geovis/Core/vtkGeoArcs.h diff --git a/Geovis/vtkGeoAssignCoordinates.cxx b/Geovis/Core/vtkGeoAssignCoordinates.cxx similarity index 100% rename from Geovis/vtkGeoAssignCoordinates.cxx rename to Geovis/Core/vtkGeoAssignCoordinates.cxx diff --git a/Geovis/vtkGeoAssignCoordinates.h b/Geovis/Core/vtkGeoAssignCoordinates.h similarity index 100% rename from Geovis/vtkGeoAssignCoordinates.h rename to Geovis/Core/vtkGeoAssignCoordinates.h diff --git a/Geovis/vtkGeoCamera.cxx b/Geovis/Core/vtkGeoCamera.cxx similarity index 100% rename from Geovis/vtkGeoCamera.cxx rename to Geovis/Core/vtkGeoCamera.cxx diff --git a/Geovis/vtkGeoCamera.h b/Geovis/Core/vtkGeoCamera.h similarity index 100% rename from Geovis/vtkGeoCamera.h rename to Geovis/Core/vtkGeoCamera.h diff --git a/Geovis/vtkGeoFileImageSource.cxx b/Geovis/Core/vtkGeoFileImageSource.cxx similarity index 100% rename from Geovis/vtkGeoFileImageSource.cxx rename to Geovis/Core/vtkGeoFileImageSource.cxx diff --git a/Geovis/vtkGeoFileImageSource.h b/Geovis/Core/vtkGeoFileImageSource.h similarity index 100% rename from Geovis/vtkGeoFileImageSource.h rename to Geovis/Core/vtkGeoFileImageSource.h diff --git a/Geovis/vtkGeoFileTerrainSource.cxx b/Geovis/Core/vtkGeoFileTerrainSource.cxx similarity index 100% rename from Geovis/vtkGeoFileTerrainSource.cxx rename to Geovis/Core/vtkGeoFileTerrainSource.cxx diff --git a/Geovis/vtkGeoFileTerrainSource.h b/Geovis/Core/vtkGeoFileTerrainSource.h similarity index 100% rename from Geovis/vtkGeoFileTerrainSource.h rename to Geovis/Core/vtkGeoFileTerrainSource.h diff --git a/Geovis/vtkGeoGlobeSource.cxx b/Geovis/Core/vtkGeoGlobeSource.cxx similarity index 100% rename from Geovis/vtkGeoGlobeSource.cxx rename to Geovis/Core/vtkGeoGlobeSource.cxx diff --git a/Geovis/vtkGeoGlobeSource.h b/Geovis/Core/vtkGeoGlobeSource.h similarity index 100% rename from Geovis/vtkGeoGlobeSource.h rename to Geovis/Core/vtkGeoGlobeSource.h diff --git a/Geovis/vtkGeoGraticule.cxx b/Geovis/Core/vtkGeoGraticule.cxx similarity index 100% rename from Geovis/vtkGeoGraticule.cxx rename to Geovis/Core/vtkGeoGraticule.cxx diff --git a/Geovis/vtkGeoGraticule.h b/Geovis/Core/vtkGeoGraticule.h similarity index 100% rename from Geovis/vtkGeoGraticule.h rename to Geovis/Core/vtkGeoGraticule.h diff --git a/Geovis/vtkGeoImageNode.cxx b/Geovis/Core/vtkGeoImageNode.cxx similarity index 100% rename from Geovis/vtkGeoImageNode.cxx rename to Geovis/Core/vtkGeoImageNode.cxx diff --git a/Geovis/vtkGeoImageNode.h b/Geovis/Core/vtkGeoImageNode.h similarity index 100% rename from Geovis/vtkGeoImageNode.h rename to Geovis/Core/vtkGeoImageNode.h diff --git a/Geovis/vtkGeoInteractorStyle.cxx b/Geovis/Core/vtkGeoInteractorStyle.cxx similarity index 100% rename from Geovis/vtkGeoInteractorStyle.cxx rename to Geovis/Core/vtkGeoInteractorStyle.cxx diff --git a/Geovis/vtkGeoInteractorStyle.h b/Geovis/Core/vtkGeoInteractorStyle.h similarity index 100% rename from Geovis/vtkGeoInteractorStyle.h rename to Geovis/Core/vtkGeoInteractorStyle.h diff --git a/Geovis/vtkGeoProjection.cxx b/Geovis/Core/vtkGeoProjection.cxx similarity index 100% rename from Geovis/vtkGeoProjection.cxx rename to Geovis/Core/vtkGeoProjection.cxx diff --git a/Geovis/vtkGeoProjection.h b/Geovis/Core/vtkGeoProjection.h similarity index 100% rename from Geovis/vtkGeoProjection.h rename to Geovis/Core/vtkGeoProjection.h diff --git a/Geovis/vtkGeoProjectionSource.cxx b/Geovis/Core/vtkGeoProjectionSource.cxx similarity index 100% rename from Geovis/vtkGeoProjectionSource.cxx rename to Geovis/Core/vtkGeoProjectionSource.cxx diff --git a/Geovis/vtkGeoProjectionSource.h b/Geovis/Core/vtkGeoProjectionSource.h similarity index 100% rename from Geovis/vtkGeoProjectionSource.h rename to Geovis/Core/vtkGeoProjectionSource.h diff --git a/Geovis/vtkGeoRandomGraphSource.cxx b/Geovis/Core/vtkGeoRandomGraphSource.cxx similarity index 100% rename from Geovis/vtkGeoRandomGraphSource.cxx rename to Geovis/Core/vtkGeoRandomGraphSource.cxx diff --git a/Geovis/vtkGeoRandomGraphSource.h b/Geovis/Core/vtkGeoRandomGraphSource.h similarity index 100% rename from Geovis/vtkGeoRandomGraphSource.h rename to Geovis/Core/vtkGeoRandomGraphSource.h diff --git a/Geovis/vtkGeoSampleArcs.cxx b/Geovis/Core/vtkGeoSampleArcs.cxx similarity index 100% rename from Geovis/vtkGeoSampleArcs.cxx rename to Geovis/Core/vtkGeoSampleArcs.cxx diff --git a/Geovis/vtkGeoSampleArcs.h b/Geovis/Core/vtkGeoSampleArcs.h similarity index 100% rename from Geovis/vtkGeoSampleArcs.h rename to Geovis/Core/vtkGeoSampleArcs.h diff --git a/Geovis/vtkGeoSource.cxx b/Geovis/Core/vtkGeoSource.cxx similarity index 100% rename from Geovis/vtkGeoSource.cxx rename to Geovis/Core/vtkGeoSource.cxx diff --git a/Geovis/vtkGeoSource.h b/Geovis/Core/vtkGeoSource.h similarity index 100% rename from Geovis/vtkGeoSource.h rename to Geovis/Core/vtkGeoSource.h diff --git a/Geovis/vtkGeoSphereTransform.cxx b/Geovis/Core/vtkGeoSphereTransform.cxx similarity index 100% rename from Geovis/vtkGeoSphereTransform.cxx rename to Geovis/Core/vtkGeoSphereTransform.cxx diff --git a/Geovis/vtkGeoSphereTransform.h b/Geovis/Core/vtkGeoSphereTransform.h similarity index 100% rename from Geovis/vtkGeoSphereTransform.h rename to Geovis/Core/vtkGeoSphereTransform.h diff --git a/Geovis/vtkGeoTerrain.cxx b/Geovis/Core/vtkGeoTerrain.cxx similarity index 100% rename from Geovis/vtkGeoTerrain.cxx rename to Geovis/Core/vtkGeoTerrain.cxx diff --git a/Geovis/vtkGeoTerrain.h b/Geovis/Core/vtkGeoTerrain.h similarity index 100% rename from Geovis/vtkGeoTerrain.h rename to Geovis/Core/vtkGeoTerrain.h diff --git a/Geovis/vtkGeoTerrain2D.cxx b/Geovis/Core/vtkGeoTerrain2D.cxx similarity index 100% rename from Geovis/vtkGeoTerrain2D.cxx rename to Geovis/Core/vtkGeoTerrain2D.cxx diff --git a/Geovis/vtkGeoTerrain2D.h b/Geovis/Core/vtkGeoTerrain2D.h similarity index 100% rename from Geovis/vtkGeoTerrain2D.h rename to Geovis/Core/vtkGeoTerrain2D.h diff --git a/Geovis/vtkGeoTerrainNode.cxx b/Geovis/Core/vtkGeoTerrainNode.cxx similarity index 100% rename from Geovis/vtkGeoTerrainNode.cxx rename to Geovis/Core/vtkGeoTerrainNode.cxx diff --git a/Geovis/vtkGeoTerrainNode.h b/Geovis/Core/vtkGeoTerrainNode.h similarity index 100% rename from Geovis/vtkGeoTerrainNode.h rename to Geovis/Core/vtkGeoTerrainNode.h diff --git a/Geovis/vtkGeoTransform.cxx b/Geovis/Core/vtkGeoTransform.cxx similarity index 100% rename from Geovis/vtkGeoTransform.cxx rename to Geovis/Core/vtkGeoTransform.cxx diff --git a/Geovis/vtkGeoTransform.h b/Geovis/Core/vtkGeoTransform.h similarity index 100% rename from Geovis/vtkGeoTransform.h rename to Geovis/Core/vtkGeoTransform.h diff --git a/Geovis/vtkGeoTreeNode.cxx b/Geovis/Core/vtkGeoTreeNode.cxx similarity index 100% rename from Geovis/vtkGeoTreeNode.cxx rename to Geovis/Core/vtkGeoTreeNode.cxx diff --git a/Geovis/vtkGeoTreeNode.h b/Geovis/Core/vtkGeoTreeNode.h similarity index 100% rename from Geovis/vtkGeoTreeNode.h rename to Geovis/Core/vtkGeoTreeNode.h diff --git a/Geovis/vtkGeoTreeNodeCache.cxx b/Geovis/Core/vtkGeoTreeNodeCache.cxx similarity index 100% rename from Geovis/vtkGeoTreeNodeCache.cxx rename to Geovis/Core/vtkGeoTreeNodeCache.cxx diff --git a/Geovis/vtkGeoTreeNodeCache.h b/Geovis/Core/vtkGeoTreeNodeCache.h similarity index 100% rename from Geovis/vtkGeoTreeNodeCache.h rename to Geovis/Core/vtkGeoTreeNodeCache.h diff --git a/Geovis/vtkGlobeSource.cxx b/Geovis/Core/vtkGlobeSource.cxx similarity index 100% rename from Geovis/vtkGlobeSource.cxx rename to Geovis/Core/vtkGlobeSource.cxx diff --git a/Geovis/vtkGlobeSource.h b/Geovis/Core/vtkGlobeSource.h similarity index 100% rename from Geovis/vtkGlobeSource.h rename to Geovis/Core/vtkGlobeSource.h diff --git a/Geovis/vtkGlobeSourceSphericalToCartesianFigure.eps b/Geovis/Core/vtkGlobeSourceSphericalToCartesianFigure.eps similarity index 100% rename from Geovis/vtkGlobeSourceSphericalToCartesianFigure.eps rename to Geovis/Core/vtkGlobeSourceSphericalToCartesianFigure.eps diff --git a/Geovis/vtkGlobeSourceSphericalToCartesianFigure.ipe b/Geovis/Core/vtkGlobeSourceSphericalToCartesianFigure.ipe similarity index 100% rename from Geovis/vtkGlobeSourceSphericalToCartesianFigure.ipe rename to Geovis/Core/vtkGlobeSourceSphericalToCartesianFigure.ipe diff --git a/Geovis/vtkGlobeSourceSphericalToCartesianFigure.png b/Geovis/Core/vtkGlobeSourceSphericalToCartesianFigure.png similarity index 100% rename from Geovis/vtkGlobeSourceSphericalToCartesianFigure.png rename to Geovis/Core/vtkGlobeSourceSphericalToCartesianFigure.png diff --git a/IO/Testing/Cxx/TestArrayDataWriter.cxx b/IO/Core/Testing/Cxx/TestArrayDataWriter.cxx similarity index 100% rename from IO/Testing/Cxx/TestArrayDataWriter.cxx rename to IO/Core/Testing/Cxx/TestArrayDataWriter.cxx diff --git a/IO/Testing/Cxx/TestArrayDenormalized.cxx b/IO/Core/Testing/Cxx/TestArrayDenormalized.cxx similarity index 100% rename from IO/Testing/Cxx/TestArrayDenormalized.cxx rename to IO/Core/Testing/Cxx/TestArrayDenormalized.cxx diff --git a/IO/Testing/Cxx/TestArraySerialization.cxx b/IO/Core/Testing/Cxx/TestArraySerialization.cxx similarity index 100% rename from IO/Testing/Cxx/TestArraySerialization.cxx rename to IO/Core/Testing/Cxx/TestArraySerialization.cxx diff --git a/IO/Testing/Cxx/TestCompress.cxx b/IO/Core/Testing/Cxx/TestCompress.cxx similarity index 100% rename from IO/Testing/Cxx/TestCompress.cxx rename to IO/Core/Testing/Cxx/TestCompress.cxx diff --git a/IO/Testing/Cxx/vtkFortran.h b/IO/Core/Testing/Cxx/vtkFortran.h similarity index 100% rename from IO/Testing/Cxx/vtkFortran.h rename to IO/Core/Testing/Cxx/vtkFortran.h diff --git a/IO/Testing/Tcl/TestGlobFileNames.tcl b/IO/Core/Testing/Tcl/TestGlobFileNames.tcl similarity index 100% rename from IO/Testing/Tcl/TestGlobFileNames.tcl rename to IO/Core/Testing/Tcl/TestGlobFileNames.tcl diff --git a/IO/Testing/Tcl/TestSortFileNames.tcl b/IO/Core/Testing/Tcl/TestSortFileNames.tcl similarity index 100% rename from IO/Testing/Tcl/TestSortFileNames.tcl rename to IO/Core/Testing/Tcl/TestSortFileNames.tcl diff --git a/IO/vtkASCIITextCodec.cxx b/IO/Core/vtkASCIITextCodec.cxx similarity index 100% rename from IO/vtkASCIITextCodec.cxx rename to IO/Core/vtkASCIITextCodec.cxx diff --git a/IO/vtkASCIITextCodec.h b/IO/Core/vtkASCIITextCodec.h similarity index 100% rename from IO/vtkASCIITextCodec.h rename to IO/Core/vtkASCIITextCodec.h diff --git a/IO/vtkAbstractParticleWriter.cxx b/IO/Core/vtkAbstractParticleWriter.cxx similarity index 100% rename from IO/vtkAbstractParticleWriter.cxx rename to IO/Core/vtkAbstractParticleWriter.cxx diff --git a/IO/vtkAbstractParticleWriter.h b/IO/Core/vtkAbstractParticleWriter.h similarity index 100% rename from IO/vtkAbstractParticleWriter.h rename to IO/Core/vtkAbstractParticleWriter.h diff --git a/IO/vtkArrayDataReader.cxx b/IO/Core/vtkArrayDataReader.cxx similarity index 100% rename from IO/vtkArrayDataReader.cxx rename to IO/Core/vtkArrayDataReader.cxx diff --git a/IO/vtkArrayDataReader.h b/IO/Core/vtkArrayDataReader.h similarity index 100% rename from IO/vtkArrayDataReader.h rename to IO/Core/vtkArrayDataReader.h diff --git a/IO/vtkArrayDataWriter.cxx b/IO/Core/vtkArrayDataWriter.cxx similarity index 100% rename from IO/vtkArrayDataWriter.cxx rename to IO/Core/vtkArrayDataWriter.cxx diff --git a/IO/vtkArrayDataWriter.h b/IO/Core/vtkArrayDataWriter.h similarity index 100% rename from IO/vtkArrayDataWriter.h rename to IO/Core/vtkArrayDataWriter.h diff --git a/IO/vtkArrayReader.cxx b/IO/Core/vtkArrayReader.cxx similarity index 100% rename from IO/vtkArrayReader.cxx rename to IO/Core/vtkArrayReader.cxx diff --git a/IO/vtkArrayReader.h b/IO/Core/vtkArrayReader.h similarity index 100% rename from IO/vtkArrayReader.h rename to IO/Core/vtkArrayReader.h diff --git a/IO/vtkArrayWriter.cxx b/IO/Core/vtkArrayWriter.cxx similarity index 100% rename from IO/vtkArrayWriter.cxx rename to IO/Core/vtkArrayWriter.cxx diff --git a/IO/vtkArrayWriter.h b/IO/Core/vtkArrayWriter.h similarity index 100% rename from IO/vtkArrayWriter.h rename to IO/Core/vtkArrayWriter.h diff --git a/IO/vtkBase64InputStream.cxx b/IO/Core/vtkBase64InputStream.cxx similarity index 100% rename from IO/vtkBase64InputStream.cxx rename to IO/Core/vtkBase64InputStream.cxx diff --git a/IO/vtkBase64InputStream.h b/IO/Core/vtkBase64InputStream.h similarity index 100% rename from IO/vtkBase64InputStream.h rename to IO/Core/vtkBase64InputStream.h diff --git a/IO/vtkBase64OutputStream.cxx b/IO/Core/vtkBase64OutputStream.cxx similarity index 100% rename from IO/vtkBase64OutputStream.cxx rename to IO/Core/vtkBase64OutputStream.cxx diff --git a/IO/vtkBase64OutputStream.h b/IO/Core/vtkBase64OutputStream.h similarity index 100% rename from IO/vtkBase64OutputStream.h rename to IO/Core/vtkBase64OutputStream.h diff --git a/IO/vtkBase64Utilities.cxx b/IO/Core/vtkBase64Utilities.cxx similarity index 100% rename from IO/vtkBase64Utilities.cxx rename to IO/Core/vtkBase64Utilities.cxx diff --git a/IO/vtkBase64Utilities.h b/IO/Core/vtkBase64Utilities.h similarity index 100% rename from IO/vtkBase64Utilities.h rename to IO/Core/vtkBase64Utilities.h diff --git a/IO/vtkDataCompressor.cxx b/IO/Core/vtkDataCompressor.cxx similarity index 100% rename from IO/vtkDataCompressor.cxx rename to IO/Core/vtkDataCompressor.cxx diff --git a/IO/vtkDataCompressor.h b/IO/Core/vtkDataCompressor.h similarity index 100% rename from IO/vtkDataCompressor.h rename to IO/Core/vtkDataCompressor.h diff --git a/IO/vtkDataObjectReader.cxx b/IO/Core/vtkDataObjectReader.cxx similarity index 100% rename from IO/vtkDataObjectReader.cxx rename to IO/Core/vtkDataObjectReader.cxx diff --git a/IO/vtkDataObjectReader.h b/IO/Core/vtkDataObjectReader.h similarity index 100% rename from IO/vtkDataObjectReader.h rename to IO/Core/vtkDataObjectReader.h diff --git a/IO/vtkDataObjectWriter.cxx b/IO/Core/vtkDataObjectWriter.cxx similarity index 100% rename from IO/vtkDataObjectWriter.cxx rename to IO/Core/vtkDataObjectWriter.cxx diff --git a/IO/vtkDataObjectWriter.h b/IO/Core/vtkDataObjectWriter.h similarity index 100% rename from IO/vtkDataObjectWriter.h rename to IO/Core/vtkDataObjectWriter.h diff --git a/IO/vtkDataReader.cxx b/IO/Core/vtkDataReader.cxx similarity index 100% rename from IO/vtkDataReader.cxx rename to IO/Core/vtkDataReader.cxx diff --git a/IO/vtkDataReader.h b/IO/Core/vtkDataReader.h similarity index 100% rename from IO/vtkDataReader.h rename to IO/Core/vtkDataReader.h diff --git a/IO/vtkDataWriter.cxx b/IO/Core/vtkDataWriter.cxx similarity index 100% rename from IO/vtkDataWriter.cxx rename to IO/Core/vtkDataWriter.cxx diff --git a/IO/vtkDataWriter.h b/IO/Core/vtkDataWriter.h similarity index 100% rename from IO/vtkDataWriter.h rename to IO/Core/vtkDataWriter.h diff --git a/IO/vtkDelimitedTextWriter.cxx b/IO/Core/vtkDelimitedTextWriter.cxx similarity index 100% rename from IO/vtkDelimitedTextWriter.cxx rename to IO/Core/vtkDelimitedTextWriter.cxx diff --git a/IO/vtkDelimitedTextWriter.h b/IO/Core/vtkDelimitedTextWriter.h similarity index 100% rename from IO/vtkDelimitedTextWriter.h rename to IO/Core/vtkDelimitedTextWriter.h diff --git a/IO/vtkGlobFileNames.cxx b/IO/Core/vtkGlobFileNames.cxx similarity index 100% rename from IO/vtkGlobFileNames.cxx rename to IO/Core/vtkGlobFileNames.cxx diff --git a/IO/vtkGlobFileNames.h b/IO/Core/vtkGlobFileNames.h similarity index 100% rename from IO/vtkGlobFileNames.h rename to IO/Core/vtkGlobFileNames.h diff --git a/IO/vtkGraphReader.cxx b/IO/Core/vtkGraphReader.cxx similarity index 100% rename from IO/vtkGraphReader.cxx rename to IO/Core/vtkGraphReader.cxx diff --git a/IO/vtkGraphReader.h b/IO/Core/vtkGraphReader.h similarity index 100% rename from IO/vtkGraphReader.h rename to IO/Core/vtkGraphReader.h diff --git a/IO/vtkGraphWriter.cxx b/IO/Core/vtkGraphWriter.cxx similarity index 100% rename from IO/vtkGraphWriter.cxx rename to IO/Core/vtkGraphWriter.cxx diff --git a/IO/vtkGraphWriter.h b/IO/Core/vtkGraphWriter.h similarity index 100% rename from IO/vtkGraphWriter.h rename to IO/Core/vtkGraphWriter.h diff --git a/IO/vtkInputStream.cxx b/IO/Core/vtkInputStream.cxx similarity index 100% rename from IO/vtkInputStream.cxx rename to IO/Core/vtkInputStream.cxx diff --git a/IO/vtkInputStream.h b/IO/Core/vtkInputStream.h similarity index 100% rename from IO/vtkInputStream.h rename to IO/Core/vtkInputStream.h diff --git a/IO/vtkJavaScriptDataWriter.cxx b/IO/Core/vtkJavaScriptDataWriter.cxx similarity index 100% rename from IO/vtkJavaScriptDataWriter.cxx rename to IO/Core/vtkJavaScriptDataWriter.cxx diff --git a/IO/vtkJavaScriptDataWriter.h b/IO/Core/vtkJavaScriptDataWriter.h similarity index 100% rename from IO/vtkJavaScriptDataWriter.h rename to IO/Core/vtkJavaScriptDataWriter.h diff --git a/IO/vtkOffsetsManagerArray.h b/IO/Core/vtkOffsetsManagerArray.h similarity index 100% rename from IO/vtkOffsetsManagerArray.h rename to IO/Core/vtkOffsetsManagerArray.h diff --git a/IO/vtkOutputStream.cxx b/IO/Core/vtkOutputStream.cxx similarity index 100% rename from IO/vtkOutputStream.cxx rename to IO/Core/vtkOutputStream.cxx diff --git a/IO/vtkOutputStream.h b/IO/Core/vtkOutputStream.h similarity index 100% rename from IO/vtkOutputStream.h rename to IO/Core/vtkOutputStream.h diff --git a/IO/vtkSortFileNames.cxx b/IO/Core/vtkSortFileNames.cxx similarity index 100% rename from IO/vtkSortFileNames.cxx rename to IO/Core/vtkSortFileNames.cxx diff --git a/IO/vtkSortFileNames.h b/IO/Core/vtkSortFileNames.h similarity index 100% rename from IO/vtkSortFileNames.h rename to IO/Core/vtkSortFileNames.h diff --git a/IO/vtkTableReader.cxx b/IO/Core/vtkTableReader.cxx similarity index 100% rename from IO/vtkTableReader.cxx rename to IO/Core/vtkTableReader.cxx diff --git a/IO/vtkTableReader.h b/IO/Core/vtkTableReader.h similarity index 100% rename from IO/vtkTableReader.h rename to IO/Core/vtkTableReader.h diff --git a/IO/vtkTableWriter.cxx b/IO/Core/vtkTableWriter.cxx similarity index 100% rename from IO/vtkTableWriter.cxx rename to IO/Core/vtkTableWriter.cxx diff --git a/IO/vtkTableWriter.h b/IO/Core/vtkTableWriter.h similarity index 100% rename from IO/vtkTableWriter.h rename to IO/Core/vtkTableWriter.h diff --git a/IO/vtkTextCodec.cxx b/IO/Core/vtkTextCodec.cxx similarity index 100% rename from IO/vtkTextCodec.cxx rename to IO/Core/vtkTextCodec.cxx diff --git a/IO/vtkTextCodec.h b/IO/Core/vtkTextCodec.h similarity index 100% rename from IO/vtkTextCodec.h rename to IO/Core/vtkTextCodec.h diff --git a/IO/vtkTextCodecFactory.cxx b/IO/Core/vtkTextCodecFactory.cxx similarity index 100% rename from IO/vtkTextCodecFactory.cxx rename to IO/Core/vtkTextCodecFactory.cxx diff --git a/IO/vtkTextCodecFactory.h b/IO/Core/vtkTextCodecFactory.h similarity index 100% rename from IO/vtkTextCodecFactory.h rename to IO/Core/vtkTextCodecFactory.h diff --git a/IO/vtkUTF16TextCodec.cxx b/IO/Core/vtkUTF16TextCodec.cxx similarity index 100% rename from IO/vtkUTF16TextCodec.cxx rename to IO/Core/vtkUTF16TextCodec.cxx diff --git a/IO/vtkUTF16TextCodec.h b/IO/Core/vtkUTF16TextCodec.h similarity index 100% rename from IO/vtkUTF16TextCodec.h rename to IO/Core/vtkUTF16TextCodec.h diff --git a/IO/vtkUTF8TextCodec.cxx b/IO/Core/vtkUTF8TextCodec.cxx similarity index 100% rename from IO/vtkUTF8TextCodec.cxx rename to IO/Core/vtkUTF8TextCodec.cxx diff --git a/IO/vtkUTF8TextCodec.h b/IO/Core/vtkUTF8TextCodec.h similarity index 100% rename from IO/vtkUTF8TextCodec.h rename to IO/Core/vtkUTF8TextCodec.h diff --git a/IO/vtkWriter.cxx b/IO/Core/vtkWriter.cxx similarity index 100% rename from IO/vtkWriter.cxx rename to IO/Core/vtkWriter.cxx diff --git a/IO/vtkWriter.h b/IO/Core/vtkWriter.h similarity index 100% rename from IO/vtkWriter.h rename to IO/Core/vtkWriter.h diff --git a/IO/vtkZLibDataCompressor.cxx b/IO/Core/vtkZLibDataCompressor.cxx similarity index 100% rename from IO/vtkZLibDataCompressor.cxx rename to IO/Core/vtkZLibDataCompressor.cxx diff --git a/IO/vtkZLibDataCompressor.h b/IO/Core/vtkZLibDataCompressor.h similarity index 100% rename from IO/vtkZLibDataCompressor.h rename to IO/Core/vtkZLibDataCompressor.h diff --git a/Graphics/Testing/Tcl/EnSight6Elements.tcl b/IO/EnSight/Testing/Tcl/EnSight6Elements.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSight6Elements.tcl rename to IO/EnSight/Testing/Tcl/EnSight6Elements.tcl diff --git a/Graphics/Testing/Tcl/EnSight6OfficeBin.tcl b/IO/EnSight/Testing/Tcl/EnSight6OfficeBin.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSight6OfficeBin.tcl rename to IO/EnSight/Testing/Tcl/EnSight6OfficeBin.tcl diff --git a/Graphics/Testing/Tcl/EnSightBlow1ASCII.tcl b/IO/EnSight/Testing/Tcl/EnSightBlow1ASCII.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightBlow1ASCII.tcl rename to IO/EnSight/Testing/Tcl/EnSightBlow1ASCII.tcl diff --git a/Graphics/Testing/Tcl/EnSightBlow1Bin.tcl b/IO/EnSight/Testing/Tcl/EnSightBlow1Bin.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightBlow1Bin.tcl rename to IO/EnSight/Testing/Tcl/EnSightBlow1Bin.tcl diff --git a/Graphics/Testing/Tcl/EnSightBlow2ASCII.tcl b/IO/EnSight/Testing/Tcl/EnSightBlow2ASCII.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightBlow2ASCII.tcl rename to IO/EnSight/Testing/Tcl/EnSightBlow2ASCII.tcl diff --git a/Graphics/Testing/Tcl/EnSightBlow2Bin.tcl b/IO/EnSight/Testing/Tcl/EnSightBlow2Bin.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightBlow2Bin.tcl rename to IO/EnSight/Testing/Tcl/EnSightBlow2Bin.tcl diff --git a/Graphics/Testing/Tcl/EnSightBlow3Bin.tcl b/IO/EnSight/Testing/Tcl/EnSightBlow3Bin.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightBlow3Bin.tcl rename to IO/EnSight/Testing/Tcl/EnSightBlow3Bin.tcl diff --git a/Graphics/Testing/Tcl/EnSightBlow4Bin.tcl b/IO/EnSight/Testing/Tcl/EnSightBlow4Bin.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightBlow4Bin.tcl rename to IO/EnSight/Testing/Tcl/EnSightBlow4Bin.tcl diff --git a/Graphics/Testing/Tcl/EnSightBlow5ASCII.tcl b/IO/EnSight/Testing/Tcl/EnSightBlow5ASCII.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightBlow5ASCII.tcl rename to IO/EnSight/Testing/Tcl/EnSightBlow5ASCII.tcl diff --git a/Graphics/Testing/Tcl/EnSightCompound.tcl b/IO/EnSight/Testing/Tcl/EnSightCompound.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightCompound.tcl rename to IO/EnSight/Testing/Tcl/EnSightCompound.tcl diff --git a/Graphics/Testing/Tcl/EnSightGoldElements.tcl b/IO/EnSight/Testing/Tcl/EnSightGoldElements.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightGoldElements.tcl rename to IO/EnSight/Testing/Tcl/EnSightGoldElements.tcl diff --git a/Graphics/Testing/Tcl/EnSightIronProtASCII.tcl b/IO/EnSight/Testing/Tcl/EnSightIronProtASCII.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightIronProtASCII.tcl rename to IO/EnSight/Testing/Tcl/EnSightIronProtASCII.tcl diff --git a/Graphics/Testing/Tcl/EnSightIronProtBin.tcl b/IO/EnSight/Testing/Tcl/EnSightIronProtBin.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightIronProtBin.tcl rename to IO/EnSight/Testing/Tcl/EnSightIronProtBin.tcl diff --git a/Graphics/Testing/Tcl/EnSightMandelbrot.tcl b/IO/EnSight/Testing/Tcl/EnSightMandelbrot.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightMandelbrot.tcl rename to IO/EnSight/Testing/Tcl/EnSightMandelbrot.tcl diff --git a/Graphics/Testing/Tcl/EnSightNfacedASCII.tcl b/IO/EnSight/Testing/Tcl/EnSightNfacedASCII.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightNfacedASCII.tcl rename to IO/EnSight/Testing/Tcl/EnSightNfacedASCII.tcl diff --git a/Graphics/Testing/Tcl/EnSightNfacedBin.tcl b/IO/EnSight/Testing/Tcl/EnSightNfacedBin.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightNfacedBin.tcl rename to IO/EnSight/Testing/Tcl/EnSightNfacedBin.tcl diff --git a/Graphics/Testing/Tcl/EnSightOfficeASCII.tcl b/IO/EnSight/Testing/Tcl/EnSightOfficeASCII.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightOfficeASCII.tcl rename to IO/EnSight/Testing/Tcl/EnSightOfficeASCII.tcl diff --git a/Graphics/Testing/Tcl/EnSightOfficeBin.tcl b/IO/EnSight/Testing/Tcl/EnSightOfficeBin.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightOfficeBin.tcl rename to IO/EnSight/Testing/Tcl/EnSightOfficeBin.tcl diff --git a/Graphics/Testing/Tcl/EnSightRectGridASCII.tcl b/IO/EnSight/Testing/Tcl/EnSightRectGridASCII.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightRectGridASCII.tcl rename to IO/EnSight/Testing/Tcl/EnSightRectGridASCII.tcl diff --git a/Graphics/Testing/Tcl/EnSightRectGridBin.tcl b/IO/EnSight/Testing/Tcl/EnSightRectGridBin.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightRectGridBin.tcl rename to IO/EnSight/Testing/Tcl/EnSightRectGridBin.tcl diff --git a/Graphics/Testing/Tcl/EnSightSelectArrays.tcl b/IO/EnSight/Testing/Tcl/EnSightSelectArrays.tcl similarity index 100% rename from Graphics/Testing/Tcl/EnSightSelectArrays.tcl rename to IO/EnSight/Testing/Tcl/EnSightSelectArrays.tcl diff --git a/Graphics/Testing/Tcl/nacaBinary.tcl b/IO/EnSight/Testing/Tcl/nacaBinary.tcl similarity index 100% rename from Graphics/Testing/Tcl/nacaBinary.tcl rename to IO/EnSight/Testing/Tcl/nacaBinary.tcl diff --git a/IO/vtkEnSight6BinaryReader.cxx b/IO/EnSight/vtkEnSight6BinaryReader.cxx similarity index 100% rename from IO/vtkEnSight6BinaryReader.cxx rename to IO/EnSight/vtkEnSight6BinaryReader.cxx diff --git a/IO/vtkEnSight6BinaryReader.h b/IO/EnSight/vtkEnSight6BinaryReader.h similarity index 100% rename from IO/vtkEnSight6BinaryReader.h rename to IO/EnSight/vtkEnSight6BinaryReader.h diff --git a/IO/vtkEnSight6Reader.cxx b/IO/EnSight/vtkEnSight6Reader.cxx similarity index 100% rename from IO/vtkEnSight6Reader.cxx rename to IO/EnSight/vtkEnSight6Reader.cxx diff --git a/IO/vtkEnSight6Reader.h b/IO/EnSight/vtkEnSight6Reader.h similarity index 100% rename from IO/vtkEnSight6Reader.h rename to IO/EnSight/vtkEnSight6Reader.h diff --git a/IO/vtkEnSightGoldBinaryReader.cxx b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx similarity index 100% rename from IO/vtkEnSightGoldBinaryReader.cxx rename to IO/EnSight/vtkEnSightGoldBinaryReader.cxx diff --git a/IO/vtkEnSightGoldBinaryReader.h b/IO/EnSight/vtkEnSightGoldBinaryReader.h similarity index 100% rename from IO/vtkEnSightGoldBinaryReader.h rename to IO/EnSight/vtkEnSightGoldBinaryReader.h diff --git a/IO/vtkEnSightGoldReader.cxx b/IO/EnSight/vtkEnSightGoldReader.cxx similarity index 100% rename from IO/vtkEnSightGoldReader.cxx rename to IO/EnSight/vtkEnSightGoldReader.cxx diff --git a/IO/vtkEnSightGoldReader.h b/IO/EnSight/vtkEnSightGoldReader.h similarity index 100% rename from IO/vtkEnSightGoldReader.h rename to IO/EnSight/vtkEnSightGoldReader.h diff --git a/IO/vtkEnSightMasterServerReader.cxx b/IO/EnSight/vtkEnSightMasterServerReader.cxx similarity index 100% rename from IO/vtkEnSightMasterServerReader.cxx rename to IO/EnSight/vtkEnSightMasterServerReader.cxx diff --git a/IO/vtkEnSightMasterServerReader.h b/IO/EnSight/vtkEnSightMasterServerReader.h similarity index 100% rename from IO/vtkEnSightMasterServerReader.h rename to IO/EnSight/vtkEnSightMasterServerReader.h diff --git a/IO/vtkEnSightReader.cxx b/IO/EnSight/vtkEnSightReader.cxx similarity index 100% rename from IO/vtkEnSightReader.cxx rename to IO/EnSight/vtkEnSightReader.cxx diff --git a/IO/vtkEnSightReader.h b/IO/EnSight/vtkEnSightReader.h similarity index 100% rename from IO/vtkEnSightReader.h rename to IO/EnSight/vtkEnSightReader.h diff --git a/IO/vtkGenericEnSightReader.cxx b/IO/EnSight/vtkGenericEnSightReader.cxx similarity index 100% rename from IO/vtkGenericEnSightReader.cxx rename to IO/EnSight/vtkGenericEnSightReader.cxx diff --git a/IO/vtkGenericEnSightReader.h b/IO/EnSight/vtkGenericEnSightReader.h similarity index 100% rename from IO/vtkGenericEnSightReader.h rename to IO/EnSight/vtkGenericEnSightReader.h diff --git a/Hybrid/Testing/Cxx/TestExodusImplicitArrays.cxx b/IO/Exodus/Testing/Cxx/TestExodusImplicitArrays.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestExodusImplicitArrays.cxx rename to IO/Exodus/Testing/Cxx/TestExodusImplicitArrays.cxx diff --git a/Hybrid/vtkExodusIICache.cxx b/IO/Exodus/vtkExodusIICache.cxx similarity index 100% rename from Hybrid/vtkExodusIICache.cxx rename to IO/Exodus/vtkExodusIICache.cxx diff --git a/Hybrid/vtkExodusIICache.h b/IO/Exodus/vtkExodusIICache.h similarity index 100% rename from Hybrid/vtkExodusIICache.h rename to IO/Exodus/vtkExodusIICache.h diff --git a/Hybrid/vtkExodusIIReader.cxx b/IO/Exodus/vtkExodusIIReader.cxx similarity index 100% rename from Hybrid/vtkExodusIIReader.cxx rename to IO/Exodus/vtkExodusIIReader.cxx diff --git a/Hybrid/vtkExodusIIReader.h b/IO/Exodus/vtkExodusIIReader.h similarity index 100% rename from Hybrid/vtkExodusIIReader.h rename to IO/Exodus/vtkExodusIIReader.h diff --git a/Hybrid/vtkExodusIIReaderParser.cxx b/IO/Exodus/vtkExodusIIReaderParser.cxx similarity index 100% rename from Hybrid/vtkExodusIIReaderParser.cxx rename to IO/Exodus/vtkExodusIIReaderParser.cxx diff --git a/Hybrid/vtkExodusIIReaderParser.h b/IO/Exodus/vtkExodusIIReaderParser.h similarity index 100% rename from Hybrid/vtkExodusIIReaderParser.h rename to IO/Exodus/vtkExodusIIReaderParser.h diff --git a/Hybrid/vtkExodusIIReaderPrivate.h b/IO/Exodus/vtkExodusIIReaderPrivate.h similarity index 100% rename from Hybrid/vtkExodusIIReaderPrivate.h rename to IO/Exodus/vtkExodusIIReaderPrivate.h diff --git a/Hybrid/vtkExodusIIReaderVariableCheck.cxx b/IO/Exodus/vtkExodusIIReaderVariableCheck.cxx similarity index 100% rename from Hybrid/vtkExodusIIReaderVariableCheck.cxx rename to IO/Exodus/vtkExodusIIReaderVariableCheck.cxx diff --git a/Hybrid/vtkExodusIIReaderVariableCheck.h b/IO/Exodus/vtkExodusIIReaderVariableCheck.h similarity index 100% rename from Hybrid/vtkExodusIIReaderVariableCheck.h rename to IO/Exodus/vtkExodusIIReaderVariableCheck.h diff --git a/Hybrid/vtkExodusModel.cxx b/IO/Exodus/vtkExodusModel.cxx similarity index 100% rename from Hybrid/vtkExodusModel.cxx rename to IO/Exodus/vtkExodusModel.cxx diff --git a/Hybrid/vtkExodusModel.h b/IO/Exodus/vtkExodusModel.h similarity index 100% rename from Hybrid/vtkExodusModel.h rename to IO/Exodus/vtkExodusModel.h diff --git a/Hybrid/Testing/Cxx/X3DTest.cxx b/IO/Export/Testing/Cxx/X3DTest.cxx similarity index 100% rename from Hybrid/Testing/Cxx/X3DTest.cxx rename to IO/Export/Testing/Cxx/X3DTest.cxx diff --git a/Rendering/Testing/Python/TestGL2PSExporter.py b/IO/Export/Testing/Python/TestGL2PSExporter.py similarity index 100% rename from Rendering/Testing/Python/TestGL2PSExporter.py rename to IO/Export/Testing/Python/TestGL2PSExporter.py diff --git a/Rendering/vtkExporter.cxx b/IO/Export/vtkExporter.cxx similarity index 100% rename from Rendering/vtkExporter.cxx rename to IO/Export/vtkExporter.cxx diff --git a/Rendering/vtkExporter.h b/IO/Export/vtkExporter.h similarity index 100% rename from Rendering/vtkExporter.h rename to IO/Export/vtkExporter.h diff --git a/Rendering/vtkGL2PSExporter.cxx b/IO/Export/vtkGL2PSExporter.cxx similarity index 100% rename from Rendering/vtkGL2PSExporter.cxx rename to IO/Export/vtkGL2PSExporter.cxx diff --git a/Rendering/vtkGL2PSExporter.h b/IO/Export/vtkGL2PSExporter.h similarity index 100% rename from Rendering/vtkGL2PSExporter.h rename to IO/Export/vtkGL2PSExporter.h diff --git a/Rendering/vtkIVExporter.cxx b/IO/Export/vtkIVExporter.cxx similarity index 100% rename from Rendering/vtkIVExporter.cxx rename to IO/Export/vtkIVExporter.cxx diff --git a/Rendering/vtkIVExporter.h b/IO/Export/vtkIVExporter.h similarity index 100% rename from Rendering/vtkIVExporter.h rename to IO/Export/vtkIVExporter.h diff --git a/Rendering/vtkOBJExporter.cxx b/IO/Export/vtkOBJExporter.cxx similarity index 100% rename from Rendering/vtkOBJExporter.cxx rename to IO/Export/vtkOBJExporter.cxx diff --git a/Rendering/vtkOBJExporter.h b/IO/Export/vtkOBJExporter.h similarity index 100% rename from Rendering/vtkOBJExporter.h rename to IO/Export/vtkOBJExporter.h diff --git a/Rendering/vtkOOGLExporter.cxx b/IO/Export/vtkOOGLExporter.cxx similarity index 100% rename from Rendering/vtkOOGLExporter.cxx rename to IO/Export/vtkOOGLExporter.cxx diff --git a/Rendering/vtkOOGLExporter.h b/IO/Export/vtkOOGLExporter.h similarity index 100% rename from Rendering/vtkOOGLExporter.h rename to IO/Export/vtkOOGLExporter.h diff --git a/Rendering/vtkPOVExporter.cxx b/IO/Export/vtkPOVExporter.cxx similarity index 100% rename from Rendering/vtkPOVExporter.cxx rename to IO/Export/vtkPOVExporter.cxx diff --git a/Rendering/vtkPOVExporter.h b/IO/Export/vtkPOVExporter.h similarity index 100% rename from Rendering/vtkPOVExporter.h rename to IO/Export/vtkPOVExporter.h diff --git a/Hybrid/vtkRIBExporter.cxx b/IO/Export/vtkRIBExporter.cxx similarity index 100% rename from Hybrid/vtkRIBExporter.cxx rename to IO/Export/vtkRIBExporter.cxx diff --git a/Hybrid/vtkRIBExporter.h b/IO/Export/vtkRIBExporter.h similarity index 100% rename from Hybrid/vtkRIBExporter.h rename to IO/Export/vtkRIBExporter.h diff --git a/Hybrid/vtkRIBLight.cxx b/IO/Export/vtkRIBLight.cxx similarity index 100% rename from Hybrid/vtkRIBLight.cxx rename to IO/Export/vtkRIBLight.cxx diff --git a/Hybrid/vtkRIBLight.h b/IO/Export/vtkRIBLight.h similarity index 100% rename from Hybrid/vtkRIBLight.h rename to IO/Export/vtkRIBLight.h diff --git a/Hybrid/vtkRIBProperty.cxx b/IO/Export/vtkRIBProperty.cxx similarity index 100% rename from Hybrid/vtkRIBProperty.cxx rename to IO/Export/vtkRIBProperty.cxx diff --git a/Hybrid/vtkRIBProperty.h b/IO/Export/vtkRIBProperty.h similarity index 100% rename from Hybrid/vtkRIBProperty.h rename to IO/Export/vtkRIBProperty.h diff --git a/Rendering/vtkVRMLExporter.cxx b/IO/Export/vtkVRMLExporter.cxx similarity index 100% rename from Rendering/vtkVRMLExporter.cxx rename to IO/Export/vtkVRMLExporter.cxx diff --git a/Rendering/vtkVRMLExporter.h b/IO/Export/vtkVRMLExporter.h similarity index 100% rename from Rendering/vtkVRMLExporter.h rename to IO/Export/vtkVRMLExporter.h diff --git a/Hybrid/vtkX3D.cxx b/IO/Export/vtkX3D.cxx similarity index 100% rename from Hybrid/vtkX3D.cxx rename to IO/Export/vtkX3D.cxx diff --git a/Hybrid/vtkX3D.h b/IO/Export/vtkX3D.h similarity index 100% rename from Hybrid/vtkX3D.h rename to IO/Export/vtkX3D.h diff --git a/Hybrid/vtkX3DExporter.cxx b/IO/Export/vtkX3DExporter.cxx similarity index 100% rename from Hybrid/vtkX3DExporter.cxx rename to IO/Export/vtkX3DExporter.cxx diff --git a/Hybrid/vtkX3DExporter.h b/IO/Export/vtkX3DExporter.h similarity index 100% rename from Hybrid/vtkX3DExporter.h rename to IO/Export/vtkX3DExporter.h diff --git a/Hybrid/vtkX3DExporterFIWriter.cxx b/IO/Export/vtkX3DExporterFIWriter.cxx similarity index 100% rename from Hybrid/vtkX3DExporterFIWriter.cxx rename to IO/Export/vtkX3DExporterFIWriter.cxx diff --git a/Hybrid/vtkX3DExporterFIWriter.h b/IO/Export/vtkX3DExporterFIWriter.h similarity index 100% rename from Hybrid/vtkX3DExporterFIWriter.h rename to IO/Export/vtkX3DExporterFIWriter.h diff --git a/Hybrid/vtkX3DExporterFIWriterHelper.h b/IO/Export/vtkX3DExporterFIWriterHelper.h similarity index 100% rename from Hybrid/vtkX3DExporterFIWriterHelper.h rename to IO/Export/vtkX3DExporterFIWriterHelper.h diff --git a/Hybrid/vtkX3DExporterJavaHelper.cxx b/IO/Export/vtkX3DExporterJavaHelper.cxx similarity index 100% rename from Hybrid/vtkX3DExporterJavaHelper.cxx rename to IO/Export/vtkX3DExporterJavaHelper.cxx diff --git a/Hybrid/vtkX3DExporterJavaHelper.h b/IO/Export/vtkX3DExporterJavaHelper.h similarity index 100% rename from Hybrid/vtkX3DExporterJavaHelper.h rename to IO/Export/vtkX3DExporterJavaHelper.h diff --git a/Hybrid/vtkX3DExporterWriter.cxx b/IO/Export/vtkX3DExporterWriter.cxx similarity index 100% rename from Hybrid/vtkX3DExporterWriter.cxx rename to IO/Export/vtkX3DExporterWriter.cxx diff --git a/Hybrid/vtkX3DExporterWriter.h b/IO/Export/vtkX3DExporterWriter.h similarity index 100% rename from Hybrid/vtkX3DExporterWriter.h rename to IO/Export/vtkX3DExporterWriter.h diff --git a/Hybrid/vtkX3DExporterXMLWriter.cxx b/IO/Export/vtkX3DExporterXMLWriter.cxx similarity index 100% rename from Hybrid/vtkX3DExporterXMLWriter.cxx rename to IO/Export/vtkX3DExporterXMLWriter.cxx diff --git a/Hybrid/vtkX3DExporterXMLWriter.h b/IO/Export/vtkX3DExporterXMLWriter.h similarity index 100% rename from Hybrid/vtkX3DExporterXMLWriter.h rename to IO/Export/vtkX3DExporterXMLWriter.h diff --git a/IO/Testing/Cxx/TestDataObjectIO.cxx b/IO/Geometry/Testing/Cxx/TestDataObjectIO.cxx similarity index 100% rename from IO/Testing/Cxx/TestDataObjectIO.cxx rename to IO/Geometry/Testing/Cxx/TestDataObjectIO.cxx diff --git a/Graphics/Testing/Cxx/TestIncrementalOctreePointLocator.cxx b/IO/Geometry/Testing/Cxx/TestIncrementalOctreePointLocator.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestIncrementalOctreePointLocator.cxx rename to IO/Geometry/Testing/Cxx/TestIncrementalOctreePointLocator.cxx diff --git a/IO/Testing/Cxx/TestProStarReader.cxx b/IO/Geometry/Testing/Cxx/TestProStarReader.cxx similarity index 100% rename from IO/Testing/Cxx/TestProStarReader.cxx rename to IO/Geometry/Testing/Cxx/TestProStarReader.cxx diff --git a/IO/Testing/Cxx/TestSimplePointsReaderWriter.cxx b/IO/Geometry/Testing/Cxx/TestSimplePointsReaderWriter.cxx similarity index 100% rename from IO/Testing/Cxx/TestSimplePointsReaderWriter.cxx rename to IO/Geometry/Testing/Cxx/TestSimplePointsReaderWriter.cxx diff --git a/IO/Testing/Cxx/TestTecplotReader.cxx b/IO/Geometry/Testing/Cxx/TestTecplotReader.cxx similarity index 100% rename from IO/Testing/Cxx/TestTecplotReader.cxx rename to IO/Geometry/Testing/Cxx/TestTecplotReader.cxx diff --git a/Graphics/Testing/Cxx/UnstructuredGridCellGradients.cxx b/IO/Geometry/Testing/Cxx/UnstructuredGridCellGradients.cxx similarity index 100% rename from Graphics/Testing/Cxx/UnstructuredGridCellGradients.cxx rename to IO/Geometry/Testing/Cxx/UnstructuredGridCellGradients.cxx diff --git a/Graphics/Testing/Cxx/UnstructuredGridFastGradients.cxx b/IO/Geometry/Testing/Cxx/UnstructuredGridFastGradients.cxx similarity index 100% rename from Graphics/Testing/Cxx/UnstructuredGridFastGradients.cxx rename to IO/Geometry/Testing/Cxx/UnstructuredGridFastGradients.cxx diff --git a/Graphics/Testing/Cxx/UnstructuredGridGradients.cxx b/IO/Geometry/Testing/Cxx/UnstructuredGridGradients.cxx similarity index 100% rename from Graphics/Testing/Cxx/UnstructuredGridGradients.cxx rename to IO/Geometry/Testing/Cxx/UnstructuredGridGradients.cxx diff --git a/IO/Testing/Tcl/ParticleReader.tcl b/IO/Geometry/Testing/Tcl/ParticleReader.tcl similarity index 100% rename from IO/Testing/Tcl/ParticleReader.tcl rename to IO/Geometry/Testing/Tcl/ParticleReader.tcl diff --git a/IO/Testing/Tcl/Plot3DScalars.tcl b/IO/Geometry/Testing/Tcl/Plot3DScalars.tcl similarity index 100% rename from IO/Testing/Tcl/Plot3DScalars.tcl rename to IO/Geometry/Testing/Tcl/Plot3DScalars.tcl diff --git a/IO/Testing/Tcl/Plot3DVectors.tcl b/IO/Geometry/Testing/Tcl/Plot3DVectors.tcl similarity index 100% rename from IO/Testing/Tcl/Plot3DVectors.tcl rename to IO/Geometry/Testing/Tcl/Plot3DVectors.tcl diff --git a/IO/Testing/Tcl/TestAVSucdReader.tcl b/IO/Geometry/Testing/Tcl/TestAVSucdReader.tcl similarity index 100% rename from IO/Testing/Tcl/TestAVSucdReader.tcl rename to IO/Geometry/Testing/Tcl/TestAVSucdReader.tcl diff --git a/IO/Testing/Tcl/TestChacoReader.tcl b/IO/Geometry/Testing/Tcl/TestChacoReader.tcl similarity index 100% rename from IO/Testing/Tcl/TestChacoReader.tcl rename to IO/Geometry/Testing/Tcl/TestChacoReader.tcl diff --git a/IO/Testing/Tcl/TestGAMBITReader.tcl b/IO/Geometry/Testing/Tcl/TestGAMBITReader.tcl similarity index 100% rename from IO/Testing/Tcl/TestGAMBITReader.tcl rename to IO/Geometry/Testing/Tcl/TestGAMBITReader.tcl diff --git a/IO/Testing/Tcl/TestPolygonWriters.tcl b/IO/Geometry/Testing/Tcl/TestPolygonWriters.tcl similarity index 100% rename from IO/Testing/Tcl/TestPolygonWriters.tcl rename to IO/Geometry/Testing/Tcl/TestPolygonWriters.tcl diff --git a/IO/Testing/Tcl/TestSimplePointsReader.tcl b/IO/Geometry/Testing/Tcl/TestSimplePointsReader.tcl similarity index 100% rename from IO/Testing/Tcl/TestSimplePointsReader.tcl rename to IO/Geometry/Testing/Tcl/TestSimplePointsReader.tcl diff --git a/IO/Testing/Tcl/TestXYZMol.tcl b/IO/Geometry/Testing/Tcl/TestXYZMol.tcl similarity index 100% rename from IO/Testing/Tcl/TestXYZMol.tcl rename to IO/Geometry/Testing/Tcl/TestXYZMol.tcl diff --git a/IO/Testing/Tcl/caffeine.tcl b/IO/Geometry/Testing/Tcl/caffeine.tcl similarity index 100% rename from IO/Testing/Tcl/caffeine.tcl rename to IO/Geometry/Testing/Tcl/caffeine.tcl diff --git a/Graphics/Testing/Tcl/motor.tcl b/IO/Geometry/Testing/Tcl/motor.tcl similarity index 100% rename from Graphics/Testing/Tcl/motor.tcl rename to IO/Geometry/Testing/Tcl/motor.tcl diff --git a/Graphics/Testing/Tcl/testHexaPenta.tcl b/IO/Geometry/Testing/Tcl/testHexaPenta.tcl similarity index 100% rename from Graphics/Testing/Tcl/testHexaPenta.tcl rename to IO/Geometry/Testing/Tcl/testHexaPenta.tcl diff --git a/IO/vtkAVSucdReader.cxx b/IO/Geometry/vtkAVSucdReader.cxx similarity index 100% rename from IO/vtkAVSucdReader.cxx rename to IO/Geometry/vtkAVSucdReader.cxx diff --git a/IO/vtkAVSucdReader.h b/IO/Geometry/vtkAVSucdReader.h similarity index 100% rename from IO/vtkAVSucdReader.h rename to IO/Geometry/vtkAVSucdReader.h diff --git a/IO/vtkBYUReader.cxx b/IO/Geometry/vtkBYUReader.cxx similarity index 100% rename from IO/vtkBYUReader.cxx rename to IO/Geometry/vtkBYUReader.cxx diff --git a/IO/vtkBYUReader.h b/IO/Geometry/vtkBYUReader.h similarity index 100% rename from IO/vtkBYUReader.h rename to IO/Geometry/vtkBYUReader.h diff --git a/IO/vtkBYUWriter.cxx b/IO/Geometry/vtkBYUWriter.cxx similarity index 100% rename from IO/vtkBYUWriter.cxx rename to IO/Geometry/vtkBYUWriter.cxx diff --git a/IO/vtkBYUWriter.h b/IO/Geometry/vtkBYUWriter.h similarity index 100% rename from IO/vtkBYUWriter.h rename to IO/Geometry/vtkBYUWriter.h diff --git a/IO/vtkCGMWriter.cxx b/IO/Geometry/vtkCGMWriter.cxx similarity index 100% rename from IO/vtkCGMWriter.cxx rename to IO/Geometry/vtkCGMWriter.cxx diff --git a/IO/vtkCGMWriter.h b/IO/Geometry/vtkCGMWriter.h similarity index 100% rename from IO/vtkCGMWriter.h rename to IO/Geometry/vtkCGMWriter.h diff --git a/IO/vtkChacoReader.cxx b/IO/Geometry/vtkChacoReader.cxx similarity index 100% rename from IO/vtkChacoReader.cxx rename to IO/Geometry/vtkChacoReader.cxx diff --git a/IO/vtkChacoReader.h b/IO/Geometry/vtkChacoReader.h similarity index 100% rename from IO/vtkChacoReader.h rename to IO/Geometry/vtkChacoReader.h diff --git a/IO/vtkCompositeDataReader.cxx b/IO/Geometry/vtkCompositeDataReader.cxx similarity index 100% rename from IO/vtkCompositeDataReader.cxx rename to IO/Geometry/vtkCompositeDataReader.cxx diff --git a/IO/vtkCompositeDataReader.h b/IO/Geometry/vtkCompositeDataReader.h similarity index 100% rename from IO/vtkCompositeDataReader.h rename to IO/Geometry/vtkCompositeDataReader.h diff --git a/IO/vtkCompositeDataWriter.cxx b/IO/Geometry/vtkCompositeDataWriter.cxx similarity index 100% rename from IO/vtkCompositeDataWriter.cxx rename to IO/Geometry/vtkCompositeDataWriter.cxx diff --git a/IO/vtkCompositeDataWriter.h b/IO/Geometry/vtkCompositeDataWriter.h similarity index 100% rename from IO/vtkCompositeDataWriter.h rename to IO/Geometry/vtkCompositeDataWriter.h diff --git a/IO/vtkDataSetReader.cxx b/IO/Geometry/vtkDataSetReader.cxx similarity index 100% rename from IO/vtkDataSetReader.cxx rename to IO/Geometry/vtkDataSetReader.cxx diff --git a/IO/vtkDataSetReader.h b/IO/Geometry/vtkDataSetReader.h similarity index 100% rename from IO/vtkDataSetReader.h rename to IO/Geometry/vtkDataSetReader.h diff --git a/IO/vtkDataSetWriter.cxx b/IO/Geometry/vtkDataSetWriter.cxx similarity index 100% rename from IO/vtkDataSetWriter.cxx rename to IO/Geometry/vtkDataSetWriter.cxx diff --git a/IO/vtkDataSetWriter.h b/IO/Geometry/vtkDataSetWriter.h similarity index 100% rename from IO/vtkDataSetWriter.h rename to IO/Geometry/vtkDataSetWriter.h diff --git a/IO/vtkFLUENTReader.cxx b/IO/Geometry/vtkFLUENTReader.cxx similarity index 100% rename from IO/vtkFLUENTReader.cxx rename to IO/Geometry/vtkFLUENTReader.cxx diff --git a/IO/vtkFLUENTReader.h b/IO/Geometry/vtkFLUENTReader.h similarity index 100% rename from IO/vtkFLUENTReader.h rename to IO/Geometry/vtkFLUENTReader.h diff --git a/IO/vtkFacetWriter.cxx b/IO/Geometry/vtkFacetWriter.cxx similarity index 100% rename from IO/vtkFacetWriter.cxx rename to IO/Geometry/vtkFacetWriter.cxx diff --git a/IO/vtkFacetWriter.h b/IO/Geometry/vtkFacetWriter.h similarity index 100% rename from IO/vtkFacetWriter.h rename to IO/Geometry/vtkFacetWriter.h diff --git a/IO/vtkGAMBITReader.cxx b/IO/Geometry/vtkGAMBITReader.cxx similarity index 100% rename from IO/vtkGAMBITReader.cxx rename to IO/Geometry/vtkGAMBITReader.cxx diff --git a/IO/vtkGAMBITReader.h b/IO/Geometry/vtkGAMBITReader.h similarity index 100% rename from IO/vtkGAMBITReader.h rename to IO/Geometry/vtkGAMBITReader.h diff --git a/IO/vtkGenericDataObjectReader.cxx b/IO/Geometry/vtkGenericDataObjectReader.cxx similarity index 100% rename from IO/vtkGenericDataObjectReader.cxx rename to IO/Geometry/vtkGenericDataObjectReader.cxx diff --git a/IO/vtkGenericDataObjectReader.h b/IO/Geometry/vtkGenericDataObjectReader.h similarity index 100% rename from IO/vtkGenericDataObjectReader.h rename to IO/Geometry/vtkGenericDataObjectReader.h diff --git a/IO/vtkGenericDataObjectWriter.cxx b/IO/Geometry/vtkGenericDataObjectWriter.cxx similarity index 100% rename from IO/vtkGenericDataObjectWriter.cxx rename to IO/Geometry/vtkGenericDataObjectWriter.cxx diff --git a/IO/vtkGenericDataObjectWriter.h b/IO/Geometry/vtkGenericDataObjectWriter.h similarity index 100% rename from IO/vtkGenericDataObjectWriter.h rename to IO/Geometry/vtkGenericDataObjectWriter.h diff --git a/IO/vtkGenericMovieWriter.cxx b/IO/Geometry/vtkGenericMovieWriter.cxx similarity index 100% rename from IO/vtkGenericMovieWriter.cxx rename to IO/Geometry/vtkGenericMovieWriter.cxx diff --git a/IO/vtkGenericMovieWriter.h b/IO/Geometry/vtkGenericMovieWriter.h similarity index 100% rename from IO/vtkGenericMovieWriter.h rename to IO/Geometry/vtkGenericMovieWriter.h diff --git a/IO/vtkIVWriter.cxx b/IO/Geometry/vtkIVWriter.cxx similarity index 100% rename from IO/vtkIVWriter.cxx rename to IO/Geometry/vtkIVWriter.cxx diff --git a/IO/vtkIVWriter.h b/IO/Geometry/vtkIVWriter.h similarity index 100% rename from IO/vtkIVWriter.h rename to IO/Geometry/vtkIVWriter.h diff --git a/IO/vtkMCubesReader.cxx b/IO/Geometry/vtkMCubesReader.cxx similarity index 100% rename from IO/vtkMCubesReader.cxx rename to IO/Geometry/vtkMCubesReader.cxx diff --git a/IO/vtkMCubesReader.h b/IO/Geometry/vtkMCubesReader.h similarity index 100% rename from IO/vtkMCubesReader.h rename to IO/Geometry/vtkMCubesReader.h diff --git a/IO/vtkMCubesWriter.cxx b/IO/Geometry/vtkMCubesWriter.cxx similarity index 100% rename from IO/vtkMCubesWriter.cxx rename to IO/Geometry/vtkMCubesWriter.cxx diff --git a/IO/vtkMCubesWriter.h b/IO/Geometry/vtkMCubesWriter.h similarity index 100% rename from IO/vtkMCubesWriter.h rename to IO/Geometry/vtkMCubesWriter.h diff --git a/IO/vtkMFIXReader.cxx b/IO/Geometry/vtkMFIXReader.cxx similarity index 100% rename from IO/vtkMFIXReader.cxx rename to IO/Geometry/vtkMFIXReader.cxx diff --git a/IO/vtkMFIXReader.h b/IO/Geometry/vtkMFIXReader.h similarity index 100% rename from IO/vtkMFIXReader.h rename to IO/Geometry/vtkMFIXReader.h diff --git a/IO/vtkMaterialLibrary.cxx b/IO/Geometry/vtkMaterialLibrary.cxx similarity index 100% rename from IO/vtkMaterialLibrary.cxx rename to IO/Geometry/vtkMaterialLibrary.cxx diff --git a/IO/vtkMaterialLibrary.h b/IO/Geometry/vtkMaterialLibrary.h similarity index 100% rename from IO/vtkMaterialLibrary.h rename to IO/Geometry/vtkMaterialLibrary.h diff --git a/IO/vtkMoleculeReaderBase.cxx b/IO/Geometry/vtkMoleculeReaderBase.cxx similarity index 100% rename from IO/vtkMoleculeReaderBase.cxx rename to IO/Geometry/vtkMoleculeReaderBase.cxx diff --git a/IO/vtkMoleculeReaderBase.h b/IO/Geometry/vtkMoleculeReaderBase.h similarity index 100% rename from IO/vtkMoleculeReaderBase.h rename to IO/Geometry/vtkMoleculeReaderBase.h diff --git a/IO/vtkMultiBlockPLOT3DReader.cxx b/IO/Geometry/vtkMultiBlockPLOT3DReader.cxx similarity index 100% rename from IO/vtkMultiBlockPLOT3DReader.cxx rename to IO/Geometry/vtkMultiBlockPLOT3DReader.cxx diff --git a/IO/vtkMultiBlockPLOT3DReader.h b/IO/Geometry/vtkMultiBlockPLOT3DReader.h similarity index 100% rename from IO/vtkMultiBlockPLOT3DReader.h rename to IO/Geometry/vtkMultiBlockPLOT3DReader.h diff --git a/IO/vtkOBJReader.cxx b/IO/Geometry/vtkOBJReader.cxx similarity index 100% rename from IO/vtkOBJReader.cxx rename to IO/Geometry/vtkOBJReader.cxx diff --git a/IO/vtkOBJReader.h b/IO/Geometry/vtkOBJReader.h similarity index 100% rename from IO/vtkOBJReader.h rename to IO/Geometry/vtkOBJReader.h diff --git a/IO/vtkOpenFOAMReader.cxx b/IO/Geometry/vtkOpenFOAMReader.cxx similarity index 100% rename from IO/vtkOpenFOAMReader.cxx rename to IO/Geometry/vtkOpenFOAMReader.cxx diff --git a/IO/vtkOpenFOAMReader.h b/IO/Geometry/vtkOpenFOAMReader.h similarity index 100% rename from IO/vtkOpenFOAMReader.h rename to IO/Geometry/vtkOpenFOAMReader.h diff --git a/IO/vtkPDBReader.cxx b/IO/Geometry/vtkPDBReader.cxx similarity index 100% rename from IO/vtkPDBReader.cxx rename to IO/Geometry/vtkPDBReader.cxx diff --git a/IO/vtkPDBReader.h b/IO/Geometry/vtkPDBReader.h similarity index 100% rename from IO/vtkPDBReader.h rename to IO/Geometry/vtkPDBReader.h diff --git a/IO/vtkParticleReader.cxx b/IO/Geometry/vtkParticleReader.cxx similarity index 100% rename from IO/vtkParticleReader.cxx rename to IO/Geometry/vtkParticleReader.cxx diff --git a/IO/vtkParticleReader.h b/IO/Geometry/vtkParticleReader.h similarity index 100% rename from IO/vtkParticleReader.h rename to IO/Geometry/vtkParticleReader.h diff --git a/IO/vtkPolyDataReader.cxx b/IO/Geometry/vtkPolyDataReader.cxx similarity index 100% rename from IO/vtkPolyDataReader.cxx rename to IO/Geometry/vtkPolyDataReader.cxx diff --git a/IO/vtkPolyDataReader.h b/IO/Geometry/vtkPolyDataReader.h similarity index 100% rename from IO/vtkPolyDataReader.h rename to IO/Geometry/vtkPolyDataReader.h diff --git a/IO/vtkPolyDataWriter.cxx b/IO/Geometry/vtkPolyDataWriter.cxx similarity index 100% rename from IO/vtkPolyDataWriter.cxx rename to IO/Geometry/vtkPolyDataWriter.cxx diff --git a/IO/vtkPolyDataWriter.h b/IO/Geometry/vtkPolyDataWriter.h similarity index 100% rename from IO/vtkPolyDataWriter.h rename to IO/Geometry/vtkPolyDataWriter.h diff --git a/IO/vtkProStarReader.cxx b/IO/Geometry/vtkProStarReader.cxx similarity index 100% rename from IO/vtkProStarReader.cxx rename to IO/Geometry/vtkProStarReader.cxx diff --git a/IO/vtkProStarReader.h b/IO/Geometry/vtkProStarReader.h similarity index 100% rename from IO/vtkProStarReader.h rename to IO/Geometry/vtkProStarReader.h diff --git a/IO/vtkRectilinearGridReader.cxx b/IO/Geometry/vtkRectilinearGridReader.cxx similarity index 100% rename from IO/vtkRectilinearGridReader.cxx rename to IO/Geometry/vtkRectilinearGridReader.cxx diff --git a/IO/vtkRectilinearGridReader.h b/IO/Geometry/vtkRectilinearGridReader.h similarity index 100% rename from IO/vtkRectilinearGridReader.h rename to IO/Geometry/vtkRectilinearGridReader.h diff --git a/IO/vtkRectilinearGridWriter.cxx b/IO/Geometry/vtkRectilinearGridWriter.cxx similarity index 100% rename from IO/vtkRectilinearGridWriter.cxx rename to IO/Geometry/vtkRectilinearGridWriter.cxx diff --git a/IO/vtkRectilinearGridWriter.h b/IO/Geometry/vtkRectilinearGridWriter.h similarity index 100% rename from IO/vtkRectilinearGridWriter.h rename to IO/Geometry/vtkRectilinearGridWriter.h diff --git a/IO/vtkSESAMEReader.cxx b/IO/Geometry/vtkSESAMEReader.cxx similarity index 100% rename from IO/vtkSESAMEReader.cxx rename to IO/Geometry/vtkSESAMEReader.cxx diff --git a/IO/vtkSESAMEReader.h b/IO/Geometry/vtkSESAMEReader.h similarity index 100% rename from IO/vtkSESAMEReader.h rename to IO/Geometry/vtkSESAMEReader.h diff --git a/IO/vtkSTLReader.cxx b/IO/Geometry/vtkSTLReader.cxx similarity index 100% rename from IO/vtkSTLReader.cxx rename to IO/Geometry/vtkSTLReader.cxx diff --git a/IO/vtkSTLReader.h b/IO/Geometry/vtkSTLReader.h similarity index 100% rename from IO/vtkSTLReader.h rename to IO/Geometry/vtkSTLReader.h diff --git a/IO/vtkSTLWriter.cxx b/IO/Geometry/vtkSTLWriter.cxx similarity index 100% rename from IO/vtkSTLWriter.cxx rename to IO/Geometry/vtkSTLWriter.cxx diff --git a/IO/vtkSTLWriter.h b/IO/Geometry/vtkSTLWriter.h similarity index 100% rename from IO/vtkSTLWriter.h rename to IO/Geometry/vtkSTLWriter.h diff --git a/IO/vtkShaderCodeLibrary.cxx b/IO/Geometry/vtkShaderCodeLibrary.cxx similarity index 100% rename from IO/vtkShaderCodeLibrary.cxx rename to IO/Geometry/vtkShaderCodeLibrary.cxx diff --git a/IO/vtkShaderCodeLibrary.h b/IO/Geometry/vtkShaderCodeLibrary.h similarity index 100% rename from IO/vtkShaderCodeLibrary.h rename to IO/Geometry/vtkShaderCodeLibrary.h diff --git a/IO/vtkSimplePointsReader.cxx b/IO/Geometry/vtkSimplePointsReader.cxx similarity index 100% rename from IO/vtkSimplePointsReader.cxx rename to IO/Geometry/vtkSimplePointsReader.cxx diff --git a/IO/vtkSimplePointsReader.h b/IO/Geometry/vtkSimplePointsReader.h similarity index 100% rename from IO/vtkSimplePointsReader.h rename to IO/Geometry/vtkSimplePointsReader.h diff --git a/IO/vtkSimplePointsWriter.cxx b/IO/Geometry/vtkSimplePointsWriter.cxx similarity index 100% rename from IO/vtkSimplePointsWriter.cxx rename to IO/Geometry/vtkSimplePointsWriter.cxx diff --git a/IO/vtkSimplePointsWriter.h b/IO/Geometry/vtkSimplePointsWriter.h similarity index 100% rename from IO/vtkSimplePointsWriter.h rename to IO/Geometry/vtkSimplePointsWriter.h diff --git a/IO/vtkStructuredGridReader.cxx b/IO/Geometry/vtkStructuredGridReader.cxx similarity index 100% rename from IO/vtkStructuredGridReader.cxx rename to IO/Geometry/vtkStructuredGridReader.cxx diff --git a/IO/vtkStructuredGridReader.h b/IO/Geometry/vtkStructuredGridReader.h similarity index 100% rename from IO/vtkStructuredGridReader.h rename to IO/Geometry/vtkStructuredGridReader.h diff --git a/IO/vtkStructuredGridWriter.cxx b/IO/Geometry/vtkStructuredGridWriter.cxx similarity index 100% rename from IO/vtkStructuredGridWriter.cxx rename to IO/Geometry/vtkStructuredGridWriter.cxx diff --git a/IO/vtkStructuredGridWriter.h b/IO/Geometry/vtkStructuredGridWriter.h similarity index 100% rename from IO/vtkStructuredGridWriter.h rename to IO/Geometry/vtkStructuredGridWriter.h diff --git a/IO/vtkStructuredPointsReader.cxx b/IO/Geometry/vtkStructuredPointsReader.cxx similarity index 100% rename from IO/vtkStructuredPointsReader.cxx rename to IO/Geometry/vtkStructuredPointsReader.cxx diff --git a/IO/vtkStructuredPointsReader.h b/IO/Geometry/vtkStructuredPointsReader.h similarity index 100% rename from IO/vtkStructuredPointsReader.h rename to IO/Geometry/vtkStructuredPointsReader.h diff --git a/IO/vtkStructuredPointsWriter.cxx b/IO/Geometry/vtkStructuredPointsWriter.cxx similarity index 100% rename from IO/vtkStructuredPointsWriter.cxx rename to IO/Geometry/vtkStructuredPointsWriter.cxx diff --git a/IO/vtkStructuredPointsWriter.h b/IO/Geometry/vtkStructuredPointsWriter.h similarity index 100% rename from IO/vtkStructuredPointsWriter.h rename to IO/Geometry/vtkStructuredPointsWriter.h diff --git a/IO/vtkTecplotReader.cxx b/IO/Geometry/vtkTecplotReader.cxx similarity index 100% rename from IO/vtkTecplotReader.cxx rename to IO/Geometry/vtkTecplotReader.cxx diff --git a/IO/vtkTecplotReader.h b/IO/Geometry/vtkTecplotReader.h similarity index 100% rename from IO/vtkTecplotReader.h rename to IO/Geometry/vtkTecplotReader.h diff --git a/IO/vtkTreeReader.cxx b/IO/Geometry/vtkTreeReader.cxx similarity index 100% rename from IO/vtkTreeReader.cxx rename to IO/Geometry/vtkTreeReader.cxx diff --git a/IO/vtkTreeReader.h b/IO/Geometry/vtkTreeReader.h similarity index 100% rename from IO/vtkTreeReader.h rename to IO/Geometry/vtkTreeReader.h diff --git a/IO/vtkTreeWriter.cxx b/IO/Geometry/vtkTreeWriter.cxx similarity index 100% rename from IO/vtkTreeWriter.cxx rename to IO/Geometry/vtkTreeWriter.cxx diff --git a/IO/vtkTreeWriter.h b/IO/Geometry/vtkTreeWriter.h similarity index 100% rename from IO/vtkTreeWriter.h rename to IO/Geometry/vtkTreeWriter.h diff --git a/IO/vtkUGFacetReader.cxx b/IO/Geometry/vtkUGFacetReader.cxx similarity index 100% rename from IO/vtkUGFacetReader.cxx rename to IO/Geometry/vtkUGFacetReader.cxx diff --git a/IO/vtkUGFacetReader.h b/IO/Geometry/vtkUGFacetReader.h similarity index 100% rename from IO/vtkUGFacetReader.h rename to IO/Geometry/vtkUGFacetReader.h diff --git a/IO/vtkUnstructuredGridReader.cxx b/IO/Geometry/vtkUnstructuredGridReader.cxx similarity index 100% rename from IO/vtkUnstructuredGridReader.cxx rename to IO/Geometry/vtkUnstructuredGridReader.cxx diff --git a/IO/vtkUnstructuredGridReader.h b/IO/Geometry/vtkUnstructuredGridReader.h similarity index 100% rename from IO/vtkUnstructuredGridReader.h rename to IO/Geometry/vtkUnstructuredGridReader.h diff --git a/IO/vtkUnstructuredGridWriter.cxx b/IO/Geometry/vtkUnstructuredGridWriter.cxx similarity index 100% rename from IO/vtkUnstructuredGridWriter.cxx rename to IO/Geometry/vtkUnstructuredGridWriter.cxx diff --git a/IO/vtkUnstructuredGridWriter.h b/IO/Geometry/vtkUnstructuredGridWriter.h similarity index 100% rename from IO/vtkUnstructuredGridWriter.h rename to IO/Geometry/vtkUnstructuredGridWriter.h diff --git a/IO/vtkXYZMolReader.cxx b/IO/Geometry/vtkXYZMolReader.cxx similarity index 100% rename from IO/vtkXYZMolReader.cxx rename to IO/Geometry/vtkXYZMolReader.cxx diff --git a/IO/vtkXYZMolReader.h b/IO/Geometry/vtkXYZMolReader.h similarity index 100% rename from IO/vtkXYZMolReader.h rename to IO/Geometry/vtkXYZMolReader.h diff --git a/IO/Testing/Cxx/TestAVIWriter.cxx b/IO/Image/Testing/Cxx/TestAVIWriter.cxx similarity index 100% rename from IO/Testing/Cxx/TestAVIWriter.cxx rename to IO/Image/Testing/Cxx/TestAVIWriter.cxx diff --git a/IO/Testing/Cxx/TestFFMPEGWriter.cxx b/IO/Image/Testing/Cxx/TestFFMPEGWriter.cxx similarity index 100% rename from IO/Testing/Cxx/TestFFMPEGWriter.cxx rename to IO/Image/Testing/Cxx/TestFFMPEGWriter.cxx diff --git a/IO/Testing/Cxx/TestImageReader2Factory.cxx b/IO/Image/Testing/Cxx/TestImageReader2Factory.cxx similarity index 100% rename from IO/Testing/Cxx/TestImageReader2Factory.cxx rename to IO/Image/Testing/Cxx/TestImageReader2Factory.cxx diff --git a/IO/Testing/Cxx/TestMetaIO.cxx b/IO/Image/Testing/Cxx/TestMetaIO.cxx similarity index 100% rename from IO/Testing/Cxx/TestMetaIO.cxx rename to IO/Image/Testing/Cxx/TestMetaIO.cxx diff --git a/IO/Testing/Cxx/TestMovieWriter.cxx b/IO/Image/Testing/Cxx/TestMovieWriter.cxx similarity index 100% rename from IO/Testing/Cxx/TestMovieWriter.cxx rename to IO/Image/Testing/Cxx/TestMovieWriter.cxx diff --git a/IO/Testing/Cxx/TestOggTheoraWriter.cxx b/IO/Image/Testing/Cxx/TestOggTheoraWriter.cxx similarity index 100% rename from IO/Testing/Cxx/TestOggTheoraWriter.cxx rename to IO/Image/Testing/Cxx/TestOggTheoraWriter.cxx diff --git a/IO/Testing/Tcl/TestBMPReader.tcl b/IO/Image/Testing/Tcl/TestBMPReader.tcl similarity index 100% rename from IO/Testing/Tcl/TestBMPReader.tcl rename to IO/Image/Testing/Tcl/TestBMPReader.tcl diff --git a/IO/Testing/Tcl/TestImageWriters.tcl b/IO/Image/Testing/Tcl/TestImageWriters.tcl similarity index 100% rename from IO/Testing/Tcl/TestImageWriters.tcl rename to IO/Image/Testing/Tcl/TestImageWriters.tcl diff --git a/IO/Testing/Tcl/TestJPEGReader.tcl b/IO/Image/Testing/Tcl/TestJPEGReader.tcl similarity index 100% rename from IO/Testing/Tcl/TestJPEGReader.tcl rename to IO/Image/Testing/Tcl/TestJPEGReader.tcl diff --git a/IO/Testing/Tcl/TestMHD.tcl b/IO/Image/Testing/Tcl/TestMHD.tcl similarity index 100% rename from IO/Testing/Tcl/TestMHD.tcl rename to IO/Image/Testing/Tcl/TestMHD.tcl diff --git a/IO/Testing/Tcl/TestMetaImage2D.tcl b/IO/Image/Testing/Tcl/TestMetaImage2D.tcl similarity index 100% rename from IO/Testing/Tcl/TestMetaImage2D.tcl rename to IO/Image/Testing/Tcl/TestMetaImage2D.tcl diff --git a/IO/Testing/Tcl/TestSetFileNames.tcl b/IO/Image/Testing/Tcl/TestSetFileNames.tcl similarity index 100% rename from IO/Testing/Tcl/TestSetFileNames.tcl rename to IO/Image/Testing/Tcl/TestSetFileNames.tcl diff --git a/IO/Testing/Tcl/TestTIFFReader.tcl b/IO/Image/Testing/Tcl/TestTIFFReader.tcl similarity index 100% rename from IO/Testing/Tcl/TestTIFFReader.tcl rename to IO/Image/Testing/Tcl/TestTIFFReader.tcl diff --git a/IO/Testing/Tcl/dem.tcl b/IO/Image/Testing/Tcl/dem.tcl similarity index 100% rename from IO/Testing/Tcl/dem.tcl rename to IO/Image/Testing/Tcl/dem.tcl diff --git a/IO/vtkAVIWriter.cxx b/IO/Image/vtkAVIWriter.cxx similarity index 100% rename from IO/vtkAVIWriter.cxx rename to IO/Image/vtkAVIWriter.cxx diff --git a/IO/vtkAVIWriter.h b/IO/Image/vtkAVIWriter.h similarity index 100% rename from IO/vtkAVIWriter.h rename to IO/Image/vtkAVIWriter.h diff --git a/IO/vtkBMPReader.cxx b/IO/Image/vtkBMPReader.cxx similarity index 100% rename from IO/vtkBMPReader.cxx rename to IO/Image/vtkBMPReader.cxx diff --git a/IO/vtkBMPReader.h b/IO/Image/vtkBMPReader.h similarity index 100% rename from IO/vtkBMPReader.h rename to IO/Image/vtkBMPReader.h diff --git a/IO/vtkBMPWriter.cxx b/IO/Image/vtkBMPWriter.cxx similarity index 100% rename from IO/vtkBMPWriter.cxx rename to IO/Image/vtkBMPWriter.cxx diff --git a/IO/vtkBMPWriter.h b/IO/Image/vtkBMPWriter.h similarity index 100% rename from IO/vtkBMPWriter.h rename to IO/Image/vtkBMPWriter.h diff --git a/IO/vtkDEMReader.cxx b/IO/Image/vtkDEMReader.cxx similarity index 100% rename from IO/vtkDEMReader.cxx rename to IO/Image/vtkDEMReader.cxx diff --git a/IO/vtkDEMReader.h b/IO/Image/vtkDEMReader.h similarity index 100% rename from IO/vtkDEMReader.h rename to IO/Image/vtkDEMReader.h diff --git a/IO/vtkDICOMImageReader.cxx b/IO/Image/vtkDICOMImageReader.cxx similarity index 100% rename from IO/vtkDICOMImageReader.cxx rename to IO/Image/vtkDICOMImageReader.cxx diff --git a/IO/vtkDICOMImageReader.h b/IO/Image/vtkDICOMImageReader.h similarity index 100% rename from IO/vtkDICOMImageReader.h rename to IO/Image/vtkDICOMImageReader.h diff --git a/IO/vtkFFMPEGConfig.h.in b/IO/Image/vtkFFMPEGConfig.h.in similarity index 100% rename from IO/vtkFFMPEGConfig.h.in rename to IO/Image/vtkFFMPEGConfig.h.in diff --git a/IO/vtkFFMPEGWriter.cxx b/IO/Image/vtkFFMPEGWriter.cxx similarity index 100% rename from IO/vtkFFMPEGWriter.cxx rename to IO/Image/vtkFFMPEGWriter.cxx diff --git a/IO/vtkFFMPEGWriter.h b/IO/Image/vtkFFMPEGWriter.h similarity index 100% rename from IO/vtkFFMPEGWriter.h rename to IO/Image/vtkFFMPEGWriter.h diff --git a/IO/vtkGESignaReader.cxx b/IO/Image/vtkGESignaReader.cxx similarity index 100% rename from IO/vtkGESignaReader.cxx rename to IO/Image/vtkGESignaReader.cxx diff --git a/IO/vtkGESignaReader.h b/IO/Image/vtkGESignaReader.h similarity index 100% rename from IO/vtkGESignaReader.h rename to IO/Image/vtkGESignaReader.h diff --git a/IO/vtkGaussianCubeReader.cxx b/IO/Image/vtkGaussianCubeReader.cxx similarity index 100% rename from IO/vtkGaussianCubeReader.cxx rename to IO/Image/vtkGaussianCubeReader.cxx diff --git a/IO/vtkGaussianCubeReader.h b/IO/Image/vtkGaussianCubeReader.h similarity index 100% rename from IO/vtkGaussianCubeReader.h rename to IO/Image/vtkGaussianCubeReader.h diff --git a/Imaging/vtkImageExport.cxx b/IO/Image/vtkImageExport.cxx similarity index 100% rename from Imaging/vtkImageExport.cxx rename to IO/Image/vtkImageExport.cxx diff --git a/Imaging/vtkImageExport.h b/IO/Image/vtkImageExport.h similarity index 100% rename from Imaging/vtkImageExport.h rename to IO/Image/vtkImageExport.h diff --git a/Imaging/vtkImageImport.cxx b/IO/Image/vtkImageImport.cxx similarity index 100% rename from Imaging/vtkImageImport.cxx rename to IO/Image/vtkImageImport.cxx diff --git a/Imaging/vtkImageImport.h b/IO/Image/vtkImageImport.h similarity index 100% rename from Imaging/vtkImageImport.h rename to IO/Image/vtkImageImport.h diff --git a/Imaging/vtkImageImportExecutive.cxx b/IO/Image/vtkImageImportExecutive.cxx similarity index 100% rename from Imaging/vtkImageImportExecutive.cxx rename to IO/Image/vtkImageImportExecutive.cxx diff --git a/Imaging/vtkImageImportExecutive.h b/IO/Image/vtkImageImportExecutive.h similarity index 100% rename from Imaging/vtkImageImportExecutive.h rename to IO/Image/vtkImageImportExecutive.h diff --git a/IO/vtkImageReader.cxx b/IO/Image/vtkImageReader.cxx similarity index 100% rename from IO/vtkImageReader.cxx rename to IO/Image/vtkImageReader.cxx diff --git a/IO/vtkImageReader.h b/IO/Image/vtkImageReader.h similarity index 100% rename from IO/vtkImageReader.h rename to IO/Image/vtkImageReader.h diff --git a/IO/vtkImageReader2.cxx b/IO/Image/vtkImageReader2.cxx similarity index 100% rename from IO/vtkImageReader2.cxx rename to IO/Image/vtkImageReader2.cxx diff --git a/IO/vtkImageReader2.h b/IO/Image/vtkImageReader2.h similarity index 100% rename from IO/vtkImageReader2.h rename to IO/Image/vtkImageReader2.h diff --git a/IO/vtkImageReader2Collection.cxx b/IO/Image/vtkImageReader2Collection.cxx similarity index 100% rename from IO/vtkImageReader2Collection.cxx rename to IO/Image/vtkImageReader2Collection.cxx diff --git a/IO/vtkImageReader2Collection.h b/IO/Image/vtkImageReader2Collection.h similarity index 100% rename from IO/vtkImageReader2Collection.h rename to IO/Image/vtkImageReader2Collection.h diff --git a/IO/vtkImageReader2Factory.cxx b/IO/Image/vtkImageReader2Factory.cxx similarity index 100% rename from IO/vtkImageReader2Factory.cxx rename to IO/Image/vtkImageReader2Factory.cxx diff --git a/IO/vtkImageReader2Factory.h b/IO/Image/vtkImageReader2Factory.h similarity index 100% rename from IO/vtkImageReader2Factory.h rename to IO/Image/vtkImageReader2Factory.h diff --git a/IO/vtkImageWriter.cxx b/IO/Image/vtkImageWriter.cxx similarity index 100% rename from IO/vtkImageWriter.cxx rename to IO/Image/vtkImageWriter.cxx diff --git a/IO/vtkImageWriter.h b/IO/Image/vtkImageWriter.h similarity index 100% rename from IO/vtkImageWriter.h rename to IO/Image/vtkImageWriter.h diff --git a/IO/vtkJPEGReader.cxx b/IO/Image/vtkJPEGReader.cxx similarity index 100% rename from IO/vtkJPEGReader.cxx rename to IO/Image/vtkJPEGReader.cxx diff --git a/IO/vtkJPEGReader.h b/IO/Image/vtkJPEGReader.h similarity index 100% rename from IO/vtkJPEGReader.h rename to IO/Image/vtkJPEGReader.h diff --git a/IO/vtkJPEGWriter.cxx b/IO/Image/vtkJPEGWriter.cxx similarity index 100% rename from IO/vtkJPEGWriter.cxx rename to IO/Image/vtkJPEGWriter.cxx diff --git a/IO/vtkJPEGWriter.h b/IO/Image/vtkJPEGWriter.h similarity index 100% rename from IO/vtkJPEGWriter.h rename to IO/Image/vtkJPEGWriter.h diff --git a/IO/vtkMPEG2Writer.cxx b/IO/Image/vtkMPEG2Writer.cxx similarity index 100% rename from IO/vtkMPEG2Writer.cxx rename to IO/Image/vtkMPEG2Writer.cxx diff --git a/IO/vtkMPEG2Writer.h b/IO/Image/vtkMPEG2Writer.h similarity index 100% rename from IO/vtkMPEG2Writer.h rename to IO/Image/vtkMPEG2Writer.h diff --git a/IO/vtkMedicalImageProperties.cxx b/IO/Image/vtkMedicalImageProperties.cxx similarity index 100% rename from IO/vtkMedicalImageProperties.cxx rename to IO/Image/vtkMedicalImageProperties.cxx diff --git a/IO/vtkMedicalImageProperties.h b/IO/Image/vtkMedicalImageProperties.h similarity index 100% rename from IO/vtkMedicalImageProperties.h rename to IO/Image/vtkMedicalImageProperties.h diff --git a/IO/vtkMedicalImageReader2.cxx b/IO/Image/vtkMedicalImageReader2.cxx similarity index 100% rename from IO/vtkMedicalImageReader2.cxx rename to IO/Image/vtkMedicalImageReader2.cxx diff --git a/IO/vtkMedicalImageReader2.h b/IO/Image/vtkMedicalImageReader2.h similarity index 100% rename from IO/vtkMedicalImageReader2.h rename to IO/Image/vtkMedicalImageReader2.h diff --git a/IO/vtkMetaImageReader.cxx b/IO/Image/vtkMetaImageReader.cxx similarity index 100% rename from IO/vtkMetaImageReader.cxx rename to IO/Image/vtkMetaImageReader.cxx diff --git a/IO/vtkMetaImageReader.h b/IO/Image/vtkMetaImageReader.h similarity index 100% rename from IO/vtkMetaImageReader.h rename to IO/Image/vtkMetaImageReader.h diff --git a/IO/vtkMetaImageWriter.cxx b/IO/Image/vtkMetaImageWriter.cxx similarity index 100% rename from IO/vtkMetaImageWriter.cxx rename to IO/Image/vtkMetaImageWriter.cxx diff --git a/IO/vtkMetaImageWriter.h b/IO/Image/vtkMetaImageWriter.h similarity index 100% rename from IO/vtkMetaImageWriter.h rename to IO/Image/vtkMetaImageWriter.h diff --git a/IO/vtkOggTheoraWriter.cxx b/IO/Image/vtkOggTheoraWriter.cxx similarity index 100% rename from IO/vtkOggTheoraWriter.cxx rename to IO/Image/vtkOggTheoraWriter.cxx diff --git a/IO/vtkOggTheoraWriter.h b/IO/Image/vtkOggTheoraWriter.h similarity index 100% rename from IO/vtkOggTheoraWriter.h rename to IO/Image/vtkOggTheoraWriter.h diff --git a/IO/vtkPNGReader.cxx b/IO/Image/vtkPNGReader.cxx similarity index 100% rename from IO/vtkPNGReader.cxx rename to IO/Image/vtkPNGReader.cxx diff --git a/IO/vtkPNGReader.h b/IO/Image/vtkPNGReader.h similarity index 100% rename from IO/vtkPNGReader.h rename to IO/Image/vtkPNGReader.h diff --git a/IO/vtkPNGWriter.cxx b/IO/Image/vtkPNGWriter.cxx similarity index 100% rename from IO/vtkPNGWriter.cxx rename to IO/Image/vtkPNGWriter.cxx diff --git a/IO/vtkPNGWriter.h b/IO/Image/vtkPNGWriter.h similarity index 100% rename from IO/vtkPNGWriter.h rename to IO/Image/vtkPNGWriter.h diff --git a/IO/vtkPNMReader.cxx b/IO/Image/vtkPNMReader.cxx similarity index 100% rename from IO/vtkPNMReader.cxx rename to IO/Image/vtkPNMReader.cxx diff --git a/IO/vtkPNMReader.h b/IO/Image/vtkPNMReader.h similarity index 100% rename from IO/vtkPNMReader.h rename to IO/Image/vtkPNMReader.h diff --git a/IO/vtkPNMWriter.cxx b/IO/Image/vtkPNMWriter.cxx similarity index 100% rename from IO/vtkPNMWriter.cxx rename to IO/Image/vtkPNMWriter.cxx diff --git a/IO/vtkPNMWriter.h b/IO/Image/vtkPNMWriter.h similarity index 100% rename from IO/vtkPNMWriter.h rename to IO/Image/vtkPNMWriter.h diff --git a/IO/vtkPostScriptWriter.cxx b/IO/Image/vtkPostScriptWriter.cxx similarity index 100% rename from IO/vtkPostScriptWriter.cxx rename to IO/Image/vtkPostScriptWriter.cxx diff --git a/IO/vtkPostScriptWriter.h b/IO/Image/vtkPostScriptWriter.h similarity index 100% rename from IO/vtkPostScriptWriter.h rename to IO/Image/vtkPostScriptWriter.h diff --git a/IO/vtkSLCReader.cxx b/IO/Image/vtkSLCReader.cxx similarity index 100% rename from IO/vtkSLCReader.cxx rename to IO/Image/vtkSLCReader.cxx diff --git a/IO/vtkSLCReader.h b/IO/Image/vtkSLCReader.h similarity index 100% rename from IO/vtkSLCReader.h rename to IO/Image/vtkSLCReader.h diff --git a/IO/vtkTIFFReader.cxx b/IO/Image/vtkTIFFReader.cxx similarity index 100% rename from IO/vtkTIFFReader.cxx rename to IO/Image/vtkTIFFReader.cxx diff --git a/IO/vtkTIFFReader.h b/IO/Image/vtkTIFFReader.h similarity index 100% rename from IO/vtkTIFFReader.h rename to IO/Image/vtkTIFFReader.h diff --git a/IO/vtkTIFFWriter.cxx b/IO/Image/vtkTIFFWriter.cxx similarity index 100% rename from IO/vtkTIFFWriter.cxx rename to IO/Image/vtkTIFFWriter.cxx diff --git a/IO/vtkTIFFWriter.h b/IO/Image/vtkTIFFWriter.h similarity index 100% rename from IO/vtkTIFFWriter.h rename to IO/Image/vtkTIFFWriter.h diff --git a/IO/vtkVolume16Reader.cxx b/IO/Image/vtkVolume16Reader.cxx similarity index 100% rename from IO/vtkVolume16Reader.cxx rename to IO/Image/vtkVolume16Reader.cxx diff --git a/IO/vtkVolume16Reader.h b/IO/Image/vtkVolume16Reader.h similarity index 100% rename from IO/vtkVolume16Reader.h rename to IO/Image/vtkVolume16Reader.h diff --git a/IO/vtkVolumeReader.cxx b/IO/Image/vtkVolumeReader.cxx similarity index 100% rename from IO/vtkVolumeReader.cxx rename to IO/Image/vtkVolumeReader.cxx diff --git a/IO/vtkVolumeReader.h b/IO/Image/vtkVolumeReader.h similarity index 100% rename from IO/vtkVolumeReader.h rename to IO/Image/vtkVolumeReader.h diff --git a/Hybrid/Testing/Cxx/TestVRMLNormals.cxx b/IO/Import/Testing/Cxx/TestVRMLNormals.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestVRMLNormals.cxx rename to IO/Import/Testing/Cxx/TestVRMLNormals.cxx diff --git a/Hybrid/Testing/Tcl/VRMLImporter.tcl b/IO/Import/Testing/Tcl/VRMLImporter.tcl similarity index 100% rename from Hybrid/Testing/Tcl/VRMLImporter.tcl rename to IO/Import/Testing/Tcl/VRMLImporter.tcl diff --git a/Hybrid/vtk3DS.h b/IO/Import/vtk3DS.h similarity index 100% rename from Hybrid/vtk3DS.h rename to IO/Import/vtk3DS.h diff --git a/Hybrid/vtk3DSImporter.cxx b/IO/Import/vtk3DSImporter.cxx similarity index 100% rename from Hybrid/vtk3DSImporter.cxx rename to IO/Import/vtk3DSImporter.cxx diff --git a/Hybrid/vtk3DSImporter.h b/IO/Import/vtk3DSImporter.h similarity index 100% rename from Hybrid/vtk3DSImporter.h rename to IO/Import/vtk3DSImporter.h diff --git a/Rendering/vtkImporter.cxx b/IO/Import/vtkImporter.cxx similarity index 100% rename from Rendering/vtkImporter.cxx rename to IO/Import/vtkImporter.cxx diff --git a/Rendering/vtkImporter.h b/IO/Import/vtkImporter.h similarity index 100% rename from Rendering/vtkImporter.h rename to IO/Import/vtkImporter.h diff --git a/Hybrid/vtkVRML.h b/IO/Import/vtkVRML.h similarity index 100% rename from Hybrid/vtkVRML.h rename to IO/Import/vtkVRML.h diff --git a/Hybrid/vtkVRMLImporter.cxx b/IO/Import/vtkVRMLImporter.cxx similarity index 100% rename from Hybrid/vtkVRMLImporter.cxx rename to IO/Import/vtkVRMLImporter.cxx diff --git a/Hybrid/vtkVRMLImporter.h b/IO/Import/vtkVRMLImporter.h similarity index 100% rename from Hybrid/vtkVRMLImporter.h rename to IO/Import/vtkVRMLImporter.h diff --git a/Infovis/Testing/Cxx/TestDIMACSGraphReader.cxx b/IO/Infovis/Testing/Cxx/TestDIMACSGraphReader.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestDIMACSGraphReader.cxx rename to IO/Infovis/Testing/Cxx/TestDIMACSGraphReader.cxx diff --git a/Infovis/Testing/Cxx/TestDelimitedTextReader.cxx b/IO/Infovis/Testing/Cxx/TestDelimitedTextReader.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestDelimitedTextReader.cxx rename to IO/Infovis/Testing/Cxx/TestDelimitedTextReader.cxx diff --git a/Infovis/Testing/Cxx/TestFixedWidthTextReader.cxx b/IO/Infovis/Testing/Cxx/TestFixedWidthTextReader.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestFixedWidthTextReader.cxx rename to IO/Infovis/Testing/Cxx/TestFixedWidthTextReader.cxx diff --git a/Infovis/Testing/Cxx/TestISIReader.cxx b/IO/Infovis/Testing/Cxx/TestISIReader.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestISIReader.cxx rename to IO/Infovis/Testing/Cxx/TestISIReader.cxx diff --git a/Infovis/Testing/Cxx/TestRISReader.cxx b/IO/Infovis/Testing/Cxx/TestRISReader.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestRISReader.cxx rename to IO/Infovis/Testing/Cxx/TestRISReader.cxx diff --git a/Infovis/Testing/Cxx/TestTulipReader.cxx b/IO/Infovis/Testing/Cxx/TestTulipReader.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestTulipReader.cxx rename to IO/Infovis/Testing/Cxx/TestTulipReader.cxx diff --git a/Infovis/Testing/Cxx/TestTulipReaderClusters.cxx b/IO/Infovis/Testing/Cxx/TestTulipReaderClusters.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestTulipReaderClusters.cxx rename to IO/Infovis/Testing/Cxx/TestTulipReaderClusters.cxx diff --git a/Infovis/Testing/Cxx/TestTulipReaderProperties.cxx b/IO/Infovis/Testing/Cxx/TestTulipReaderProperties.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestTulipReaderProperties.cxx rename to IO/Infovis/Testing/Cxx/TestTulipReaderProperties.cxx diff --git a/Infovis/vtkChacoGraphReader.cxx b/IO/Infovis/vtkChacoGraphReader.cxx similarity index 100% rename from Infovis/vtkChacoGraphReader.cxx rename to IO/Infovis/vtkChacoGraphReader.cxx diff --git a/Infovis/vtkChacoGraphReader.h b/IO/Infovis/vtkChacoGraphReader.h similarity index 100% rename from Infovis/vtkChacoGraphReader.h rename to IO/Infovis/vtkChacoGraphReader.h diff --git a/Infovis/vtkDIMACSGraphReader.cxx b/IO/Infovis/vtkDIMACSGraphReader.cxx similarity index 100% rename from Infovis/vtkDIMACSGraphReader.cxx rename to IO/Infovis/vtkDIMACSGraphReader.cxx diff --git a/Infovis/vtkDIMACSGraphReader.h b/IO/Infovis/vtkDIMACSGraphReader.h similarity index 100% rename from Infovis/vtkDIMACSGraphReader.h rename to IO/Infovis/vtkDIMACSGraphReader.h diff --git a/Infovis/vtkDIMACSGraphWriter.cxx b/IO/Infovis/vtkDIMACSGraphWriter.cxx similarity index 100% rename from Infovis/vtkDIMACSGraphWriter.cxx rename to IO/Infovis/vtkDIMACSGraphWriter.cxx diff --git a/Infovis/vtkDIMACSGraphWriter.h b/IO/Infovis/vtkDIMACSGraphWriter.h similarity index 100% rename from Infovis/vtkDIMACSGraphWriter.h rename to IO/Infovis/vtkDIMACSGraphWriter.h diff --git a/Infovis/vtkDelimitedTextReader.cxx b/IO/Infovis/vtkDelimitedTextReader.cxx similarity index 100% rename from Infovis/vtkDelimitedTextReader.cxx rename to IO/Infovis/vtkDelimitedTextReader.cxx diff --git a/Infovis/vtkDelimitedTextReader.h b/IO/Infovis/vtkDelimitedTextReader.h similarity index 100% rename from Infovis/vtkDelimitedTextReader.h rename to IO/Infovis/vtkDelimitedTextReader.h diff --git a/Infovis/vtkFixedWidthTextReader.cxx b/IO/Infovis/vtkFixedWidthTextReader.cxx similarity index 100% rename from Infovis/vtkFixedWidthTextReader.cxx rename to IO/Infovis/vtkFixedWidthTextReader.cxx diff --git a/Infovis/vtkFixedWidthTextReader.h b/IO/Infovis/vtkFixedWidthTextReader.h similarity index 100% rename from Infovis/vtkFixedWidthTextReader.h rename to IO/Infovis/vtkFixedWidthTextReader.h diff --git a/Infovis/vtkISIReader.cxx b/IO/Infovis/vtkISIReader.cxx similarity index 100% rename from Infovis/vtkISIReader.cxx rename to IO/Infovis/vtkISIReader.cxx diff --git a/Infovis/vtkISIReader.h b/IO/Infovis/vtkISIReader.h similarity index 100% rename from Infovis/vtkISIReader.h rename to IO/Infovis/vtkISIReader.h diff --git a/Infovis/vtkRISReader.cxx b/IO/Infovis/vtkRISReader.cxx similarity index 100% rename from Infovis/vtkRISReader.cxx rename to IO/Infovis/vtkRISReader.cxx diff --git a/Infovis/vtkRISReader.h b/IO/Infovis/vtkRISReader.h similarity index 100% rename from Infovis/vtkRISReader.h rename to IO/Infovis/vtkRISReader.h diff --git a/Infovis/vtkTulipReader.cxx b/IO/Infovis/vtkTulipReader.cxx similarity index 100% rename from Infovis/vtkTulipReader.cxx rename to IO/Infovis/vtkTulipReader.cxx diff --git a/Infovis/vtkTulipReader.h b/IO/Infovis/vtkTulipReader.h similarity index 100% rename from Infovis/vtkTulipReader.h rename to IO/Infovis/vtkTulipReader.h diff --git a/Infovis/vtkXGMLReader.cxx b/IO/Infovis/vtkXGMLReader.cxx similarity index 100% rename from Infovis/vtkXGMLReader.cxx rename to IO/Infovis/vtkXGMLReader.cxx diff --git a/Infovis/vtkXGMLReader.h b/IO/Infovis/vtkXGMLReader.h similarity index 100% rename from Infovis/vtkXGMLReader.h rename to IO/Infovis/vtkXGMLReader.h diff --git a/Infovis/vtkXMLTreeReader.cxx b/IO/Infovis/vtkXMLTreeReader.cxx similarity index 100% rename from Infovis/vtkXMLTreeReader.cxx rename to IO/Infovis/vtkXMLTreeReader.cxx diff --git a/Infovis/vtkXMLTreeReader.h b/IO/Infovis/vtkXMLTreeReader.h similarity index 100% rename from Infovis/vtkXMLTreeReader.h rename to IO/Infovis/vtkXMLTreeReader.h diff --git a/IO/Testing/Cxx/TestLSDynaReader.cxx b/IO/LSDyna/Testing/Cxx/TestLSDynaReader.cxx similarity index 100% rename from IO/Testing/Cxx/TestLSDynaReader.cxx rename to IO/LSDyna/Testing/Cxx/TestLSDynaReader.cxx diff --git a/IO/Testing/Cxx/TestLSDynaReaderSPH.cxx b/IO/LSDyna/Testing/Cxx/TestLSDynaReaderSPH.cxx similarity index 100% rename from IO/Testing/Cxx/TestLSDynaReaderSPH.cxx rename to IO/LSDyna/Testing/Cxx/TestLSDynaReaderSPH.cxx diff --git a/Utilities/LSDyna/LSDynaExport.h.in b/IO/LSDyna/private/LSDynaExport.h.in similarity index 100% rename from Utilities/LSDyna/LSDynaExport.h.in rename to IO/LSDyna/private/LSDynaExport.h.in diff --git a/Utilities/LSDyna/LSDynaFamily.cxx b/IO/LSDyna/private/LSDynaFamily.cxx similarity index 100% rename from Utilities/LSDyna/LSDynaFamily.cxx rename to IO/LSDyna/private/LSDynaFamily.cxx diff --git a/Utilities/LSDyna/LSDynaFamily.h b/IO/LSDyna/private/LSDynaFamily.h similarity index 100% rename from Utilities/LSDyna/LSDynaFamily.h rename to IO/LSDyna/private/LSDynaFamily.h diff --git a/Utilities/LSDyna/LSDynaMetaData.cxx b/IO/LSDyna/private/LSDynaMetaData.cxx similarity index 100% rename from Utilities/LSDyna/LSDynaMetaData.cxx rename to IO/LSDyna/private/LSDynaMetaData.cxx diff --git a/Utilities/LSDyna/LSDynaMetaData.h b/IO/LSDyna/private/LSDynaMetaData.h similarity index 100% rename from Utilities/LSDyna/LSDynaMetaData.h rename to IO/LSDyna/private/LSDynaMetaData.h diff --git a/IO/vtkLSDynaPart.cxx b/IO/LSDyna/vtkLSDynaPart.cxx similarity index 100% rename from IO/vtkLSDynaPart.cxx rename to IO/LSDyna/vtkLSDynaPart.cxx diff --git a/IO/vtkLSDynaPart.h b/IO/LSDyna/vtkLSDynaPart.h similarity index 100% rename from IO/vtkLSDynaPart.h rename to IO/LSDyna/vtkLSDynaPart.h diff --git a/IO/vtkLSDynaPartCollection.cxx b/IO/LSDyna/vtkLSDynaPartCollection.cxx similarity index 100% rename from IO/vtkLSDynaPartCollection.cxx rename to IO/LSDyna/vtkLSDynaPartCollection.cxx diff --git a/IO/vtkLSDynaPartCollection.h b/IO/LSDyna/vtkLSDynaPartCollection.h similarity index 100% rename from IO/vtkLSDynaPartCollection.h rename to IO/LSDyna/vtkLSDynaPartCollection.h diff --git a/IO/vtkLSDynaReader.cxx b/IO/LSDyna/vtkLSDynaReader.cxx similarity index 100% rename from IO/vtkLSDynaReader.cxx rename to IO/LSDyna/vtkLSDynaReader.cxx diff --git a/IO/vtkLSDynaReader.h b/IO/LSDyna/vtkLSDynaReader.h similarity index 100% rename from IO/vtkLSDynaReader.h rename to IO/LSDyna/vtkLSDynaReader.h diff --git a/IO/vtkLSDynaSummaryParser.cxx b/IO/LSDyna/vtkLSDynaSummaryParser.cxx similarity index 100% rename from IO/vtkLSDynaSummaryParser.cxx rename to IO/LSDyna/vtkLSDynaSummaryParser.cxx diff --git a/IO/vtkLSDynaSummaryParser.h b/IO/LSDyna/vtkLSDynaSummaryParser.h similarity index 100% rename from IO/vtkLSDynaSummaryParser.h rename to IO/LSDyna/vtkLSDynaSummaryParser.h diff --git a/IO/Testing/Tcl/TestMINCImageReader.tcl b/IO/MINC/Testing/Tcl/TestMINCImageReader.tcl similarity index 100% rename from IO/Testing/Tcl/TestMINCImageReader.tcl rename to IO/MINC/Testing/Tcl/TestMINCImageReader.tcl diff --git a/IO/Testing/Tcl/TestMINCImageWriter.tcl b/IO/MINC/Testing/Tcl/TestMINCImageWriter.tcl similarity index 100% rename from IO/Testing/Tcl/TestMINCImageWriter.tcl rename to IO/MINC/Testing/Tcl/TestMINCImageWriter.tcl diff --git a/Hybrid/Testing/Tcl/TestMNIObjects.tcl b/IO/MINC/Testing/Tcl/TestMNIObjects.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestMNIObjects.tcl rename to IO/MINC/Testing/Tcl/TestMNIObjects.tcl diff --git a/Hybrid/Testing/Tcl/TestMNITagPoints.tcl b/IO/MINC/Testing/Tcl/TestMNITagPoints.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestMNITagPoints.tcl rename to IO/MINC/Testing/Tcl/TestMNITagPoints.tcl diff --git a/Hybrid/Testing/Tcl/TestMNITransforms.tcl b/IO/MINC/Testing/Tcl/TestMNITransforms.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestMNITransforms.tcl rename to IO/MINC/Testing/Tcl/TestMNITransforms.tcl diff --git a/IO/vtkMINC.h b/IO/MINC/vtkMINC.h similarity index 100% rename from IO/vtkMINC.h rename to IO/MINC/vtkMINC.h diff --git a/IO/vtkMINCImageAttributes.cxx b/IO/MINC/vtkMINCImageAttributes.cxx similarity index 100% rename from IO/vtkMINCImageAttributes.cxx rename to IO/MINC/vtkMINCImageAttributes.cxx diff --git a/IO/vtkMINCImageAttributes.h b/IO/MINC/vtkMINCImageAttributes.h similarity index 100% rename from IO/vtkMINCImageAttributes.h rename to IO/MINC/vtkMINCImageAttributes.h diff --git a/IO/vtkMINCImageReader.cxx b/IO/MINC/vtkMINCImageReader.cxx similarity index 100% rename from IO/vtkMINCImageReader.cxx rename to IO/MINC/vtkMINCImageReader.cxx diff --git a/IO/vtkMINCImageReader.h b/IO/MINC/vtkMINCImageReader.h similarity index 100% rename from IO/vtkMINCImageReader.h rename to IO/MINC/vtkMINCImageReader.h diff --git a/IO/vtkMINCImageWriter.cxx b/IO/MINC/vtkMINCImageWriter.cxx similarity index 100% rename from IO/vtkMINCImageWriter.cxx rename to IO/MINC/vtkMINCImageWriter.cxx diff --git a/IO/vtkMINCImageWriter.h b/IO/MINC/vtkMINCImageWriter.h similarity index 100% rename from IO/vtkMINCImageWriter.h rename to IO/MINC/vtkMINCImageWriter.h diff --git a/Hybrid/vtkMNIObjectReader.cxx b/IO/MINC/vtkMNIObjectReader.cxx similarity index 100% rename from Hybrid/vtkMNIObjectReader.cxx rename to IO/MINC/vtkMNIObjectReader.cxx diff --git a/Hybrid/vtkMNIObjectReader.h b/IO/MINC/vtkMNIObjectReader.h similarity index 100% rename from Hybrid/vtkMNIObjectReader.h rename to IO/MINC/vtkMNIObjectReader.h diff --git a/Hybrid/vtkMNIObjectWriter.cxx b/IO/MINC/vtkMNIObjectWriter.cxx similarity index 100% rename from Hybrid/vtkMNIObjectWriter.cxx rename to IO/MINC/vtkMNIObjectWriter.cxx diff --git a/Hybrid/vtkMNIObjectWriter.h b/IO/MINC/vtkMNIObjectWriter.h similarity index 100% rename from Hybrid/vtkMNIObjectWriter.h rename to IO/MINC/vtkMNIObjectWriter.h diff --git a/Hybrid/vtkMNITagPointReader.cxx b/IO/MINC/vtkMNITagPointReader.cxx similarity index 100% rename from Hybrid/vtkMNITagPointReader.cxx rename to IO/MINC/vtkMNITagPointReader.cxx diff --git a/Hybrid/vtkMNITagPointReader.h b/IO/MINC/vtkMNITagPointReader.h similarity index 100% rename from Hybrid/vtkMNITagPointReader.h rename to IO/MINC/vtkMNITagPointReader.h diff --git a/Hybrid/vtkMNITagPointWriter.cxx b/IO/MINC/vtkMNITagPointWriter.cxx similarity index 100% rename from Hybrid/vtkMNITagPointWriter.cxx rename to IO/MINC/vtkMNITagPointWriter.cxx diff --git a/Hybrid/vtkMNITagPointWriter.h b/IO/MINC/vtkMNITagPointWriter.h similarity index 100% rename from Hybrid/vtkMNITagPointWriter.h rename to IO/MINC/vtkMNITagPointWriter.h diff --git a/Hybrid/vtkMNITransformReader.cxx b/IO/MINC/vtkMNITransformReader.cxx similarity index 100% rename from Hybrid/vtkMNITransformReader.cxx rename to IO/MINC/vtkMNITransformReader.cxx diff --git a/Hybrid/vtkMNITransformReader.h b/IO/MINC/vtkMNITransformReader.h similarity index 100% rename from Hybrid/vtkMNITransformReader.h rename to IO/MINC/vtkMNITransformReader.h diff --git a/Hybrid/vtkMNITransformWriter.cxx b/IO/MINC/vtkMNITransformWriter.cxx similarity index 100% rename from Hybrid/vtkMNITransformWriter.cxx rename to IO/MINC/vtkMNITransformWriter.cxx diff --git a/Hybrid/vtkMNITransformWriter.h b/IO/MINC/vtkMNITransformWriter.h similarity index 100% rename from Hybrid/vtkMNITransformWriter.h rename to IO/MINC/vtkMNITransformWriter.h diff --git a/IO/Testing/Cxx/TestMySQLDatabase.cxx b/IO/MySQL/Testing/Cxx/TestMySQLDatabase.cxx similarity index 100% rename from IO/Testing/Cxx/TestMySQLDatabase.cxx rename to IO/MySQL/Testing/Cxx/TestMySQLDatabase.cxx diff --git a/IO/Testing/Cxx/TestMySQLTableReadWrite.cxx b/IO/MySQL/Testing/Cxx/TestMySQLTableReadWrite.cxx similarity index 100% rename from IO/Testing/Cxx/TestMySQLTableReadWrite.cxx rename to IO/MySQL/Testing/Cxx/TestMySQLTableReadWrite.cxx diff --git a/IO/vtkMySQLDatabase.cxx b/IO/MySQL/vtkMySQLDatabase.cxx similarity index 100% rename from IO/vtkMySQLDatabase.cxx rename to IO/MySQL/vtkMySQLDatabase.cxx diff --git a/IO/vtkMySQLDatabase.h b/IO/MySQL/vtkMySQLDatabase.h similarity index 100% rename from IO/vtkMySQLDatabase.h rename to IO/MySQL/vtkMySQLDatabase.h diff --git a/IO/vtkMySQLDatabasePrivate.h b/IO/MySQL/vtkMySQLDatabasePrivate.h similarity index 100% rename from IO/vtkMySQLDatabasePrivate.h rename to IO/MySQL/vtkMySQLDatabasePrivate.h diff --git a/IO/vtkMySQLQuery.cxx b/IO/MySQL/vtkMySQLQuery.cxx similarity index 100% rename from IO/vtkMySQLQuery.cxx rename to IO/MySQL/vtkMySQLQuery.cxx diff --git a/IO/vtkMySQLQuery.h b/IO/MySQL/vtkMySQLQuery.h similarity index 100% rename from IO/vtkMySQLQuery.h rename to IO/MySQL/vtkMySQLQuery.h diff --git a/IO/vtkMySQLToTableReader.cxx b/IO/MySQL/vtkMySQLToTableReader.cxx similarity index 100% rename from IO/vtkMySQLToTableReader.cxx rename to IO/MySQL/vtkMySQLToTableReader.cxx diff --git a/IO/vtkMySQLToTableReader.h b/IO/MySQL/vtkMySQLToTableReader.h similarity index 100% rename from IO/vtkMySQLToTableReader.h rename to IO/MySQL/vtkMySQLToTableReader.h diff --git a/IO/vtkTableToMySQLWriter.cxx b/IO/MySQL/vtkTableToMySQLWriter.cxx similarity index 100% rename from IO/vtkTableToMySQLWriter.cxx rename to IO/MySQL/vtkTableToMySQLWriter.cxx diff --git a/IO/vtkTableToMySQLWriter.h b/IO/MySQL/vtkTableToMySQLWriter.h similarity index 100% rename from IO/vtkTableToMySQLWriter.h rename to IO/MySQL/vtkTableToMySQLWriter.h diff --git a/IO/Testing/Cxx/SLACParticleReader.cxx b/IO/NetCDF/Testing/Cxx/SLACParticleReader.cxx similarity index 100% rename from IO/Testing/Cxx/SLACParticleReader.cxx rename to IO/NetCDF/Testing/Cxx/SLACParticleReader.cxx diff --git a/IO/Testing/Cxx/SLACReaderLinear.cxx b/IO/NetCDF/Testing/Cxx/SLACReaderLinear.cxx similarity index 100% rename from IO/Testing/Cxx/SLACReaderLinear.cxx rename to IO/NetCDF/Testing/Cxx/SLACReaderLinear.cxx diff --git a/IO/Testing/Cxx/SLACReaderQuadratic.cxx b/IO/NetCDF/Testing/Cxx/SLACReaderQuadratic.cxx similarity index 100% rename from IO/Testing/Cxx/SLACReaderQuadratic.cxx rename to IO/NetCDF/Testing/Cxx/SLACReaderQuadratic.cxx diff --git a/IO/Testing/Cxx/TestMPASReader.cxx b/IO/NetCDF/Testing/Cxx/TestMPASReader.cxx similarity index 100% rename from IO/Testing/Cxx/TestMPASReader.cxx rename to IO/NetCDF/Testing/Cxx/TestMPASReader.cxx diff --git a/IO/Testing/Cxx/TestNetCDFCAMReader.cxx b/IO/NetCDF/Testing/Cxx/TestNetCDFCAMReader.cxx similarity index 100% rename from IO/Testing/Cxx/TestNetCDFCAMReader.cxx rename to IO/NetCDF/Testing/Cxx/TestNetCDFCAMReader.cxx diff --git a/IO/Testing/Cxx/TestNetCDFPOPReader.cxx b/IO/NetCDF/Testing/Cxx/TestNetCDFPOPReader.cxx similarity index 100% rename from IO/Testing/Cxx/TestNetCDFPOPReader.cxx rename to IO/NetCDF/Testing/Cxx/TestNetCDFPOPReader.cxx diff --git a/IO/Testing/Tcl/NetCDFCF2DBounds.tcl b/IO/NetCDF/Testing/Tcl/NetCDFCF2DBounds.tcl similarity index 100% rename from IO/Testing/Tcl/NetCDFCF2DBounds.tcl rename to IO/NetCDF/Testing/Tcl/NetCDFCF2DBounds.tcl diff --git a/IO/Testing/Tcl/NetCDFCFSetOutputType.tcl b/IO/NetCDF/Testing/Tcl/NetCDFCFSetOutputType.tcl similarity index 100% rename from IO/Testing/Tcl/NetCDFCFSetOutputType.tcl rename to IO/NetCDF/Testing/Tcl/NetCDFCFSetOutputType.tcl diff --git a/IO/Testing/Tcl/NetCDFCFSphericalCoords.tcl b/IO/NetCDF/Testing/Tcl/NetCDFCFSphericalCoords.tcl similarity index 100% rename from IO/Testing/Tcl/NetCDFCFSphericalCoords.tcl rename to IO/NetCDF/Testing/Tcl/NetCDFCFSphericalCoords.tcl diff --git a/IO/Testing/Tcl/NetCDFCFUnstructured.tcl b/IO/NetCDF/Testing/Tcl/NetCDFCFUnstructured.tcl similarity index 100% rename from IO/Testing/Tcl/NetCDFCFUnstructured.tcl rename to IO/NetCDF/Testing/Tcl/NetCDFCFUnstructured.tcl diff --git a/IO/Testing/Tcl/NetCDFReader.tcl b/IO/NetCDF/Testing/Tcl/NetCDFReader.tcl similarity index 100% rename from IO/Testing/Tcl/NetCDFReader.tcl rename to IO/NetCDF/Testing/Tcl/NetCDFReader.tcl diff --git a/IO/vtkMPASReader.cxx b/IO/NetCDF/vtkMPASReader.cxx similarity index 100% rename from IO/vtkMPASReader.cxx rename to IO/NetCDF/vtkMPASReader.cxx diff --git a/IO/vtkMPASReader.h b/IO/NetCDF/vtkMPASReader.h similarity index 100% rename from IO/vtkMPASReader.h rename to IO/NetCDF/vtkMPASReader.h diff --git a/IO/vtkNetCDFCAMReader.cxx b/IO/NetCDF/vtkNetCDFCAMReader.cxx similarity index 100% rename from IO/vtkNetCDFCAMReader.cxx rename to IO/NetCDF/vtkNetCDFCAMReader.cxx diff --git a/IO/vtkNetCDFCAMReader.h b/IO/NetCDF/vtkNetCDFCAMReader.h similarity index 100% rename from IO/vtkNetCDFCAMReader.h rename to IO/NetCDF/vtkNetCDFCAMReader.h diff --git a/IO/vtkNetCDFCFReader.cxx b/IO/NetCDF/vtkNetCDFCFReader.cxx similarity index 100% rename from IO/vtkNetCDFCFReader.cxx rename to IO/NetCDF/vtkNetCDFCFReader.cxx diff --git a/IO/vtkNetCDFCFReader.h b/IO/NetCDF/vtkNetCDFCFReader.h similarity index 100% rename from IO/vtkNetCDFCFReader.h rename to IO/NetCDF/vtkNetCDFCFReader.h diff --git a/IO/vtkNetCDFPOPReader.cxx b/IO/NetCDF/vtkNetCDFPOPReader.cxx similarity index 100% rename from IO/vtkNetCDFPOPReader.cxx rename to IO/NetCDF/vtkNetCDFPOPReader.cxx diff --git a/IO/vtkNetCDFPOPReader.h b/IO/NetCDF/vtkNetCDFPOPReader.h similarity index 100% rename from IO/vtkNetCDFPOPReader.h rename to IO/NetCDF/vtkNetCDFPOPReader.h diff --git a/IO/vtkNetCDFReader.cxx b/IO/NetCDF/vtkNetCDFReader.cxx similarity index 100% rename from IO/vtkNetCDFReader.cxx rename to IO/NetCDF/vtkNetCDFReader.cxx diff --git a/IO/vtkNetCDFReader.h b/IO/NetCDF/vtkNetCDFReader.h similarity index 100% rename from IO/vtkNetCDFReader.h rename to IO/NetCDF/vtkNetCDFReader.h diff --git a/IO/vtkSLACParticleReader.cxx b/IO/NetCDF/vtkSLACParticleReader.cxx similarity index 100% rename from IO/vtkSLACParticleReader.cxx rename to IO/NetCDF/vtkSLACParticleReader.cxx diff --git a/IO/vtkSLACParticleReader.h b/IO/NetCDF/vtkSLACParticleReader.h similarity index 100% rename from IO/vtkSLACParticleReader.h rename to IO/NetCDF/vtkSLACParticleReader.h diff --git a/IO/vtkSLACReader.cxx b/IO/NetCDF/vtkSLACReader.cxx similarity index 100% rename from IO/vtkSLACReader.cxx rename to IO/NetCDF/vtkSLACReader.cxx diff --git a/IO/vtkSLACReader.h b/IO/NetCDF/vtkSLACReader.h similarity index 100% rename from IO/vtkSLACReader.h rename to IO/NetCDF/vtkSLACReader.h diff --git a/IO/Testing/Cxx/TestODBCDatabase.cxx b/IO/ODBC/Testing/Cxx/TestODBCDatabase.cxx similarity index 100% rename from IO/Testing/Cxx/TestODBCDatabase.cxx rename to IO/ODBC/Testing/Cxx/TestODBCDatabase.cxx diff --git a/IO/vtkODBCDatabase.cxx b/IO/ODBC/vtkODBCDatabase.cxx similarity index 100% rename from IO/vtkODBCDatabase.cxx rename to IO/ODBC/vtkODBCDatabase.cxx diff --git a/IO/vtkODBCDatabase.h b/IO/ODBC/vtkODBCDatabase.h similarity index 100% rename from IO/vtkODBCDatabase.h rename to IO/ODBC/vtkODBCDatabase.h diff --git a/IO/vtkODBCInternals.h b/IO/ODBC/vtkODBCInternals.h similarity index 100% rename from IO/vtkODBCInternals.h rename to IO/ODBC/vtkODBCInternals.h diff --git a/IO/vtkODBCQuery.cxx b/IO/ODBC/vtkODBCQuery.cxx similarity index 100% rename from IO/vtkODBCQuery.cxx rename to IO/ODBC/vtkODBCQuery.cxx diff --git a/IO/vtkODBCQuery.h b/IO/ODBC/vtkODBCQuery.h similarity index 100% rename from IO/vtkODBCQuery.h rename to IO/ODBC/vtkODBCQuery.h diff --git a/IO/Testing/Cxx/TestPLYReader.cxx b/IO/PLY/Testing/Cxx/TestPLYReader.cxx similarity index 100% rename from IO/Testing/Cxx/TestPLYReader.cxx rename to IO/PLY/Testing/Cxx/TestPLYReader.cxx diff --git a/IO/Testing/Tcl/TestPLYReadWrite.tcl b/IO/PLY/Testing/Tcl/TestPLYReadWrite.tcl similarity index 100% rename from IO/Testing/Tcl/TestPLYReadWrite.tcl rename to IO/PLY/Testing/Tcl/TestPLYReadWrite.tcl diff --git a/IO/vtkPLY.cxx b/IO/PLY/vtkPLY.cxx similarity index 100% rename from IO/vtkPLY.cxx rename to IO/PLY/vtkPLY.cxx diff --git a/IO/vtkPLY.h b/IO/PLY/vtkPLY.h similarity index 100% rename from IO/vtkPLY.h rename to IO/PLY/vtkPLY.h diff --git a/IO/vtkPLYReader.cxx b/IO/PLY/vtkPLYReader.cxx similarity index 100% rename from IO/vtkPLYReader.cxx rename to IO/PLY/vtkPLYReader.cxx diff --git a/IO/vtkPLYReader.h b/IO/PLY/vtkPLYReader.h similarity index 100% rename from IO/vtkPLYReader.h rename to IO/PLY/vtkPLYReader.h diff --git a/IO/vtkPLYWriter.cxx b/IO/PLY/vtkPLYWriter.cxx similarity index 100% rename from IO/vtkPLYWriter.cxx rename to IO/PLY/vtkPLYWriter.cxx diff --git a/IO/vtkPLYWriter.h b/IO/PLY/vtkPLYWriter.h similarity index 100% rename from IO/vtkPLYWriter.h rename to IO/PLY/vtkPLYWriter.h diff --git a/Parallel/Testing/Cxx/PSLACReaderLinear.cxx b/IO/Parallel/Testing/Cxx/PSLACReaderLinear.cxx similarity index 100% rename from Parallel/Testing/Cxx/PSLACReaderLinear.cxx rename to IO/Parallel/Testing/Cxx/PSLACReaderLinear.cxx diff --git a/Parallel/Testing/Cxx/PSLACReaderQuadratic.cxx b/IO/Parallel/Testing/Cxx/PSLACReaderQuadratic.cxx similarity index 100% rename from Parallel/Testing/Cxx/PSLACReaderQuadratic.cxx rename to IO/Parallel/Testing/Cxx/PSLACReaderQuadratic.cxx diff --git a/Parallel/Testing/Cxx/ParallelIso.cxx b/IO/Parallel/Testing/Cxx/ParallelIso.cxx similarity index 100% rename from Parallel/Testing/Cxx/ParallelIso.cxx rename to IO/Parallel/Testing/Cxx/ParallelIso.cxx diff --git a/Parallel/Testing/Cxx/TestMultiBlockExodusWrite.cxx b/IO/Parallel/Testing/Cxx/TestMultiBlockExodusWrite.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestMultiBlockExodusWrite.cxx rename to IO/Parallel/Testing/Cxx/TestMultiBlockExodusWrite.cxx diff --git a/Parallel/Testing/Cxx/TestWindBladeReader.cxx b/IO/Parallel/Testing/Cxx/TestWindBladeReader.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestWindBladeReader.cxx rename to IO/Parallel/Testing/Cxx/TestWindBladeReader.cxx diff --git a/Parallel/Testing/Tcl/TestPDataSetReaderGrid.tcl b/IO/Parallel/Testing/Tcl/TestPDataSetReaderGrid.tcl similarity index 100% rename from Parallel/Testing/Tcl/TestPDataSetReaderGrid.tcl rename to IO/Parallel/Testing/Tcl/TestPDataSetReaderGrid.tcl diff --git a/Parallel/Testing/Tcl/TestPImageWriter.tcl b/IO/Parallel/Testing/Tcl/TestPImageWriter.tcl similarity index 100% rename from Parallel/Testing/Tcl/TestPImageWriter.tcl rename to IO/Parallel/Testing/Tcl/TestPImageWriter.tcl diff --git a/Parallel/Testing/Tcl/TestPProbe.tcl b/IO/Parallel/Testing/Tcl/TestPProbe.tcl similarity index 100% rename from Parallel/Testing/Tcl/TestPProbe.tcl rename to IO/Parallel/Testing/Tcl/TestPProbe.tcl diff --git a/Parallel/vtkEnSightWriter.cxx b/IO/Parallel/vtkEnSightWriter.cxx similarity index 100% rename from Parallel/vtkEnSightWriter.cxx rename to IO/Parallel/vtkEnSightWriter.cxx diff --git a/Parallel/vtkEnSightWriter.h b/IO/Parallel/vtkEnSightWriter.h similarity index 100% rename from Parallel/vtkEnSightWriter.h rename to IO/Parallel/vtkEnSightWriter.h diff --git a/Parallel/vtkExodusIIWriter.cxx b/IO/Parallel/vtkExodusIIWriter.cxx similarity index 100% rename from Parallel/vtkExodusIIWriter.cxx rename to IO/Parallel/vtkExodusIIWriter.cxx diff --git a/Parallel/vtkExodusIIWriter.h b/IO/Parallel/vtkExodusIIWriter.h similarity index 100% rename from Parallel/vtkExodusIIWriter.h rename to IO/Parallel/vtkExodusIIWriter.h diff --git a/Parallel/vtkPChacoReader.cxx b/IO/Parallel/vtkPChacoReader.cxx similarity index 100% rename from Parallel/vtkPChacoReader.cxx rename to IO/Parallel/vtkPChacoReader.cxx diff --git a/Parallel/vtkPChacoReader.h b/IO/Parallel/vtkPChacoReader.h similarity index 100% rename from Parallel/vtkPChacoReader.h rename to IO/Parallel/vtkPChacoReader.h diff --git a/Parallel/vtkPCosmoReader.cxx b/IO/Parallel/vtkPCosmoReader.cxx similarity index 100% rename from Parallel/vtkPCosmoReader.cxx rename to IO/Parallel/vtkPCosmoReader.cxx diff --git a/Parallel/vtkPCosmoReader.h b/IO/Parallel/vtkPCosmoReader.h similarity index 100% rename from Parallel/vtkPCosmoReader.h rename to IO/Parallel/vtkPCosmoReader.h diff --git a/Parallel/vtkPDataSetReader.cxx b/IO/Parallel/vtkPDataSetReader.cxx similarity index 100% rename from Parallel/vtkPDataSetReader.cxx rename to IO/Parallel/vtkPDataSetReader.cxx diff --git a/Parallel/vtkPDataSetReader.h b/IO/Parallel/vtkPDataSetReader.h similarity index 100% rename from Parallel/vtkPDataSetReader.h rename to IO/Parallel/vtkPDataSetReader.h diff --git a/Parallel/vtkPDataSetWriter.cxx b/IO/Parallel/vtkPDataSetWriter.cxx similarity index 100% rename from Parallel/vtkPDataSetWriter.cxx rename to IO/Parallel/vtkPDataSetWriter.cxx diff --git a/Parallel/vtkPDataSetWriter.h b/IO/Parallel/vtkPDataSetWriter.h similarity index 100% rename from Parallel/vtkPDataSetWriter.h rename to IO/Parallel/vtkPDataSetWriter.h diff --git a/Parallel/vtkPImageWriter.cxx b/IO/Parallel/vtkPImageWriter.cxx similarity index 100% rename from Parallel/vtkPImageWriter.cxx rename to IO/Parallel/vtkPImageWriter.cxx diff --git a/Parallel/vtkPImageWriter.h b/IO/Parallel/vtkPImageWriter.h similarity index 100% rename from Parallel/vtkPImageWriter.h rename to IO/Parallel/vtkPImageWriter.h diff --git a/Parallel/vtkPNrrdReader.cxx b/IO/Parallel/vtkPNrrdReader.cxx similarity index 100% rename from Parallel/vtkPNrrdReader.cxx rename to IO/Parallel/vtkPNrrdReader.cxx diff --git a/Parallel/vtkPNrrdReader.h b/IO/Parallel/vtkPNrrdReader.h similarity index 100% rename from Parallel/vtkPNrrdReader.h rename to IO/Parallel/vtkPNrrdReader.h diff --git a/Parallel/vtkPOpenFOAMReader.cxx b/IO/Parallel/vtkPOpenFOAMReader.cxx similarity index 100% rename from Parallel/vtkPOpenFOAMReader.cxx rename to IO/Parallel/vtkPOpenFOAMReader.cxx diff --git a/Parallel/vtkPOpenFOAMReader.h b/IO/Parallel/vtkPOpenFOAMReader.h similarity index 100% rename from Parallel/vtkPOpenFOAMReader.h rename to IO/Parallel/vtkPOpenFOAMReader.h diff --git a/Parallel/vtkPSLACReader.cxx b/IO/Parallel/vtkPSLACReader.cxx similarity index 100% rename from Parallel/vtkPSLACReader.cxx rename to IO/Parallel/vtkPSLACReader.cxx diff --git a/Parallel/vtkPSLACReader.h b/IO/Parallel/vtkPSLACReader.h similarity index 100% rename from Parallel/vtkPSLACReader.h rename to IO/Parallel/vtkPSLACReader.h diff --git a/Parallel/vtkVPICReader.cxx b/IO/Parallel/vtkVPICReader.cxx similarity index 100% rename from Parallel/vtkVPICReader.cxx rename to IO/Parallel/vtkVPICReader.cxx diff --git a/Parallel/vtkVPICReader.h b/IO/Parallel/vtkVPICReader.h similarity index 100% rename from Parallel/vtkVPICReader.h rename to IO/Parallel/vtkVPICReader.h diff --git a/Parallel/vtkWindBladeReader.cxx b/IO/Parallel/vtkWindBladeReader.cxx similarity index 100% rename from Parallel/vtkWindBladeReader.cxx rename to IO/Parallel/vtkWindBladeReader.cxx diff --git a/Parallel/vtkWindBladeReader.h b/IO/Parallel/vtkWindBladeReader.h similarity index 100% rename from Parallel/vtkWindBladeReader.h rename to IO/Parallel/vtkWindBladeReader.h diff --git a/Parallel/vtkXMLPHierarchicalBoxDataWriter.cxx b/IO/Parallel/vtkXMLPHierarchicalBoxDataWriter.cxx similarity index 100% rename from Parallel/vtkXMLPHierarchicalBoxDataWriter.cxx rename to IO/Parallel/vtkXMLPHierarchicalBoxDataWriter.cxx diff --git a/Parallel/vtkXMLPHierarchicalBoxDataWriter.h b/IO/Parallel/vtkXMLPHierarchicalBoxDataWriter.h similarity index 100% rename from Parallel/vtkXMLPHierarchicalBoxDataWriter.h rename to IO/Parallel/vtkXMLPHierarchicalBoxDataWriter.h diff --git a/Parallel/vtkXMLPMultiBlockDataWriter.cxx b/IO/Parallel/vtkXMLPMultiBlockDataWriter.cxx similarity index 100% rename from Parallel/vtkXMLPMultiBlockDataWriter.cxx rename to IO/Parallel/vtkXMLPMultiBlockDataWriter.cxx diff --git a/Parallel/vtkXMLPMultiBlockDataWriter.h b/IO/Parallel/vtkXMLPMultiBlockDataWriter.h similarity index 100% rename from Parallel/vtkXMLPMultiBlockDataWriter.h rename to IO/Parallel/vtkXMLPMultiBlockDataWriter.h diff --git a/Hybrid/vtkPExodusIIReader.cxx b/IO/ParallelExodus/vtkPExodusIIReader.cxx similarity index 100% rename from Hybrid/vtkPExodusIIReader.cxx rename to IO/ParallelExodus/vtkPExodusIIReader.cxx diff --git a/Hybrid/vtkPExodusIIReader.h b/IO/ParallelExodus/vtkPExodusIIReader.h similarity index 100% rename from Hybrid/vtkPExodusIIReader.h rename to IO/ParallelExodus/vtkPExodusIIReader.h diff --git a/Parallel/Testing/Cxx/PLSDynaReader.cxx b/IO/ParallelLSDyna/Testing/Cxx/PLSDynaReader.cxx similarity index 100% rename from Parallel/Testing/Cxx/PLSDynaReader.cxx rename to IO/ParallelLSDyna/Testing/Cxx/PLSDynaReader.cxx diff --git a/Parallel/vtkPLSDynaReader.cxx b/IO/ParallelLSDyna/vtkPLSDynaReader.cxx similarity index 100% rename from Parallel/vtkPLSDynaReader.cxx rename to IO/ParallelLSDyna/vtkPLSDynaReader.cxx diff --git a/Parallel/vtkPLSDynaReader.h b/IO/ParallelLSDyna/vtkPLSDynaReader.h similarity index 100% rename from Parallel/vtkPLSDynaReader.h rename to IO/ParallelLSDyna/vtkPLSDynaReader.h diff --git a/Parallel/vtkMPIImageReader.cxx b/IO/ParallelMPI/vtkMPIImageReader.cxx similarity index 100% rename from Parallel/vtkMPIImageReader.cxx rename to IO/ParallelMPI/vtkMPIImageReader.cxx diff --git a/Parallel/vtkMPIImageReader.h b/IO/ParallelMPI/vtkMPIImageReader.h similarity index 100% rename from Parallel/vtkMPIImageReader.h rename to IO/ParallelMPI/vtkMPIImageReader.h diff --git a/Parallel/vtkPNetCDFPOPReader.cxx b/IO/ParallelNetCDF/vtkPNetCDFPOPReader.cxx similarity index 100% rename from Parallel/vtkPNetCDFPOPReader.cxx rename to IO/ParallelNetCDF/vtkPNetCDFPOPReader.cxx diff --git a/Parallel/vtkPNetCDFPOPReader.h b/IO/ParallelNetCDF/vtkPNetCDFPOPReader.h similarity index 100% rename from Parallel/vtkPNetCDFPOPReader.h rename to IO/ParallelNetCDF/vtkPNetCDFPOPReader.h diff --git a/IO/Testing/Cxx/TestPostgreSQLDatabase.cxx b/IO/PostgreSQL/Testing/Cxx/TestPostgreSQLDatabase.cxx similarity index 100% rename from IO/Testing/Cxx/TestPostgreSQLDatabase.cxx rename to IO/PostgreSQL/Testing/Cxx/TestPostgreSQLDatabase.cxx diff --git a/IO/Testing/Cxx/TestPostgreSQLTableReadWrite.cxx b/IO/PostgreSQL/Testing/Cxx/TestPostgreSQLTableReadWrite.cxx similarity index 100% rename from IO/Testing/Cxx/TestPostgreSQLTableReadWrite.cxx rename to IO/PostgreSQL/Testing/Cxx/TestPostgreSQLTableReadWrite.cxx diff --git a/IO/vtkPostgreSQLDatabase.cxx b/IO/PostgreSQL/vtkPostgreSQLDatabase.cxx similarity index 100% rename from IO/vtkPostgreSQLDatabase.cxx rename to IO/PostgreSQL/vtkPostgreSQLDatabase.cxx diff --git a/IO/vtkPostgreSQLDatabase.h b/IO/PostgreSQL/vtkPostgreSQLDatabase.h similarity index 100% rename from IO/vtkPostgreSQLDatabase.h rename to IO/PostgreSQL/vtkPostgreSQLDatabase.h diff --git a/IO/vtkPostgreSQLDatabasePrivate.h b/IO/PostgreSQL/vtkPostgreSQLDatabasePrivate.h similarity index 100% rename from IO/vtkPostgreSQLDatabasePrivate.h rename to IO/PostgreSQL/vtkPostgreSQLDatabasePrivate.h diff --git a/IO/vtkPostgreSQLQuery.cxx b/IO/PostgreSQL/vtkPostgreSQLQuery.cxx similarity index 100% rename from IO/vtkPostgreSQLQuery.cxx rename to IO/PostgreSQL/vtkPostgreSQLQuery.cxx diff --git a/IO/vtkPostgreSQLQuery.h b/IO/PostgreSQL/vtkPostgreSQLQuery.h similarity index 100% rename from IO/vtkPostgreSQLQuery.h rename to IO/PostgreSQL/vtkPostgreSQLQuery.h diff --git a/IO/vtkPostgreSQLToTableReader.cxx b/IO/PostgreSQL/vtkPostgreSQLToTableReader.cxx similarity index 100% rename from IO/vtkPostgreSQLToTableReader.cxx rename to IO/PostgreSQL/vtkPostgreSQLToTableReader.cxx diff --git a/IO/vtkPostgreSQLToTableReader.h b/IO/PostgreSQL/vtkPostgreSQLToTableReader.h similarity index 100% rename from IO/vtkPostgreSQLToTableReader.h rename to IO/PostgreSQL/vtkPostgreSQLToTableReader.h diff --git a/IO/vtkTableToPostgreSQLWriter.cxx b/IO/PostgreSQL/vtkTableToPostgreSQLWriter.cxx similarity index 100% rename from IO/vtkTableToPostgreSQLWriter.cxx rename to IO/PostgreSQL/vtkTableToPostgreSQLWriter.cxx diff --git a/IO/vtkTableToPostgreSQLWriter.h b/IO/PostgreSQL/vtkTableToPostgreSQLWriter.h similarity index 100% rename from IO/vtkTableToPostgreSQLWriter.h rename to IO/PostgreSQL/vtkTableToPostgreSQLWriter.h diff --git a/IO/Testing/Cxx/TestSQLDatabaseSchema.cxx b/IO/SQL/Testing/Cxx/TestSQLDatabaseSchema.cxx similarity index 100% rename from IO/Testing/Cxx/TestSQLDatabaseSchema.cxx rename to IO/SQL/Testing/Cxx/TestSQLDatabaseSchema.cxx diff --git a/Infovis/Testing/Cxx/TestSQLGraphReader.cxx b/IO/SQL/Testing/Cxx/TestSQLGraphReader.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestSQLGraphReader.cxx rename to IO/SQL/Testing/Cxx/TestSQLGraphReader.cxx diff --git a/IO/Testing/Cxx/TestSQLiteDatabase.cxx b/IO/SQL/Testing/Cxx/TestSQLiteDatabase.cxx similarity index 100% rename from IO/Testing/Cxx/TestSQLiteDatabase.cxx rename to IO/SQL/Testing/Cxx/TestSQLiteDatabase.cxx diff --git a/IO/Testing/Cxx/TestSQLiteTableReadWrite.cxx b/IO/SQL/Testing/Cxx/TestSQLiteTableReadWrite.cxx similarity index 100% rename from IO/Testing/Cxx/TestSQLiteTableReadWrite.cxx rename to IO/SQL/Testing/Cxx/TestSQLiteTableReadWrite.cxx diff --git a/IO/vtkDatabaseToTableReader.cxx b/IO/SQL/vtkDatabaseToTableReader.cxx similarity index 100% rename from IO/vtkDatabaseToTableReader.cxx rename to IO/SQL/vtkDatabaseToTableReader.cxx diff --git a/IO/vtkDatabaseToTableReader.h b/IO/SQL/vtkDatabaseToTableReader.h similarity index 100% rename from IO/vtkDatabaseToTableReader.h rename to IO/SQL/vtkDatabaseToTableReader.h diff --git a/IO/vtkRowQuery.cxx b/IO/SQL/vtkRowQuery.cxx similarity index 100% rename from IO/vtkRowQuery.cxx rename to IO/SQL/vtkRowQuery.cxx diff --git a/IO/vtkRowQuery.h b/IO/SQL/vtkRowQuery.h similarity index 100% rename from IO/vtkRowQuery.h rename to IO/SQL/vtkRowQuery.h diff --git a/IO/vtkRowQueryToTable.cxx b/IO/SQL/vtkRowQueryToTable.cxx similarity index 100% rename from IO/vtkRowQueryToTable.cxx rename to IO/SQL/vtkRowQueryToTable.cxx diff --git a/IO/vtkRowQueryToTable.h b/IO/SQL/vtkRowQueryToTable.h similarity index 100% rename from IO/vtkRowQueryToTable.h rename to IO/SQL/vtkRowQueryToTable.h diff --git a/IO/vtkSQLDatabase.cxx b/IO/SQL/vtkSQLDatabase.cxx similarity index 100% rename from IO/vtkSQLDatabase.cxx rename to IO/SQL/vtkSQLDatabase.cxx diff --git a/IO/vtkSQLDatabase.h b/IO/SQL/vtkSQLDatabase.h similarity index 100% rename from IO/vtkSQLDatabase.h rename to IO/SQL/vtkSQLDatabase.h diff --git a/Infovis/vtkSQLDatabaseGraphSource.cxx b/IO/SQL/vtkSQLDatabaseGraphSource.cxx similarity index 100% rename from Infovis/vtkSQLDatabaseGraphSource.cxx rename to IO/SQL/vtkSQLDatabaseGraphSource.cxx diff --git a/Infovis/vtkSQLDatabaseGraphSource.h b/IO/SQL/vtkSQLDatabaseGraphSource.h similarity index 100% rename from Infovis/vtkSQLDatabaseGraphSource.h rename to IO/SQL/vtkSQLDatabaseGraphSource.h diff --git a/IO/vtkSQLDatabaseSchema.cxx b/IO/SQL/vtkSQLDatabaseSchema.cxx similarity index 100% rename from IO/vtkSQLDatabaseSchema.cxx rename to IO/SQL/vtkSQLDatabaseSchema.cxx diff --git a/IO/vtkSQLDatabaseSchema.h b/IO/SQL/vtkSQLDatabaseSchema.h similarity index 100% rename from IO/vtkSQLDatabaseSchema.h rename to IO/SQL/vtkSQLDatabaseSchema.h diff --git a/Infovis/vtkSQLDatabaseTableSource.cxx b/IO/SQL/vtkSQLDatabaseTableSource.cxx similarity index 100% rename from Infovis/vtkSQLDatabaseTableSource.cxx rename to IO/SQL/vtkSQLDatabaseTableSource.cxx diff --git a/Infovis/vtkSQLDatabaseTableSource.h b/IO/SQL/vtkSQLDatabaseTableSource.h similarity index 100% rename from Infovis/vtkSQLDatabaseTableSource.h rename to IO/SQL/vtkSQLDatabaseTableSource.h diff --git a/Infovis/vtkSQLGraphReader.cxx b/IO/SQL/vtkSQLGraphReader.cxx similarity index 100% rename from Infovis/vtkSQLGraphReader.cxx rename to IO/SQL/vtkSQLGraphReader.cxx diff --git a/Infovis/vtkSQLGraphReader.h b/IO/SQL/vtkSQLGraphReader.h similarity index 100% rename from Infovis/vtkSQLGraphReader.h rename to IO/SQL/vtkSQLGraphReader.h diff --git a/IO/vtkSQLQuery.cxx b/IO/SQL/vtkSQLQuery.cxx similarity index 100% rename from IO/vtkSQLQuery.cxx rename to IO/SQL/vtkSQLQuery.cxx diff --git a/IO/vtkSQLQuery.h b/IO/SQL/vtkSQLQuery.h similarity index 100% rename from IO/vtkSQLQuery.h rename to IO/SQL/vtkSQLQuery.h diff --git a/IO/vtkSQLiteDatabase.cxx b/IO/SQL/vtkSQLiteDatabase.cxx similarity index 100% rename from IO/vtkSQLiteDatabase.cxx rename to IO/SQL/vtkSQLiteDatabase.cxx diff --git a/IO/vtkSQLiteDatabase.h b/IO/SQL/vtkSQLiteDatabase.h similarity index 100% rename from IO/vtkSQLiteDatabase.h rename to IO/SQL/vtkSQLiteDatabase.h diff --git a/IO/vtkSQLiteQuery.cxx b/IO/SQL/vtkSQLiteQuery.cxx similarity index 100% rename from IO/vtkSQLiteQuery.cxx rename to IO/SQL/vtkSQLiteQuery.cxx diff --git a/IO/vtkSQLiteQuery.h b/IO/SQL/vtkSQLiteQuery.h similarity index 100% rename from IO/vtkSQLiteQuery.h rename to IO/SQL/vtkSQLiteQuery.h diff --git a/IO/vtkSQLiteToTableReader.cxx b/IO/SQL/vtkSQLiteToTableReader.cxx similarity index 100% rename from IO/vtkSQLiteToTableReader.cxx rename to IO/SQL/vtkSQLiteToTableReader.cxx diff --git a/IO/vtkSQLiteToTableReader.h b/IO/SQL/vtkSQLiteToTableReader.h similarity index 100% rename from IO/vtkSQLiteToTableReader.h rename to IO/SQL/vtkSQLiteToTableReader.h diff --git a/IO/vtkTableToDatabaseWriter.cxx b/IO/SQL/vtkTableToDatabaseWriter.cxx similarity index 100% rename from IO/vtkTableToDatabaseWriter.cxx rename to IO/SQL/vtkTableToDatabaseWriter.cxx diff --git a/IO/vtkTableToDatabaseWriter.h b/IO/SQL/vtkTableToDatabaseWriter.h similarity index 100% rename from IO/vtkTableToDatabaseWriter.h rename to IO/SQL/vtkTableToDatabaseWriter.h diff --git a/IO/vtkTableToSQLiteWriter.cxx b/IO/SQL/vtkTableToSQLiteWriter.cxx similarity index 100% rename from IO/vtkTableToSQLiteWriter.cxx rename to IO/SQL/vtkTableToSQLiteWriter.cxx diff --git a/IO/vtkTableToSQLiteWriter.h b/IO/SQL/vtkTableToSQLiteWriter.h similarity index 100% rename from IO/vtkTableToSQLiteWriter.h rename to IO/SQL/vtkTableToSQLiteWriter.h diff --git a/Hybrid/vtkMILVideoSource.cxx b/IO/Video/vtkMILVideoSource.cxx similarity index 100% rename from Hybrid/vtkMILVideoSource.cxx rename to IO/Video/vtkMILVideoSource.cxx diff --git a/Hybrid/vtkMILVideoSource.h b/IO/Video/vtkMILVideoSource.h similarity index 100% rename from Hybrid/vtkMILVideoSource.h rename to IO/Video/vtkMILVideoSource.h diff --git a/Hybrid/vtkVideoSource.cxx b/IO/Video/vtkVideoSource.cxx similarity index 100% rename from Hybrid/vtkVideoSource.cxx rename to IO/Video/vtkVideoSource.cxx diff --git a/Hybrid/vtkVideoSource.h b/IO/Video/vtkVideoSource.h similarity index 100% rename from Hybrid/vtkVideoSource.h rename to IO/Video/vtkVideoSource.h diff --git a/Hybrid/vtkWin32VideoSource.cxx b/IO/Video/vtkWin32VideoSource.cxx similarity index 100% rename from Hybrid/vtkWin32VideoSource.cxx rename to IO/Video/vtkWin32VideoSource.cxx diff --git a/Hybrid/vtkWin32VideoSource.h b/IO/Video/vtkWin32VideoSource.h similarity index 100% rename from Hybrid/vtkWin32VideoSource.h rename to IO/Video/vtkWin32VideoSource.h diff --git a/IO/Testing/Cxx/TestDataObjectXMLIO.cxx b/IO/XML/Testing/Cxx/TestDataObjectXMLIO.cxx similarity index 100% rename from IO/Testing/Cxx/TestDataObjectXMLIO.cxx rename to IO/XML/Testing/Cxx/TestDataObjectXMLIO.cxx diff --git a/IO/Testing/Cxx/TestHyperOctreeIO.cxx b/IO/XML/Testing/Cxx/TestHyperOctreeIO.cxx similarity index 100% rename from IO/Testing/Cxx/TestHyperOctreeIO.cxx rename to IO/XML/Testing/Cxx/TestHyperOctreeIO.cxx diff --git a/IO/Testing/Cxx/TestXML.cxx b/IO/XML/Testing/Cxx/TestXML.cxx similarity index 100% rename from IO/Testing/Cxx/TestXML.cxx rename to IO/XML/Testing/Cxx/TestXML.cxx diff --git a/IO/Testing/Cxx/TestXMLCInterface.c b/IO/XML/Testing/Cxx/TestXMLCInterface.c similarity index 100% rename from IO/Testing/Cxx/TestXMLCInterface.c rename to IO/XML/Testing/Cxx/TestXMLCInterface.c diff --git a/IO/Testing/Tcl/TestEmptyXML.tcl b/IO/XML/Testing/Tcl/TestEmptyXML.tcl similarity index 100% rename from IO/Testing/Tcl/TestEmptyXML.tcl rename to IO/XML/Testing/Tcl/TestEmptyXML.tcl diff --git a/IO/Testing/Tcl/TestXMLImageDataIO.tcl b/IO/XML/Testing/Tcl/TestXMLImageDataIO.tcl similarity index 100% rename from IO/Testing/Tcl/TestXMLImageDataIO.tcl rename to IO/XML/Testing/Tcl/TestXMLImageDataIO.tcl diff --git a/IO/Testing/Tcl/TestXMLPolyDataIO.tcl b/IO/XML/Testing/Tcl/TestXMLPolyDataIO.tcl similarity index 100% rename from IO/Testing/Tcl/TestXMLPolyDataIO.tcl rename to IO/XML/Testing/Tcl/TestXMLPolyDataIO.tcl diff --git a/IO/Testing/Tcl/TestXMLRectilinearGridIO.tcl b/IO/XML/Testing/Tcl/TestXMLRectilinearGridIO.tcl similarity index 100% rename from IO/Testing/Tcl/TestXMLRectilinearGridIO.tcl rename to IO/XML/Testing/Tcl/TestXMLRectilinearGridIO.tcl diff --git a/IO/Testing/Tcl/TestXMLStructuredGridIO.tcl b/IO/XML/Testing/Tcl/TestXMLStructuredGridIO.tcl similarity index 100% rename from IO/Testing/Tcl/TestXMLStructuredGridIO.tcl rename to IO/XML/Testing/Tcl/TestXMLStructuredGridIO.tcl diff --git a/IO/Testing/Tcl/TestXMLUnstructuredGridIO.tcl b/IO/XML/Testing/Tcl/TestXMLUnstructuredGridIO.tcl similarity index 100% rename from IO/Testing/Tcl/TestXMLUnstructuredGridIO.tcl rename to IO/XML/Testing/Tcl/TestXMLUnstructuredGridIO.tcl diff --git a/IO/vtkRTXMLPolyDataReader.cxx b/IO/XML/vtkRTXMLPolyDataReader.cxx similarity index 100% rename from IO/vtkRTXMLPolyDataReader.cxx rename to IO/XML/vtkRTXMLPolyDataReader.cxx diff --git a/IO/vtkRTXMLPolyDataReader.h b/IO/XML/vtkRTXMLPolyDataReader.h similarity index 100% rename from IO/vtkRTXMLPolyDataReader.h rename to IO/XML/vtkRTXMLPolyDataReader.h diff --git a/IO/vtkXMLCompositeDataReader.cxx b/IO/XML/vtkXMLCompositeDataReader.cxx similarity index 100% rename from IO/vtkXMLCompositeDataReader.cxx rename to IO/XML/vtkXMLCompositeDataReader.cxx diff --git a/IO/vtkXMLCompositeDataReader.h b/IO/XML/vtkXMLCompositeDataReader.h similarity index 100% rename from IO/vtkXMLCompositeDataReader.h rename to IO/XML/vtkXMLCompositeDataReader.h diff --git a/IO/vtkXMLCompositeDataWriter.cxx b/IO/XML/vtkXMLCompositeDataWriter.cxx similarity index 100% rename from IO/vtkXMLCompositeDataWriter.cxx rename to IO/XML/vtkXMLCompositeDataWriter.cxx diff --git a/IO/vtkXMLCompositeDataWriter.h b/IO/XML/vtkXMLCompositeDataWriter.h similarity index 100% rename from IO/vtkXMLCompositeDataWriter.h rename to IO/XML/vtkXMLCompositeDataWriter.h diff --git a/IO/vtkXMLDataParser.cxx b/IO/XML/vtkXMLDataParser.cxx similarity index 100% rename from IO/vtkXMLDataParser.cxx rename to IO/XML/vtkXMLDataParser.cxx diff --git a/IO/vtkXMLDataParser.h b/IO/XML/vtkXMLDataParser.h similarity index 100% rename from IO/vtkXMLDataParser.h rename to IO/XML/vtkXMLDataParser.h diff --git a/IO/vtkXMLDataReader.cxx b/IO/XML/vtkXMLDataReader.cxx similarity index 100% rename from IO/vtkXMLDataReader.cxx rename to IO/XML/vtkXMLDataReader.cxx diff --git a/IO/vtkXMLDataReader.h b/IO/XML/vtkXMLDataReader.h similarity index 100% rename from IO/vtkXMLDataReader.h rename to IO/XML/vtkXMLDataReader.h diff --git a/IO/vtkXMLDataSetWriter.cxx b/IO/XML/vtkXMLDataSetWriter.cxx similarity index 100% rename from IO/vtkXMLDataSetWriter.cxx rename to IO/XML/vtkXMLDataSetWriter.cxx diff --git a/IO/vtkXMLDataSetWriter.h b/IO/XML/vtkXMLDataSetWriter.h similarity index 100% rename from IO/vtkXMLDataSetWriter.h rename to IO/XML/vtkXMLDataSetWriter.h diff --git a/IO/vtkXMLFileReadTester.cxx b/IO/XML/vtkXMLFileReadTester.cxx similarity index 100% rename from IO/vtkXMLFileReadTester.cxx rename to IO/XML/vtkXMLFileReadTester.cxx diff --git a/IO/vtkXMLFileReadTester.h b/IO/XML/vtkXMLFileReadTester.h similarity index 100% rename from IO/vtkXMLFileReadTester.h rename to IO/XML/vtkXMLFileReadTester.h diff --git a/IO/vtkXMLGenericDataObjectReader.cxx b/IO/XML/vtkXMLGenericDataObjectReader.cxx similarity index 100% rename from IO/vtkXMLGenericDataObjectReader.cxx rename to IO/XML/vtkXMLGenericDataObjectReader.cxx diff --git a/IO/vtkXMLGenericDataObjectReader.h b/IO/XML/vtkXMLGenericDataObjectReader.h similarity index 100% rename from IO/vtkXMLGenericDataObjectReader.h rename to IO/XML/vtkXMLGenericDataObjectReader.h diff --git a/IO/vtkXMLHierarchicalBoxDataReader.cxx b/IO/XML/vtkXMLHierarchicalBoxDataReader.cxx similarity index 100% rename from IO/vtkXMLHierarchicalBoxDataReader.cxx rename to IO/XML/vtkXMLHierarchicalBoxDataReader.cxx diff --git a/IO/vtkXMLHierarchicalBoxDataReader.h b/IO/XML/vtkXMLHierarchicalBoxDataReader.h similarity index 100% rename from IO/vtkXMLHierarchicalBoxDataReader.h rename to IO/XML/vtkXMLHierarchicalBoxDataReader.h diff --git a/IO/vtkXMLHierarchicalBoxDataWriter.cxx b/IO/XML/vtkXMLHierarchicalBoxDataWriter.cxx similarity index 100% rename from IO/vtkXMLHierarchicalBoxDataWriter.cxx rename to IO/XML/vtkXMLHierarchicalBoxDataWriter.cxx diff --git a/IO/vtkXMLHierarchicalBoxDataWriter.h b/IO/XML/vtkXMLHierarchicalBoxDataWriter.h similarity index 100% rename from IO/vtkXMLHierarchicalBoxDataWriter.h rename to IO/XML/vtkXMLHierarchicalBoxDataWriter.h diff --git a/IO/vtkXMLHierarchicalDataReader.cxx b/IO/XML/vtkXMLHierarchicalDataReader.cxx similarity index 100% rename from IO/vtkXMLHierarchicalDataReader.cxx rename to IO/XML/vtkXMLHierarchicalDataReader.cxx diff --git a/IO/vtkXMLHierarchicalDataReader.h b/IO/XML/vtkXMLHierarchicalDataReader.h similarity index 100% rename from IO/vtkXMLHierarchicalDataReader.h rename to IO/XML/vtkXMLHierarchicalDataReader.h diff --git a/IO/vtkXMLHyperOctreeReader.cxx b/IO/XML/vtkXMLHyperOctreeReader.cxx similarity index 100% rename from IO/vtkXMLHyperOctreeReader.cxx rename to IO/XML/vtkXMLHyperOctreeReader.cxx diff --git a/IO/vtkXMLHyperOctreeReader.h b/IO/XML/vtkXMLHyperOctreeReader.h similarity index 100% rename from IO/vtkXMLHyperOctreeReader.h rename to IO/XML/vtkXMLHyperOctreeReader.h diff --git a/IO/vtkXMLHyperOctreeWriter.cxx b/IO/XML/vtkXMLHyperOctreeWriter.cxx similarity index 100% rename from IO/vtkXMLHyperOctreeWriter.cxx rename to IO/XML/vtkXMLHyperOctreeWriter.cxx diff --git a/IO/vtkXMLHyperOctreeWriter.h b/IO/XML/vtkXMLHyperOctreeWriter.h similarity index 100% rename from IO/vtkXMLHyperOctreeWriter.h rename to IO/XML/vtkXMLHyperOctreeWriter.h diff --git a/IO/vtkXMLImageDataReader.cxx b/IO/XML/vtkXMLImageDataReader.cxx similarity index 100% rename from IO/vtkXMLImageDataReader.cxx rename to IO/XML/vtkXMLImageDataReader.cxx diff --git a/IO/vtkXMLImageDataReader.h b/IO/XML/vtkXMLImageDataReader.h similarity index 100% rename from IO/vtkXMLImageDataReader.h rename to IO/XML/vtkXMLImageDataReader.h diff --git a/IO/vtkXMLImageDataWriter.cxx b/IO/XML/vtkXMLImageDataWriter.cxx similarity index 100% rename from IO/vtkXMLImageDataWriter.cxx rename to IO/XML/vtkXMLImageDataWriter.cxx diff --git a/IO/vtkXMLImageDataWriter.h b/IO/XML/vtkXMLImageDataWriter.h similarity index 100% rename from IO/vtkXMLImageDataWriter.h rename to IO/XML/vtkXMLImageDataWriter.h diff --git a/IO/vtkXMLMaterial.cxx b/IO/XML/vtkXMLMaterial.cxx similarity index 100% rename from IO/vtkXMLMaterial.cxx rename to IO/XML/vtkXMLMaterial.cxx diff --git a/IO/vtkXMLMaterial.h b/IO/XML/vtkXMLMaterial.h similarity index 100% rename from IO/vtkXMLMaterial.h rename to IO/XML/vtkXMLMaterial.h diff --git a/IO/vtkXMLMaterialParser.cxx b/IO/XML/vtkXMLMaterialParser.cxx similarity index 100% rename from IO/vtkXMLMaterialParser.cxx rename to IO/XML/vtkXMLMaterialParser.cxx diff --git a/IO/vtkXMLMaterialParser.h b/IO/XML/vtkXMLMaterialParser.h similarity index 100% rename from IO/vtkXMLMaterialParser.h rename to IO/XML/vtkXMLMaterialParser.h diff --git a/IO/vtkXMLMaterialReader.cxx b/IO/XML/vtkXMLMaterialReader.cxx similarity index 100% rename from IO/vtkXMLMaterialReader.cxx rename to IO/XML/vtkXMLMaterialReader.cxx diff --git a/IO/vtkXMLMaterialReader.h b/IO/XML/vtkXMLMaterialReader.h similarity index 100% rename from IO/vtkXMLMaterialReader.h rename to IO/XML/vtkXMLMaterialReader.h diff --git a/IO/vtkXMLMultiBlockDataReader.cxx b/IO/XML/vtkXMLMultiBlockDataReader.cxx similarity index 100% rename from IO/vtkXMLMultiBlockDataReader.cxx rename to IO/XML/vtkXMLMultiBlockDataReader.cxx diff --git a/IO/vtkXMLMultiBlockDataReader.h b/IO/XML/vtkXMLMultiBlockDataReader.h similarity index 100% rename from IO/vtkXMLMultiBlockDataReader.h rename to IO/XML/vtkXMLMultiBlockDataReader.h diff --git a/IO/vtkXMLMultiBlockDataWriter.cxx b/IO/XML/vtkXMLMultiBlockDataWriter.cxx similarity index 100% rename from IO/vtkXMLMultiBlockDataWriter.cxx rename to IO/XML/vtkXMLMultiBlockDataWriter.cxx diff --git a/IO/vtkXMLMultiBlockDataWriter.h b/IO/XML/vtkXMLMultiBlockDataWriter.h similarity index 100% rename from IO/vtkXMLMultiBlockDataWriter.h rename to IO/XML/vtkXMLMultiBlockDataWriter.h diff --git a/IO/vtkXMLMultiGroupDataReader.cxx b/IO/XML/vtkXMLMultiGroupDataReader.cxx similarity index 100% rename from IO/vtkXMLMultiGroupDataReader.cxx rename to IO/XML/vtkXMLMultiGroupDataReader.cxx diff --git a/IO/vtkXMLMultiGroupDataReader.h b/IO/XML/vtkXMLMultiGroupDataReader.h similarity index 100% rename from IO/vtkXMLMultiGroupDataReader.h rename to IO/XML/vtkXMLMultiGroupDataReader.h diff --git a/IO/vtkXMLPDataReader.cxx b/IO/XML/vtkXMLPDataReader.cxx similarity index 100% rename from IO/vtkXMLPDataReader.cxx rename to IO/XML/vtkXMLPDataReader.cxx diff --git a/IO/vtkXMLPDataReader.h b/IO/XML/vtkXMLPDataReader.h similarity index 100% rename from IO/vtkXMLPDataReader.h rename to IO/XML/vtkXMLPDataReader.h diff --git a/IO/vtkXMLPDataSetWriter.cxx b/IO/XML/vtkXMLPDataSetWriter.cxx similarity index 100% rename from IO/vtkXMLPDataSetWriter.cxx rename to IO/XML/vtkXMLPDataSetWriter.cxx diff --git a/IO/vtkXMLPDataSetWriter.h b/IO/XML/vtkXMLPDataSetWriter.h similarity index 100% rename from IO/vtkXMLPDataSetWriter.h rename to IO/XML/vtkXMLPDataSetWriter.h diff --git a/IO/vtkXMLPDataWriter.cxx b/IO/XML/vtkXMLPDataWriter.cxx similarity index 100% rename from IO/vtkXMLPDataWriter.cxx rename to IO/XML/vtkXMLPDataWriter.cxx diff --git a/IO/vtkXMLPDataWriter.h b/IO/XML/vtkXMLPDataWriter.h similarity index 100% rename from IO/vtkXMLPDataWriter.h rename to IO/XML/vtkXMLPDataWriter.h diff --git a/IO/vtkXMLPImageDataReader.cxx b/IO/XML/vtkXMLPImageDataReader.cxx similarity index 100% rename from IO/vtkXMLPImageDataReader.cxx rename to IO/XML/vtkXMLPImageDataReader.cxx diff --git a/IO/vtkXMLPImageDataReader.h b/IO/XML/vtkXMLPImageDataReader.h similarity index 100% rename from IO/vtkXMLPImageDataReader.h rename to IO/XML/vtkXMLPImageDataReader.h diff --git a/IO/vtkXMLPImageDataWriter.cxx b/IO/XML/vtkXMLPImageDataWriter.cxx similarity index 100% rename from IO/vtkXMLPImageDataWriter.cxx rename to IO/XML/vtkXMLPImageDataWriter.cxx diff --git a/IO/vtkXMLPImageDataWriter.h b/IO/XML/vtkXMLPImageDataWriter.h similarity index 100% rename from IO/vtkXMLPImageDataWriter.h rename to IO/XML/vtkXMLPImageDataWriter.h diff --git a/IO/vtkXMLPPolyDataReader.cxx b/IO/XML/vtkXMLPPolyDataReader.cxx similarity index 100% rename from IO/vtkXMLPPolyDataReader.cxx rename to IO/XML/vtkXMLPPolyDataReader.cxx diff --git a/IO/vtkXMLPPolyDataReader.h b/IO/XML/vtkXMLPPolyDataReader.h similarity index 100% rename from IO/vtkXMLPPolyDataReader.h rename to IO/XML/vtkXMLPPolyDataReader.h diff --git a/IO/vtkXMLPPolyDataWriter.cxx b/IO/XML/vtkXMLPPolyDataWriter.cxx similarity index 100% rename from IO/vtkXMLPPolyDataWriter.cxx rename to IO/XML/vtkXMLPPolyDataWriter.cxx diff --git a/IO/vtkXMLPPolyDataWriter.h b/IO/XML/vtkXMLPPolyDataWriter.h similarity index 100% rename from IO/vtkXMLPPolyDataWriter.h rename to IO/XML/vtkXMLPPolyDataWriter.h diff --git a/IO/vtkXMLPRectilinearGridReader.cxx b/IO/XML/vtkXMLPRectilinearGridReader.cxx similarity index 100% rename from IO/vtkXMLPRectilinearGridReader.cxx rename to IO/XML/vtkXMLPRectilinearGridReader.cxx diff --git a/IO/vtkXMLPRectilinearGridReader.h b/IO/XML/vtkXMLPRectilinearGridReader.h similarity index 100% rename from IO/vtkXMLPRectilinearGridReader.h rename to IO/XML/vtkXMLPRectilinearGridReader.h diff --git a/IO/vtkXMLPRectilinearGridWriter.cxx b/IO/XML/vtkXMLPRectilinearGridWriter.cxx similarity index 100% rename from IO/vtkXMLPRectilinearGridWriter.cxx rename to IO/XML/vtkXMLPRectilinearGridWriter.cxx diff --git a/IO/vtkXMLPRectilinearGridWriter.h b/IO/XML/vtkXMLPRectilinearGridWriter.h similarity index 100% rename from IO/vtkXMLPRectilinearGridWriter.h rename to IO/XML/vtkXMLPRectilinearGridWriter.h diff --git a/IO/vtkXMLPStructuredDataReader.cxx b/IO/XML/vtkXMLPStructuredDataReader.cxx similarity index 100% rename from IO/vtkXMLPStructuredDataReader.cxx rename to IO/XML/vtkXMLPStructuredDataReader.cxx diff --git a/IO/vtkXMLPStructuredDataReader.h b/IO/XML/vtkXMLPStructuredDataReader.h similarity index 100% rename from IO/vtkXMLPStructuredDataReader.h rename to IO/XML/vtkXMLPStructuredDataReader.h diff --git a/IO/vtkXMLPStructuredDataWriter.cxx b/IO/XML/vtkXMLPStructuredDataWriter.cxx similarity index 100% rename from IO/vtkXMLPStructuredDataWriter.cxx rename to IO/XML/vtkXMLPStructuredDataWriter.cxx diff --git a/IO/vtkXMLPStructuredDataWriter.h b/IO/XML/vtkXMLPStructuredDataWriter.h similarity index 100% rename from IO/vtkXMLPStructuredDataWriter.h rename to IO/XML/vtkXMLPStructuredDataWriter.h diff --git a/IO/vtkXMLPStructuredGridReader.cxx b/IO/XML/vtkXMLPStructuredGridReader.cxx similarity index 100% rename from IO/vtkXMLPStructuredGridReader.cxx rename to IO/XML/vtkXMLPStructuredGridReader.cxx diff --git a/IO/vtkXMLPStructuredGridReader.h b/IO/XML/vtkXMLPStructuredGridReader.h similarity index 100% rename from IO/vtkXMLPStructuredGridReader.h rename to IO/XML/vtkXMLPStructuredGridReader.h diff --git a/IO/vtkXMLPStructuredGridWriter.cxx b/IO/XML/vtkXMLPStructuredGridWriter.cxx similarity index 100% rename from IO/vtkXMLPStructuredGridWriter.cxx rename to IO/XML/vtkXMLPStructuredGridWriter.cxx diff --git a/IO/vtkXMLPStructuredGridWriter.h b/IO/XML/vtkXMLPStructuredGridWriter.h similarity index 100% rename from IO/vtkXMLPStructuredGridWriter.h rename to IO/XML/vtkXMLPStructuredGridWriter.h diff --git a/IO/vtkXMLPUnstructuredDataReader.cxx b/IO/XML/vtkXMLPUnstructuredDataReader.cxx similarity index 100% rename from IO/vtkXMLPUnstructuredDataReader.cxx rename to IO/XML/vtkXMLPUnstructuredDataReader.cxx diff --git a/IO/vtkXMLPUnstructuredDataReader.h b/IO/XML/vtkXMLPUnstructuredDataReader.h similarity index 100% rename from IO/vtkXMLPUnstructuredDataReader.h rename to IO/XML/vtkXMLPUnstructuredDataReader.h diff --git a/IO/vtkXMLPUnstructuredDataWriter.cxx b/IO/XML/vtkXMLPUnstructuredDataWriter.cxx similarity index 100% rename from IO/vtkXMLPUnstructuredDataWriter.cxx rename to IO/XML/vtkXMLPUnstructuredDataWriter.cxx diff --git a/IO/vtkXMLPUnstructuredDataWriter.h b/IO/XML/vtkXMLPUnstructuredDataWriter.h similarity index 100% rename from IO/vtkXMLPUnstructuredDataWriter.h rename to IO/XML/vtkXMLPUnstructuredDataWriter.h diff --git a/IO/vtkXMLPUnstructuredGridReader.cxx b/IO/XML/vtkXMLPUnstructuredGridReader.cxx similarity index 100% rename from IO/vtkXMLPUnstructuredGridReader.cxx rename to IO/XML/vtkXMLPUnstructuredGridReader.cxx diff --git a/IO/vtkXMLPUnstructuredGridReader.h b/IO/XML/vtkXMLPUnstructuredGridReader.h similarity index 100% rename from IO/vtkXMLPUnstructuredGridReader.h rename to IO/XML/vtkXMLPUnstructuredGridReader.h diff --git a/IO/vtkXMLPUnstructuredGridWriter.cxx b/IO/XML/vtkXMLPUnstructuredGridWriter.cxx similarity index 100% rename from IO/vtkXMLPUnstructuredGridWriter.cxx rename to IO/XML/vtkXMLPUnstructuredGridWriter.cxx diff --git a/IO/vtkXMLPUnstructuredGridWriter.h b/IO/XML/vtkXMLPUnstructuredGridWriter.h similarity index 100% rename from IO/vtkXMLPUnstructuredGridWriter.h rename to IO/XML/vtkXMLPUnstructuredGridWriter.h diff --git a/IO/vtkXMLParser.cxx b/IO/XML/vtkXMLParser.cxx similarity index 100% rename from IO/vtkXMLParser.cxx rename to IO/XML/vtkXMLParser.cxx diff --git a/IO/vtkXMLParser.h b/IO/XML/vtkXMLParser.h similarity index 100% rename from IO/vtkXMLParser.h rename to IO/XML/vtkXMLParser.h diff --git a/IO/vtkXMLPolyDataReader.cxx b/IO/XML/vtkXMLPolyDataReader.cxx similarity index 100% rename from IO/vtkXMLPolyDataReader.cxx rename to IO/XML/vtkXMLPolyDataReader.cxx diff --git a/IO/vtkXMLPolyDataReader.h b/IO/XML/vtkXMLPolyDataReader.h similarity index 100% rename from IO/vtkXMLPolyDataReader.h rename to IO/XML/vtkXMLPolyDataReader.h diff --git a/IO/vtkXMLPolyDataWriter.cxx b/IO/XML/vtkXMLPolyDataWriter.cxx similarity index 100% rename from IO/vtkXMLPolyDataWriter.cxx rename to IO/XML/vtkXMLPolyDataWriter.cxx diff --git a/IO/vtkXMLPolyDataWriter.h b/IO/XML/vtkXMLPolyDataWriter.h similarity index 100% rename from IO/vtkXMLPolyDataWriter.h rename to IO/XML/vtkXMLPolyDataWriter.h diff --git a/IO/vtkXMLReader.cxx b/IO/XML/vtkXMLReader.cxx similarity index 100% rename from IO/vtkXMLReader.cxx rename to IO/XML/vtkXMLReader.cxx diff --git a/IO/vtkXMLReader.h b/IO/XML/vtkXMLReader.h similarity index 100% rename from IO/vtkXMLReader.h rename to IO/XML/vtkXMLReader.h diff --git a/IO/vtkXMLRectilinearGridReader.cxx b/IO/XML/vtkXMLRectilinearGridReader.cxx similarity index 100% rename from IO/vtkXMLRectilinearGridReader.cxx rename to IO/XML/vtkXMLRectilinearGridReader.cxx diff --git a/IO/vtkXMLRectilinearGridReader.h b/IO/XML/vtkXMLRectilinearGridReader.h similarity index 100% rename from IO/vtkXMLRectilinearGridReader.h rename to IO/XML/vtkXMLRectilinearGridReader.h diff --git a/IO/vtkXMLRectilinearGridWriter.cxx b/IO/XML/vtkXMLRectilinearGridWriter.cxx similarity index 100% rename from IO/vtkXMLRectilinearGridWriter.cxx rename to IO/XML/vtkXMLRectilinearGridWriter.cxx diff --git a/IO/vtkXMLRectilinearGridWriter.h b/IO/XML/vtkXMLRectilinearGridWriter.h similarity index 100% rename from IO/vtkXMLRectilinearGridWriter.h rename to IO/XML/vtkXMLRectilinearGridWriter.h diff --git a/IO/vtkXMLShader.cxx b/IO/XML/vtkXMLShader.cxx similarity index 100% rename from IO/vtkXMLShader.cxx rename to IO/XML/vtkXMLShader.cxx diff --git a/IO/vtkXMLShader.h b/IO/XML/vtkXMLShader.h similarity index 100% rename from IO/vtkXMLShader.h rename to IO/XML/vtkXMLShader.h diff --git a/IO/vtkXMLStructuredDataReader.cxx b/IO/XML/vtkXMLStructuredDataReader.cxx similarity index 100% rename from IO/vtkXMLStructuredDataReader.cxx rename to IO/XML/vtkXMLStructuredDataReader.cxx diff --git a/IO/vtkXMLStructuredDataReader.h b/IO/XML/vtkXMLStructuredDataReader.h similarity index 100% rename from IO/vtkXMLStructuredDataReader.h rename to IO/XML/vtkXMLStructuredDataReader.h diff --git a/IO/vtkXMLStructuredDataWriter.cxx b/IO/XML/vtkXMLStructuredDataWriter.cxx similarity index 100% rename from IO/vtkXMLStructuredDataWriter.cxx rename to IO/XML/vtkXMLStructuredDataWriter.cxx diff --git a/IO/vtkXMLStructuredDataWriter.h b/IO/XML/vtkXMLStructuredDataWriter.h similarity index 100% rename from IO/vtkXMLStructuredDataWriter.h rename to IO/XML/vtkXMLStructuredDataWriter.h diff --git a/IO/vtkXMLStructuredGridReader.cxx b/IO/XML/vtkXMLStructuredGridReader.cxx similarity index 100% rename from IO/vtkXMLStructuredGridReader.cxx rename to IO/XML/vtkXMLStructuredGridReader.cxx diff --git a/IO/vtkXMLStructuredGridReader.h b/IO/XML/vtkXMLStructuredGridReader.h similarity index 100% rename from IO/vtkXMLStructuredGridReader.h rename to IO/XML/vtkXMLStructuredGridReader.h diff --git a/IO/vtkXMLStructuredGridWriter.cxx b/IO/XML/vtkXMLStructuredGridWriter.cxx similarity index 100% rename from IO/vtkXMLStructuredGridWriter.cxx rename to IO/XML/vtkXMLStructuredGridWriter.cxx diff --git a/IO/vtkXMLStructuredGridWriter.h b/IO/XML/vtkXMLStructuredGridWriter.h similarity index 100% rename from IO/vtkXMLStructuredGridWriter.h rename to IO/XML/vtkXMLStructuredGridWriter.h diff --git a/IO/vtkXMLUnstructuredDataReader.cxx b/IO/XML/vtkXMLUnstructuredDataReader.cxx similarity index 100% rename from IO/vtkXMLUnstructuredDataReader.cxx rename to IO/XML/vtkXMLUnstructuredDataReader.cxx diff --git a/IO/vtkXMLUnstructuredDataReader.h b/IO/XML/vtkXMLUnstructuredDataReader.h similarity index 100% rename from IO/vtkXMLUnstructuredDataReader.h rename to IO/XML/vtkXMLUnstructuredDataReader.h diff --git a/IO/vtkXMLUnstructuredDataWriter.cxx b/IO/XML/vtkXMLUnstructuredDataWriter.cxx similarity index 100% rename from IO/vtkXMLUnstructuredDataWriter.cxx rename to IO/XML/vtkXMLUnstructuredDataWriter.cxx diff --git a/IO/vtkXMLUnstructuredDataWriter.h b/IO/XML/vtkXMLUnstructuredDataWriter.h similarity index 100% rename from IO/vtkXMLUnstructuredDataWriter.h rename to IO/XML/vtkXMLUnstructuredDataWriter.h diff --git a/IO/vtkXMLUnstructuredGridReader.cxx b/IO/XML/vtkXMLUnstructuredGridReader.cxx similarity index 100% rename from IO/vtkXMLUnstructuredGridReader.cxx rename to IO/XML/vtkXMLUnstructuredGridReader.cxx diff --git a/IO/vtkXMLUnstructuredGridReader.h b/IO/XML/vtkXMLUnstructuredGridReader.h similarity index 100% rename from IO/vtkXMLUnstructuredGridReader.h rename to IO/XML/vtkXMLUnstructuredGridReader.h diff --git a/IO/vtkXMLUnstructuredGridWriter.cxx b/IO/XML/vtkXMLUnstructuredGridWriter.cxx similarity index 100% rename from IO/vtkXMLUnstructuredGridWriter.cxx rename to IO/XML/vtkXMLUnstructuredGridWriter.cxx diff --git a/IO/vtkXMLUnstructuredGridWriter.h b/IO/XML/vtkXMLUnstructuredGridWriter.h similarity index 100% rename from IO/vtkXMLUnstructuredGridWriter.h rename to IO/XML/vtkXMLUnstructuredGridWriter.h diff --git a/IO/vtkXMLUtilities.cxx b/IO/XML/vtkXMLUtilities.cxx similarity index 100% rename from IO/vtkXMLUtilities.cxx rename to IO/XML/vtkXMLUtilities.cxx diff --git a/IO/vtkXMLUtilities.h b/IO/XML/vtkXMLUtilities.h similarity index 100% rename from IO/vtkXMLUtilities.h rename to IO/XML/vtkXMLUtilities.h diff --git a/IO/vtkXMLWriter.cxx b/IO/XML/vtkXMLWriter.cxx similarity index 100% rename from IO/vtkXMLWriter.cxx rename to IO/XML/vtkXMLWriter.cxx diff --git a/IO/vtkXMLWriter.h b/IO/XML/vtkXMLWriter.h similarity index 100% rename from IO/vtkXMLWriter.h rename to IO/XML/vtkXMLWriter.h diff --git a/IO/vtkXMLWriterC.cxx b/IO/XML/vtkXMLWriterC.cxx similarity index 100% rename from IO/vtkXMLWriterC.cxx rename to IO/XML/vtkXMLWriterC.cxx diff --git a/IO/vtkXMLWriterC.h b/IO/XML/vtkXMLWriterC.h similarity index 100% rename from IO/vtkXMLWriterC.h rename to IO/XML/vtkXMLWriterC.h diff --git a/IO/vtkXMLWriterF.h b/IO/XML/vtkXMLWriterF.h similarity index 100% rename from IO/vtkXMLWriterF.h rename to IO/XML/vtkXMLWriterF.h diff --git a/Imaging/vtkImageHSIToRGB.cxx b/Imaging/Color/vtkImageHSIToRGB.cxx similarity index 100% rename from Imaging/vtkImageHSIToRGB.cxx rename to Imaging/Color/vtkImageHSIToRGB.cxx diff --git a/Imaging/vtkImageHSIToRGB.h b/Imaging/Color/vtkImageHSIToRGB.h similarity index 100% rename from Imaging/vtkImageHSIToRGB.h rename to Imaging/Color/vtkImageHSIToRGB.h diff --git a/Imaging/vtkImageHSVToRGB.cxx b/Imaging/Color/vtkImageHSVToRGB.cxx similarity index 100% rename from Imaging/vtkImageHSVToRGB.cxx rename to Imaging/Color/vtkImageHSVToRGB.cxx diff --git a/Imaging/vtkImageHSVToRGB.h b/Imaging/Color/vtkImageHSVToRGB.h similarity index 100% rename from Imaging/vtkImageHSVToRGB.h rename to Imaging/Color/vtkImageHSVToRGB.h diff --git a/Imaging/vtkImageLuminance.cxx b/Imaging/Color/vtkImageLuminance.cxx similarity index 100% rename from Imaging/vtkImageLuminance.cxx rename to Imaging/Color/vtkImageLuminance.cxx diff --git a/Imaging/vtkImageLuminance.h b/Imaging/Color/vtkImageLuminance.h similarity index 100% rename from Imaging/vtkImageLuminance.h rename to Imaging/Color/vtkImageLuminance.h diff --git a/Imaging/vtkImageMapToRGBA.cxx b/Imaging/Color/vtkImageMapToRGBA.cxx similarity index 100% rename from Imaging/vtkImageMapToRGBA.cxx rename to Imaging/Color/vtkImageMapToRGBA.cxx diff --git a/Imaging/vtkImageMapToRGBA.h b/Imaging/Color/vtkImageMapToRGBA.h similarity index 100% rename from Imaging/vtkImageMapToRGBA.h rename to Imaging/Color/vtkImageMapToRGBA.h diff --git a/Imaging/vtkImageMapToWindowLevelColors.cxx b/Imaging/Color/vtkImageMapToWindowLevelColors.cxx similarity index 100% rename from Imaging/vtkImageMapToWindowLevelColors.cxx rename to Imaging/Color/vtkImageMapToWindowLevelColors.cxx diff --git a/Imaging/vtkImageMapToWindowLevelColors.h b/Imaging/Color/vtkImageMapToWindowLevelColors.h similarity index 100% rename from Imaging/vtkImageMapToWindowLevelColors.h rename to Imaging/Color/vtkImageMapToWindowLevelColors.h diff --git a/Imaging/vtkImageQuantizeRGBToIndex.cxx b/Imaging/Color/vtkImageQuantizeRGBToIndex.cxx similarity index 100% rename from Imaging/vtkImageQuantizeRGBToIndex.cxx rename to Imaging/Color/vtkImageQuantizeRGBToIndex.cxx diff --git a/Imaging/vtkImageQuantizeRGBToIndex.h b/Imaging/Color/vtkImageQuantizeRGBToIndex.h similarity index 100% rename from Imaging/vtkImageQuantizeRGBToIndex.h rename to Imaging/Color/vtkImageQuantizeRGBToIndex.h diff --git a/Imaging/vtkImageRGBToHSI.cxx b/Imaging/Color/vtkImageRGBToHSI.cxx similarity index 100% rename from Imaging/vtkImageRGBToHSI.cxx rename to Imaging/Color/vtkImageRGBToHSI.cxx diff --git a/Imaging/vtkImageRGBToHSI.h b/Imaging/Color/vtkImageRGBToHSI.h similarity index 100% rename from Imaging/vtkImageRGBToHSI.h rename to Imaging/Color/vtkImageRGBToHSI.h diff --git a/Imaging/vtkImageRGBToHSV.cxx b/Imaging/Color/vtkImageRGBToHSV.cxx similarity index 100% rename from Imaging/vtkImageRGBToHSV.cxx rename to Imaging/Color/vtkImageRGBToHSV.cxx diff --git a/Imaging/vtkImageRGBToHSV.h b/Imaging/Color/vtkImageRGBToHSV.h similarity index 100% rename from Imaging/vtkImageRGBToHSV.h rename to Imaging/Color/vtkImageRGBToHSV.h diff --git a/Imaging/Testing/Cxx/FastSplatter.cxx b/Imaging/Core/Testing/Cxx/FastSplatter.cxx similarity index 100% rename from Imaging/Testing/Cxx/FastSplatter.cxx rename to Imaging/Core/Testing/Cxx/FastSplatter.cxx diff --git a/Imaging/Testing/Cxx/ImageAccumulate.cxx b/Imaging/Core/Testing/Cxx/ImageAccumulate.cxx similarity index 100% rename from Imaging/Testing/Cxx/ImageAccumulate.cxx rename to Imaging/Core/Testing/Cxx/ImageAccumulate.cxx diff --git a/Imaging/Testing/Cxx/ImageAutoRange.cxx b/Imaging/Core/Testing/Cxx/ImageAutoRange.cxx similarity index 100% rename from Imaging/Testing/Cxx/ImageAutoRange.cxx rename to Imaging/Core/Testing/Cxx/ImageAutoRange.cxx diff --git a/Imaging/Testing/Cxx/ImageBSplineCoefficients.cxx b/Imaging/Core/Testing/Cxx/ImageBSplineCoefficients.cxx similarity index 100% rename from Imaging/Testing/Cxx/ImageBSplineCoefficients.cxx rename to Imaging/Core/Testing/Cxx/ImageBSplineCoefficients.cxx diff --git a/Imaging/Testing/Cxx/ImageHistogram.cxx b/Imaging/Core/Testing/Cxx/ImageHistogram.cxx similarity index 100% rename from Imaging/Testing/Cxx/ImageHistogram.cxx rename to Imaging/Core/Testing/Cxx/ImageHistogram.cxx diff --git a/Imaging/Testing/Cxx/ImageHistogramStatistics.cxx b/Imaging/Core/Testing/Cxx/ImageHistogramStatistics.cxx similarity index 100% rename from Imaging/Testing/Cxx/ImageHistogramStatistics.cxx rename to Imaging/Core/Testing/Cxx/ImageHistogramStatistics.cxx diff --git a/Imaging/Testing/Cxx/ImageResize.cxx b/Imaging/Core/Testing/Cxx/ImageResize.cxx similarity index 100% rename from Imaging/Testing/Cxx/ImageResize.cxx rename to Imaging/Core/Testing/Cxx/ImageResize.cxx diff --git a/Imaging/Testing/Cxx/ImageResize3D.cxx b/Imaging/Core/Testing/Cxx/ImageResize3D.cxx similarity index 100% rename from Imaging/Testing/Cxx/ImageResize3D.cxx rename to Imaging/Core/Testing/Cxx/ImageResize3D.cxx diff --git a/Imaging/Testing/Cxx/ImageResizeCropping.cxx b/Imaging/Core/Testing/Cxx/ImageResizeCropping.cxx similarity index 100% rename from Imaging/Testing/Cxx/ImageResizeCropping.cxx rename to Imaging/Core/Testing/Cxx/ImageResizeCropping.cxx diff --git a/Imaging/Testing/Cxx/ImageWeightedSum.cxx b/Imaging/Core/Testing/Cxx/ImageWeightedSum.cxx similarity index 100% rename from Imaging/Testing/Cxx/ImageWeightedSum.cxx rename to Imaging/Core/Testing/Cxx/ImageWeightedSum.cxx diff --git a/Imaging/Testing/Cxx/ImportExport.cxx b/Imaging/Core/Testing/Cxx/ImportExport.cxx similarity index 100% rename from Imaging/Testing/Cxx/ImportExport.cxx rename to Imaging/Core/Testing/Cxx/ImportExport.cxx diff --git a/Hybrid/Testing/Cxx/TestImageStencilData.cxx b/Imaging/Core/Testing/Cxx/TestImageStencilData.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestImageStencilData.cxx rename to Imaging/Core/Testing/Cxx/TestImageStencilData.cxx diff --git a/Imaging/Testing/Cxx/TestUpdateExtentReset.cxx b/Imaging/Core/Testing/Cxx/TestUpdateExtentReset.cxx similarity index 100% rename from Imaging/Testing/Cxx/TestUpdateExtentReset.cxx rename to Imaging/Core/Testing/Cxx/TestUpdateExtentReset.cxx diff --git a/Imaging/Testing/Tcl/ContinuousClose2D.tcl b/Imaging/Core/Testing/Tcl/ContinuousClose2D.tcl similarity index 100% rename from Imaging/Testing/Tcl/ContinuousClose2D.tcl rename to Imaging/Core/Testing/Tcl/ContinuousClose2D.tcl diff --git a/Imaging/Testing/Tcl/IdealHighPass.tcl b/Imaging/Core/Testing/Tcl/IdealHighPass.tcl similarity index 100% rename from Imaging/Testing/Tcl/IdealHighPass.tcl rename to Imaging/Core/Testing/Tcl/IdealHighPass.tcl diff --git a/Imaging/Testing/Tcl/LaplacianEdgeEnhance.tcl b/Imaging/Core/Testing/Tcl/LaplacianEdgeEnhance.tcl similarity index 100% rename from Imaging/Testing/Tcl/LaplacianEdgeEnhance.tcl rename to Imaging/Core/Testing/Tcl/LaplacianEdgeEnhance.tcl diff --git a/Imaging/Testing/Tcl/MultipleUpdateExtents.tcl b/Imaging/Core/Testing/Tcl/MultipleUpdateExtents.tcl similarity index 100% rename from Imaging/Testing/Tcl/MultipleUpdateExtents.tcl rename to Imaging/Core/Testing/Tcl/MultipleUpdateExtents.tcl diff --git a/Imaging/Testing/Tcl/ResliceBSpline.tcl b/Imaging/Core/Testing/Tcl/ResliceBSpline.tcl similarity index 100% rename from Imaging/Testing/Tcl/ResliceBSpline.tcl rename to Imaging/Core/Testing/Tcl/ResliceBSpline.tcl diff --git a/Imaging/Testing/Tcl/ResliceColorWrap.tcl b/Imaging/Core/Testing/Tcl/ResliceColorWrap.tcl similarity index 100% rename from Imaging/Testing/Tcl/ResliceColorWrap.tcl rename to Imaging/Core/Testing/Tcl/ResliceColorWrap.tcl diff --git a/Imaging/Testing/Tcl/ResliceInformationInput.tcl b/Imaging/Core/Testing/Tcl/ResliceInformationInput.tcl similarity index 100% rename from Imaging/Testing/Tcl/ResliceInformationInput.tcl rename to Imaging/Core/Testing/Tcl/ResliceInformationInput.tcl diff --git a/Imaging/Testing/Tcl/ResliceInterpolationModes.tcl b/Imaging/Core/Testing/Tcl/ResliceInterpolationModes.tcl similarity index 100% rename from Imaging/Testing/Tcl/ResliceInterpolationModes.tcl rename to Imaging/Core/Testing/Tcl/ResliceInterpolationModes.tcl diff --git a/Imaging/Testing/Tcl/ResliceInterpolationOblique.tcl b/Imaging/Core/Testing/Tcl/ResliceInterpolationOblique.tcl similarity index 100% rename from Imaging/Testing/Tcl/ResliceInterpolationOblique.tcl rename to Imaging/Core/Testing/Tcl/ResliceInterpolationOblique.tcl diff --git a/Imaging/Testing/Tcl/ResliceLanczosKaiser.tcl b/Imaging/Core/Testing/Tcl/ResliceLanczosKaiser.tcl similarity index 100% rename from Imaging/Testing/Tcl/ResliceLanczosKaiser.tcl rename to Imaging/Core/Testing/Tcl/ResliceLanczosKaiser.tcl diff --git a/Imaging/Testing/Tcl/ResliceMirrorOblique.tcl b/Imaging/Core/Testing/Tcl/ResliceMirrorOblique.tcl similarity index 100% rename from Imaging/Testing/Tcl/ResliceMirrorOblique.tcl rename to Imaging/Core/Testing/Tcl/ResliceMirrorOblique.tcl diff --git a/Imaging/Testing/Tcl/ResliceMirrorPad.tcl b/Imaging/Core/Testing/Tcl/ResliceMirrorPad.tcl similarity index 100% rename from Imaging/Testing/Tcl/ResliceMirrorPad.tcl rename to Imaging/Core/Testing/Tcl/ResliceMirrorPad.tcl diff --git a/Imaging/Testing/Tcl/ResliceOptimizationOff.tcl b/Imaging/Core/Testing/Tcl/ResliceOptimizationOff.tcl similarity index 100% rename from Imaging/Testing/Tcl/ResliceOptimizationOff.tcl rename to Imaging/Core/Testing/Tcl/ResliceOptimizationOff.tcl diff --git a/Imaging/Testing/Tcl/ReslicePermutations.tcl b/Imaging/Core/Testing/Tcl/ReslicePermutations.tcl similarity index 100% rename from Imaging/Testing/Tcl/ReslicePermutations.tcl rename to Imaging/Core/Testing/Tcl/ReslicePermutations.tcl diff --git a/Imaging/Testing/Tcl/ReslicePermuteResample.tcl b/Imaging/Core/Testing/Tcl/ReslicePermuteResample.tcl similarity index 100% rename from Imaging/Testing/Tcl/ReslicePermuteResample.tcl rename to Imaging/Core/Testing/Tcl/ReslicePermuteResample.tcl diff --git a/Imaging/Testing/Tcl/ReslicePermuteSlab.tcl b/Imaging/Core/Testing/Tcl/ReslicePermuteSlab.tcl similarity index 100% rename from Imaging/Testing/Tcl/ReslicePermuteSlab.tcl rename to Imaging/Core/Testing/Tcl/ReslicePermuteSlab.tcl diff --git a/Imaging/Testing/Tcl/ResliceSlabModes.tcl b/Imaging/Core/Testing/Tcl/ResliceSlabModes.tcl similarity index 100% rename from Imaging/Testing/Tcl/ResliceSlabModes.tcl rename to Imaging/Core/Testing/Tcl/ResliceSlabModes.tcl diff --git a/Imaging/Testing/Tcl/ResliceToColors.tcl b/Imaging/Core/Testing/Tcl/ResliceToColors.tcl similarity index 100% rename from Imaging/Testing/Tcl/ResliceToColors.tcl rename to Imaging/Core/Testing/Tcl/ResliceToColors.tcl diff --git a/Imaging/Testing/Tcl/ResliceWrapOblique.tcl b/Imaging/Core/Testing/Tcl/ResliceWrapOblique.tcl similarity index 100% rename from Imaging/Testing/Tcl/ResliceWrapOblique.tcl rename to Imaging/Core/Testing/Tcl/ResliceWrapOblique.tcl diff --git a/Imaging/Testing/Tcl/ResliceWrapPad.tcl b/Imaging/Core/Testing/Tcl/ResliceWrapPad.tcl similarity index 100% rename from Imaging/Testing/Tcl/ResliceWrapPad.tcl rename to Imaging/Core/Testing/Tcl/ResliceWrapPad.tcl diff --git a/Imaging/Testing/Tcl/Spectrum.tcl b/Imaging/Core/Testing/Tcl/Spectrum.tcl similarity index 100% rename from Imaging/Testing/Tcl/Spectrum.tcl rename to Imaging/Core/Testing/Tcl/Spectrum.tcl diff --git a/Imaging/Testing/Tcl/TestAccumulate.tcl b/Imaging/Core/Testing/Tcl/TestAccumulate.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestAccumulate.tcl rename to Imaging/Core/Testing/Tcl/TestAccumulate.tcl diff --git a/Imaging/Testing/Tcl/TestAllBlends.tcl b/Imaging/Core/Testing/Tcl/TestAllBlends.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestAllBlends.tcl rename to Imaging/Core/Testing/Tcl/TestAllBlends.tcl diff --git a/Imaging/Testing/Tcl/TestAllBlendsFloat.tcl b/Imaging/Core/Testing/Tcl/TestAllBlendsFloat.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestAllBlendsFloat.tcl rename to Imaging/Core/Testing/Tcl/TestAllBlendsFloat.tcl diff --git a/Imaging/Testing/Tcl/TestAllFlips.tcl b/Imaging/Core/Testing/Tcl/TestAllFlips.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestAllFlips.tcl rename to Imaging/Core/Testing/Tcl/TestAllFlips.tcl diff --git a/Imaging/Testing/Tcl/TestAllLogic.tcl b/Imaging/Core/Testing/Tcl/TestAllLogic.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestAllLogic.tcl rename to Imaging/Core/Testing/Tcl/TestAllLogic.tcl diff --git a/Imaging/Testing/Tcl/TestAllMaskBits.tcl b/Imaging/Core/Testing/Tcl/TestAllMaskBits.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestAllMaskBits.tcl rename to Imaging/Core/Testing/Tcl/TestAllMaskBits.tcl diff --git a/Imaging/Testing/Tcl/TestAllMathematics.tcl b/Imaging/Core/Testing/Tcl/TestAllMathematics.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestAllMathematics.tcl rename to Imaging/Core/Testing/Tcl/TestAllMathematics.tcl diff --git a/Imaging/Testing/Tcl/TestAllShrinks.tcl b/Imaging/Core/Testing/Tcl/TestAllShrinks.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestAllShrinks.tcl rename to Imaging/Core/Testing/Tcl/TestAllShrinks.tcl diff --git a/Imaging/Testing/Tcl/TestAnisotropicDiffusion2D.tcl b/Imaging/Core/Testing/Tcl/TestAnisotropicDiffusion2D.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestAnisotropicDiffusion2D.tcl rename to Imaging/Core/Testing/Tcl/TestAnisotropicDiffusion2D.tcl diff --git a/Imaging/Testing/Tcl/TestAnisotropicDiffusion3D.tcl b/Imaging/Core/Testing/Tcl/TestAnisotropicDiffusion3D.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestAnisotropicDiffusion3D.tcl rename to Imaging/Core/Testing/Tcl/TestAnisotropicDiffusion3D.tcl diff --git a/Imaging/Testing/Tcl/TestBlendStencil.tcl b/Imaging/Core/Testing/Tcl/TestBlendStencil.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestBlendStencil.tcl rename to Imaging/Core/Testing/Tcl/TestBlendStencil.tcl diff --git a/Imaging/Testing/Tcl/TestButterworthHighPass.tcl b/Imaging/Core/Testing/Tcl/TestButterworthHighPass.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestButterworthHighPass.tcl rename to Imaging/Core/Testing/Tcl/TestButterworthHighPass.tcl diff --git a/Imaging/Testing/Tcl/TestButterworthLowPass.tcl b/Imaging/Core/Testing/Tcl/TestButterworthLowPass.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestButterworthLowPass.tcl rename to Imaging/Core/Testing/Tcl/TestButterworthLowPass.tcl diff --git a/Imaging/Testing/Tcl/TestCache.tcl b/Imaging/Core/Testing/Tcl/TestCache.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestCache.tcl rename to Imaging/Core/Testing/Tcl/TestCache.tcl diff --git a/Imaging/Testing/Tcl/TestChangeInformation.tcl b/Imaging/Core/Testing/Tcl/TestChangeInformation.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestChangeInformation.tcl rename to Imaging/Core/Testing/Tcl/TestChangeInformation.tcl diff --git a/Imaging/Testing/Tcl/TestCheckerboard.tcl b/Imaging/Core/Testing/Tcl/TestCheckerboard.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestCheckerboard.tcl rename to Imaging/Core/Testing/Tcl/TestCheckerboard.tcl diff --git a/Imaging/Testing/Tcl/TestCityBlockDistance.tcl b/Imaging/Core/Testing/Tcl/TestCityBlockDistance.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestCityBlockDistance.tcl rename to Imaging/Core/Testing/Tcl/TestCityBlockDistance.tcl diff --git a/Imaging/Testing/Tcl/TestConvolve.tcl b/Imaging/Core/Testing/Tcl/TestConvolve.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestConvolve.tcl rename to Imaging/Core/Testing/Tcl/TestConvolve.tcl diff --git a/Imaging/Testing/Tcl/TestCorrelation.tcl b/Imaging/Core/Testing/Tcl/TestCorrelation.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestCorrelation.tcl rename to Imaging/Core/Testing/Tcl/TestCorrelation.tcl diff --git a/Imaging/Testing/Tcl/TestDivergence.tcl b/Imaging/Core/Testing/Tcl/TestDivergence.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestDivergence.tcl rename to Imaging/Core/Testing/Tcl/TestDivergence.tcl diff --git a/Imaging/Testing/Tcl/TestDotProduct.tcl b/Imaging/Core/Testing/Tcl/TestDotProduct.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestDotProduct.tcl rename to Imaging/Core/Testing/Tcl/TestDotProduct.tcl diff --git a/Imaging/Testing/Tcl/TestEuclideanDistance.tcl b/Imaging/Core/Testing/Tcl/TestEuclideanDistance.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestEuclideanDistance.tcl rename to Imaging/Core/Testing/Tcl/TestEuclideanDistance.tcl diff --git a/Imaging/Testing/Tcl/TestEuclideanDistanceCached.tcl b/Imaging/Core/Testing/Tcl/TestEuclideanDistanceCached.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestEuclideanDistanceCached.tcl rename to Imaging/Core/Testing/Tcl/TestEuclideanDistanceCached.tcl diff --git a/Imaging/Testing/Tcl/TestEuclideanToPolar.tcl b/Imaging/Core/Testing/Tcl/TestEuclideanToPolar.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestEuclideanToPolar.tcl rename to Imaging/Core/Testing/Tcl/TestEuclideanToPolar.tcl diff --git a/Parallel/Testing/Tcl/TestExtractVOI.tcl b/Imaging/Core/Testing/Tcl/TestExtractVOI.tcl similarity index 100% rename from Parallel/Testing/Tcl/TestExtractVOI.tcl rename to Imaging/Core/Testing/Tcl/TestExtractVOI.tcl diff --git a/Imaging/Testing/Tcl/TestFFTCorrelation.tcl b/Imaging/Core/Testing/Tcl/TestFFTCorrelation.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestFFTCorrelation.tcl rename to Imaging/Core/Testing/Tcl/TestFFTCorrelation.tcl diff --git a/Imaging/Testing/Tcl/TestGradientMagnitude.tcl b/Imaging/Core/Testing/Tcl/TestGradientMagnitude.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestGradientMagnitude.tcl rename to Imaging/Core/Testing/Tcl/TestGradientMagnitude.tcl diff --git a/Imaging/Testing/Tcl/TestGradientMagnitude2.tcl b/Imaging/Core/Testing/Tcl/TestGradientMagnitude2.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestGradientMagnitude2.tcl rename to Imaging/Core/Testing/Tcl/TestGradientMagnitude2.tcl diff --git a/Imaging/Testing/Tcl/TestHSIToRGB.tcl b/Imaging/Core/Testing/Tcl/TestHSIToRGB.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestHSIToRGB.tcl rename to Imaging/Core/Testing/Tcl/TestHSIToRGB.tcl diff --git a/Imaging/Testing/Tcl/TestHSVToRGB.tcl b/Imaging/Core/Testing/Tcl/TestHSVToRGB.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestHSVToRGB.tcl rename to Imaging/Core/Testing/Tcl/TestHSVToRGB.tcl diff --git a/Imaging/Testing/Tcl/TestHybridMedian2D.tcl b/Imaging/Core/Testing/Tcl/TestHybridMedian2D.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestHybridMedian2D.tcl rename to Imaging/Core/Testing/Tcl/TestHybridMedian2D.tcl diff --git a/Imaging/Testing/Tcl/TestIdealLowPass.tcl b/Imaging/Core/Testing/Tcl/TestIdealLowPass.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestIdealLowPass.tcl rename to Imaging/Core/Testing/Tcl/TestIdealLowPass.tcl diff --git a/Imaging/Testing/Tcl/TestImageCanvas.tcl b/Imaging/Core/Testing/Tcl/TestImageCanvas.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestImageCanvas.tcl rename to Imaging/Core/Testing/Tcl/TestImageCanvas.tcl diff --git a/Imaging/Testing/Tcl/TestImageProjection.tcl b/Imaging/Core/Testing/Tcl/TestImageProjection.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestImageProjection.tcl rename to Imaging/Core/Testing/Tcl/TestImageProjection.tcl diff --git a/Imaging/Testing/Tcl/TestImageThresholdConnectivity.tcl b/Imaging/Core/Testing/Tcl/TestImageThresholdConnectivity.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestImageThresholdConnectivity.tcl rename to Imaging/Core/Testing/Tcl/TestImageThresholdConnectivity.tcl diff --git a/Imaging/Testing/Tcl/TestImageWeightedSum.tcl b/Imaging/Core/Testing/Tcl/TestImageWeightedSum.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestImageWeightedSum.tcl rename to Imaging/Core/Testing/Tcl/TestImageWeightedSum.tcl diff --git a/Imaging/Testing/Tcl/TestInPlaceFilter.tcl b/Imaging/Core/Testing/Tcl/TestInPlaceFilter.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestInPlaceFilter.tcl rename to Imaging/Core/Testing/Tcl/TestInPlaceFilter.tcl diff --git a/Imaging/Testing/Tcl/TestIslandRemoval2D.tcl b/Imaging/Core/Testing/Tcl/TestIslandRemoval2D.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestIslandRemoval2D.tcl rename to Imaging/Core/Testing/Tcl/TestIslandRemoval2D.tcl diff --git a/Imaging/Testing/Tcl/TestLassoStencil.tcl b/Imaging/Core/Testing/Tcl/TestLassoStencil.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestLassoStencil.tcl rename to Imaging/Core/Testing/Tcl/TestLassoStencil.tcl diff --git a/Imaging/Testing/Tcl/TestMapToRGBABlockStreaming.tcl b/Imaging/Core/Testing/Tcl/TestMapToRGBABlockStreaming.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestMapToRGBABlockStreaming.tcl rename to Imaging/Core/Testing/Tcl/TestMapToRGBABlockStreaming.tcl diff --git a/Imaging/Testing/Tcl/TestMapToWindowLevelColors.tcl b/Imaging/Core/Testing/Tcl/TestMapToWindowLevelColors.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestMapToWindowLevelColors.tcl rename to Imaging/Core/Testing/Tcl/TestMapToWindowLevelColors.tcl diff --git a/Imaging/Testing/Tcl/TestMapToWindowLevelColors2.tcl b/Imaging/Core/Testing/Tcl/TestMapToWindowLevelColors2.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestMapToWindowLevelColors2.tcl rename to Imaging/Core/Testing/Tcl/TestMapToWindowLevelColors2.tcl diff --git a/Imaging/Testing/Tcl/TestMask2.tcl b/Imaging/Core/Testing/Tcl/TestMask2.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestMask2.tcl rename to Imaging/Core/Testing/Tcl/TestMask2.tcl diff --git a/Imaging/Testing/Tcl/TestMedian3D.tcl b/Imaging/Core/Testing/Tcl/TestMedian3D.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestMedian3D.tcl rename to Imaging/Core/Testing/Tcl/TestMedian3D.tcl diff --git a/Imaging/Testing/Tcl/TestNormalize.tcl b/Imaging/Core/Testing/Tcl/TestNormalize.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestNormalize.tcl rename to Imaging/Core/Testing/Tcl/TestNormalize.tcl diff --git a/Imaging/Testing/Tcl/TestOpenClose3D.tcl b/Imaging/Core/Testing/Tcl/TestOpenClose3D.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestOpenClose3D.tcl rename to Imaging/Core/Testing/Tcl/TestOpenClose3D.tcl diff --git a/Imaging/Testing/Tcl/TestPermute.tcl b/Imaging/Core/Testing/Tcl/TestPermute.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestPermute.tcl rename to Imaging/Core/Testing/Tcl/TestPermute.tcl diff --git a/Imaging/Testing/Tcl/TestQuantizeTo16Colors.tcl b/Imaging/Core/Testing/Tcl/TestQuantizeTo16Colors.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestQuantizeTo16Colors.tcl rename to Imaging/Core/Testing/Tcl/TestQuantizeTo16Colors.tcl diff --git a/Imaging/Testing/Tcl/TestROIStencil.tcl b/Imaging/Core/Testing/Tcl/TestROIStencil.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestROIStencil.tcl rename to Imaging/Core/Testing/Tcl/TestROIStencil.tcl diff --git a/Imaging/Testing/Tcl/TestRange3D.tcl b/Imaging/Core/Testing/Tcl/TestRange3D.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestRange3D.tcl rename to Imaging/Core/Testing/Tcl/TestRange3D.tcl diff --git a/Imaging/Testing/Tcl/TestResample.tcl b/Imaging/Core/Testing/Tcl/TestResample.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestResample.tcl rename to Imaging/Core/Testing/Tcl/TestResample.tcl diff --git a/Imaging/Testing/Tcl/TestSeparableFilter.tcl b/Imaging/Core/Testing/Tcl/TestSeparableFilter.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestSeparableFilter.tcl rename to Imaging/Core/Testing/Tcl/TestSeparableFilter.tcl diff --git a/Imaging/Testing/Tcl/TestShiftScale.tcl b/Imaging/Core/Testing/Tcl/TestShiftScale.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestShiftScale.tcl rename to Imaging/Core/Testing/Tcl/TestShiftScale.tcl diff --git a/Imaging/Testing/Tcl/TestShiftScale2.tcl b/Imaging/Core/Testing/Tcl/TestShiftScale2.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestShiftScale2.tcl rename to Imaging/Core/Testing/Tcl/TestShiftScale2.tcl diff --git a/Imaging/Testing/Tcl/TestSimpleImageExample.tcl b/Imaging/Core/Testing/Tcl/TestSimpleImageExample.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestSimpleImageExample.tcl rename to Imaging/Core/Testing/Tcl/TestSimpleImageExample.tcl diff --git a/Imaging/Testing/Tcl/TestSkeleton2D.tcl b/Imaging/Core/Testing/Tcl/TestSkeleton2D.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestSkeleton2D.tcl rename to Imaging/Core/Testing/Tcl/TestSkeleton2D.tcl diff --git a/Imaging/Testing/Tcl/TestSobel2D.tcl b/Imaging/Core/Testing/Tcl/TestSobel2D.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestSobel2D.tcl rename to Imaging/Core/Testing/Tcl/TestSobel2D.tcl diff --git a/Imaging/Testing/Tcl/TestSobel3D.tcl b/Imaging/Core/Testing/Tcl/TestSobel3D.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestSobel3D.tcl rename to Imaging/Core/Testing/Tcl/TestSobel3D.tcl diff --git a/Imaging/Testing/Tcl/TestStencilToImage.tcl b/Imaging/Core/Testing/Tcl/TestStencilToImage.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestStencilToImage.tcl rename to Imaging/Core/Testing/Tcl/TestStencilToImage.tcl diff --git a/Imaging/Testing/Tcl/TestStencilWithFunction.tcl b/Imaging/Core/Testing/Tcl/TestStencilWithFunction.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestStencilWithFunction.tcl rename to Imaging/Core/Testing/Tcl/TestStencilWithFunction.tcl diff --git a/Imaging/Testing/Tcl/TestStencilWithImage.tcl b/Imaging/Core/Testing/Tcl/TestStencilWithImage.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestStencilWithImage.tcl rename to Imaging/Core/Testing/Tcl/TestStencilWithImage.tcl diff --git a/Imaging/Testing/Tcl/TestThreshold.tcl b/Imaging/Core/Testing/Tcl/TestThreshold.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestThreshold.tcl rename to Imaging/Core/Testing/Tcl/TestThreshold.tcl diff --git a/Imaging/Testing/Tcl/TestVariance3D.tcl b/Imaging/Core/Testing/Tcl/TestVariance3D.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestVariance3D.tcl rename to Imaging/Core/Testing/Tcl/TestVariance3D.tcl diff --git a/Imaging/Testing/Tcl/TestWipe.tcl b/Imaging/Core/Testing/Tcl/TestWipe.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestWipe.tcl rename to Imaging/Core/Testing/Tcl/TestWipe.tcl diff --git a/Imaging/Testing/Tcl/TestWrapPad.tcl b/Imaging/Core/Testing/Tcl/TestWrapPad.tcl similarity index 100% rename from Imaging/Testing/Tcl/TestWrapPad.tcl rename to Imaging/Core/Testing/Tcl/TestWrapPad.tcl diff --git a/Imaging/Testing/Tcl/WindowLevelInterface.tcl b/Imaging/Core/Testing/Tcl/WindowLevelInterface.tcl similarity index 100% rename from Imaging/Testing/Tcl/WindowLevelInterface.tcl rename to Imaging/Core/Testing/Tcl/WindowLevelInterface.tcl diff --git a/Graphics/Testing/Tcl/imageMCAll.tcl b/Imaging/Core/Testing/Tcl/imageMCAll.tcl similarity index 100% rename from Graphics/Testing/Tcl/imageMCAll.tcl rename to Imaging/Core/Testing/Tcl/imageMCAll.tcl diff --git a/Imaging/Testing/Tcl/reconstructSurface.tcl b/Imaging/Core/Testing/Tcl/reconstructSurface.tcl similarity index 100% rename from Imaging/Testing/Tcl/reconstructSurface.tcl rename to Imaging/Core/Testing/Tcl/reconstructSurface.tcl diff --git a/Imaging/Testing/Tcl/resampledTexture.tcl b/Imaging/Core/Testing/Tcl/resampledTexture.tcl similarity index 100% rename from Imaging/Testing/Tcl/resampledTexture.tcl rename to Imaging/Core/Testing/Tcl/resampledTexture.tcl diff --git a/Imaging/Testing/Tcl/voxelModel.tcl b/Imaging/Core/Testing/Tcl/voxelModel.tcl similarity index 100% rename from Imaging/Testing/Tcl/voxelModel.tcl rename to Imaging/Core/Testing/Tcl/voxelModel.tcl diff --git a/Filtering/vtkAbstractImageInterpolator.cxx b/Imaging/Core/vtkAbstractImageInterpolator.cxx similarity index 100% rename from Filtering/vtkAbstractImageInterpolator.cxx rename to Imaging/Core/vtkAbstractImageInterpolator.cxx diff --git a/Filtering/vtkAbstractImageInterpolator.h b/Imaging/Core/vtkAbstractImageInterpolator.h similarity index 100% rename from Filtering/vtkAbstractImageInterpolator.h rename to Imaging/Core/vtkAbstractImageInterpolator.h diff --git a/Imaging/vtkExtractVOI.cxx b/Imaging/Core/vtkExtractVOI.cxx similarity index 100% rename from Imaging/vtkExtractVOI.cxx rename to Imaging/Core/vtkExtractVOI.cxx diff --git a/Imaging/vtkExtractVOI.h b/Imaging/Core/vtkExtractVOI.h similarity index 100% rename from Imaging/vtkExtractVOI.h rename to Imaging/Core/vtkExtractVOI.h diff --git a/Imaging/vtkImageAppend.cxx b/Imaging/Core/vtkImageAppend.cxx similarity index 100% rename from Imaging/vtkImageAppend.cxx rename to Imaging/Core/vtkImageAppend.cxx diff --git a/Imaging/vtkImageAppend.h b/Imaging/Core/vtkImageAppend.h similarity index 100% rename from Imaging/vtkImageAppend.h rename to Imaging/Core/vtkImageAppend.h diff --git a/Imaging/vtkImageAppendComponents.cxx b/Imaging/Core/vtkImageAppendComponents.cxx similarity index 100% rename from Imaging/vtkImageAppendComponents.cxx rename to Imaging/Core/vtkImageAppendComponents.cxx diff --git a/Imaging/vtkImageAppendComponents.h b/Imaging/Core/vtkImageAppendComponents.h similarity index 100% rename from Imaging/vtkImageAppendComponents.h rename to Imaging/Core/vtkImageAppendComponents.h diff --git a/Imaging/vtkImageBSplineCoefficients.cxx b/Imaging/Core/vtkImageBSplineCoefficients.cxx similarity index 100% rename from Imaging/vtkImageBSplineCoefficients.cxx rename to Imaging/Core/vtkImageBSplineCoefficients.cxx diff --git a/Imaging/vtkImageBSplineCoefficients.h b/Imaging/Core/vtkImageBSplineCoefficients.h similarity index 100% rename from Imaging/vtkImageBSplineCoefficients.h rename to Imaging/Core/vtkImageBSplineCoefficients.h diff --git a/Filtering/vtkImageBSplineInternals.cxx b/Imaging/Core/vtkImageBSplineInternals.cxx similarity index 100% rename from Filtering/vtkImageBSplineInternals.cxx rename to Imaging/Core/vtkImageBSplineInternals.cxx diff --git a/Filtering/vtkImageBSplineInternals.h b/Imaging/Core/vtkImageBSplineInternals.h similarity index 100% rename from Filtering/vtkImageBSplineInternals.h rename to Imaging/Core/vtkImageBSplineInternals.h diff --git a/Filtering/vtkImageBSplineInterpolator.cxx b/Imaging/Core/vtkImageBSplineInterpolator.cxx similarity index 100% rename from Filtering/vtkImageBSplineInterpolator.cxx rename to Imaging/Core/vtkImageBSplineInterpolator.cxx diff --git a/Filtering/vtkImageBSplineInterpolator.h b/Imaging/Core/vtkImageBSplineInterpolator.h similarity index 100% rename from Filtering/vtkImageBSplineInterpolator.h rename to Imaging/Core/vtkImageBSplineInterpolator.h diff --git a/Imaging/vtkImageBlend.cxx b/Imaging/Core/vtkImageBlend.cxx similarity index 100% rename from Imaging/vtkImageBlend.cxx rename to Imaging/Core/vtkImageBlend.cxx diff --git a/Imaging/vtkImageBlend.h b/Imaging/Core/vtkImageBlend.h similarity index 100% rename from Imaging/vtkImageBlend.h rename to Imaging/Core/vtkImageBlend.h diff --git a/Imaging/vtkImageCacheFilter.cxx b/Imaging/Core/vtkImageCacheFilter.cxx similarity index 100% rename from Imaging/vtkImageCacheFilter.cxx rename to Imaging/Core/vtkImageCacheFilter.cxx diff --git a/Imaging/vtkImageCacheFilter.h b/Imaging/Core/vtkImageCacheFilter.h similarity index 100% rename from Imaging/vtkImageCacheFilter.h rename to Imaging/Core/vtkImageCacheFilter.h diff --git a/Imaging/vtkImageCast.cxx b/Imaging/Core/vtkImageCast.cxx similarity index 100% rename from Imaging/vtkImageCast.cxx rename to Imaging/Core/vtkImageCast.cxx diff --git a/Imaging/vtkImageCast.h b/Imaging/Core/vtkImageCast.h similarity index 100% rename from Imaging/vtkImageCast.h rename to Imaging/Core/vtkImageCast.h diff --git a/Imaging/vtkImageChangeInformation.cxx b/Imaging/Core/vtkImageChangeInformation.cxx similarity index 100% rename from Imaging/vtkImageChangeInformation.cxx rename to Imaging/Core/vtkImageChangeInformation.cxx diff --git a/Imaging/vtkImageChangeInformation.h b/Imaging/Core/vtkImageChangeInformation.h similarity index 100% rename from Imaging/vtkImageChangeInformation.h rename to Imaging/Core/vtkImageChangeInformation.h diff --git a/Imaging/vtkImageClip.cxx b/Imaging/Core/vtkImageClip.cxx similarity index 100% rename from Imaging/vtkImageClip.cxx rename to Imaging/Core/vtkImageClip.cxx diff --git a/Imaging/vtkImageClip.h b/Imaging/Core/vtkImageClip.h similarity index 100% rename from Imaging/vtkImageClip.h rename to Imaging/Core/vtkImageClip.h diff --git a/Imaging/vtkImageConstantPad.cxx b/Imaging/Core/vtkImageConstantPad.cxx similarity index 100% rename from Imaging/vtkImageConstantPad.cxx rename to Imaging/Core/vtkImageConstantPad.cxx diff --git a/Imaging/vtkImageConstantPad.h b/Imaging/Core/vtkImageConstantPad.h similarity index 100% rename from Imaging/vtkImageConstantPad.h rename to Imaging/Core/vtkImageConstantPad.h diff --git a/Imaging/vtkImageDataStreamer.cxx b/Imaging/Core/vtkImageDataStreamer.cxx similarity index 100% rename from Imaging/vtkImageDataStreamer.cxx rename to Imaging/Core/vtkImageDataStreamer.cxx diff --git a/Imaging/vtkImageDataStreamer.h b/Imaging/Core/vtkImageDataStreamer.h similarity index 100% rename from Imaging/vtkImageDataStreamer.h rename to Imaging/Core/vtkImageDataStreamer.h diff --git a/Imaging/vtkImageDecomposeFilter.cxx b/Imaging/Core/vtkImageDecomposeFilter.cxx similarity index 100% rename from Imaging/vtkImageDecomposeFilter.cxx rename to Imaging/Core/vtkImageDecomposeFilter.cxx diff --git a/Imaging/vtkImageDecomposeFilter.h b/Imaging/Core/vtkImageDecomposeFilter.h similarity index 100% rename from Imaging/vtkImageDecomposeFilter.h rename to Imaging/Core/vtkImageDecomposeFilter.h diff --git a/Imaging/vtkImageDifference.cxx b/Imaging/Core/vtkImageDifference.cxx similarity index 100% rename from Imaging/vtkImageDifference.cxx rename to Imaging/Core/vtkImageDifference.cxx diff --git a/Imaging/vtkImageDifference.h b/Imaging/Core/vtkImageDifference.h similarity index 100% rename from Imaging/vtkImageDifference.h rename to Imaging/Core/vtkImageDifference.h diff --git a/Imaging/vtkImageExtractComponents.cxx b/Imaging/Core/vtkImageExtractComponents.cxx similarity index 100% rename from Imaging/vtkImageExtractComponents.cxx rename to Imaging/Core/vtkImageExtractComponents.cxx diff --git a/Imaging/vtkImageExtractComponents.h b/Imaging/Core/vtkImageExtractComponents.h similarity index 100% rename from Imaging/vtkImageExtractComponents.h rename to Imaging/Core/vtkImageExtractComponents.h diff --git a/Filtering/vtkImageInterpolator.cxx b/Imaging/Core/vtkImageInterpolator.cxx similarity index 100% rename from Filtering/vtkImageInterpolator.cxx rename to Imaging/Core/vtkImageInterpolator.cxx diff --git a/Filtering/vtkImageInterpolator.h b/Imaging/Core/vtkImageInterpolator.h similarity index 100% rename from Filtering/vtkImageInterpolator.h rename to Imaging/Core/vtkImageInterpolator.h diff --git a/Filtering/vtkImageInterpolatorInternals.h b/Imaging/Core/vtkImageInterpolatorInternals.h similarity index 100% rename from Filtering/vtkImageInterpolatorInternals.h rename to Imaging/Core/vtkImageInterpolatorInternals.h diff --git a/Imaging/vtkImageIterateFilter.cxx b/Imaging/Core/vtkImageIterateFilter.cxx similarity index 100% rename from Imaging/vtkImageIterateFilter.cxx rename to Imaging/Core/vtkImageIterateFilter.cxx diff --git a/Imaging/vtkImageIterateFilter.h b/Imaging/Core/vtkImageIterateFilter.h similarity index 100% rename from Imaging/vtkImageIterateFilter.h rename to Imaging/Core/vtkImageIterateFilter.h diff --git a/Imaging/vtkImageMagnify.cxx b/Imaging/Core/vtkImageMagnify.cxx similarity index 100% rename from Imaging/vtkImageMagnify.cxx rename to Imaging/Core/vtkImageMagnify.cxx diff --git a/Imaging/vtkImageMagnify.h b/Imaging/Core/vtkImageMagnify.h similarity index 100% rename from Imaging/vtkImageMagnify.h rename to Imaging/Core/vtkImageMagnify.h diff --git a/Imaging/vtkImageMapToColors.cxx b/Imaging/Core/vtkImageMapToColors.cxx similarity index 100% rename from Imaging/vtkImageMapToColors.cxx rename to Imaging/Core/vtkImageMapToColors.cxx diff --git a/Imaging/vtkImageMapToColors.h b/Imaging/Core/vtkImageMapToColors.h similarity index 100% rename from Imaging/vtkImageMapToColors.h rename to Imaging/Core/vtkImageMapToColors.h diff --git a/Imaging/vtkImageMask.cxx b/Imaging/Core/vtkImageMask.cxx similarity index 100% rename from Imaging/vtkImageMask.cxx rename to Imaging/Core/vtkImageMask.cxx diff --git a/Imaging/vtkImageMask.h b/Imaging/Core/vtkImageMask.h similarity index 100% rename from Imaging/vtkImageMask.h rename to Imaging/Core/vtkImageMask.h diff --git a/Imaging/vtkImageMaskBits.cxx b/Imaging/Core/vtkImageMaskBits.cxx similarity index 100% rename from Imaging/vtkImageMaskBits.cxx rename to Imaging/Core/vtkImageMaskBits.cxx diff --git a/Imaging/vtkImageMaskBits.h b/Imaging/Core/vtkImageMaskBits.h similarity index 100% rename from Imaging/vtkImageMaskBits.h rename to Imaging/Core/vtkImageMaskBits.h diff --git a/Imaging/vtkImageMirrorPad.cxx b/Imaging/Core/vtkImageMirrorPad.cxx similarity index 100% rename from Imaging/vtkImageMirrorPad.cxx rename to Imaging/Core/vtkImageMirrorPad.cxx diff --git a/Imaging/vtkImageMirrorPad.h b/Imaging/Core/vtkImageMirrorPad.h similarity index 100% rename from Imaging/vtkImageMirrorPad.h rename to Imaging/Core/vtkImageMirrorPad.h diff --git a/Imaging/vtkImagePadFilter.cxx b/Imaging/Core/vtkImagePadFilter.cxx similarity index 100% rename from Imaging/vtkImagePadFilter.cxx rename to Imaging/Core/vtkImagePadFilter.cxx diff --git a/Imaging/vtkImagePadFilter.h b/Imaging/Core/vtkImagePadFilter.h similarity index 100% rename from Imaging/vtkImagePadFilter.h rename to Imaging/Core/vtkImagePadFilter.h diff --git a/Imaging/vtkImagePermute.cxx b/Imaging/Core/vtkImagePermute.cxx similarity index 100% rename from Imaging/vtkImagePermute.cxx rename to Imaging/Core/vtkImagePermute.cxx diff --git a/Imaging/vtkImagePermute.h b/Imaging/Core/vtkImagePermute.h similarity index 100% rename from Imaging/vtkImagePermute.h rename to Imaging/Core/vtkImagePermute.h diff --git a/Imaging/vtkImageResample.cxx b/Imaging/Core/vtkImageResample.cxx similarity index 100% rename from Imaging/vtkImageResample.cxx rename to Imaging/Core/vtkImageResample.cxx diff --git a/Imaging/vtkImageResample.h b/Imaging/Core/vtkImageResample.h similarity index 100% rename from Imaging/vtkImageResample.h rename to Imaging/Core/vtkImageResample.h diff --git a/Imaging/vtkImageResize.cxx b/Imaging/Core/vtkImageResize.cxx similarity index 100% rename from Imaging/vtkImageResize.cxx rename to Imaging/Core/vtkImageResize.cxx diff --git a/Imaging/vtkImageResize.h b/Imaging/Core/vtkImageResize.h similarity index 100% rename from Imaging/vtkImageResize.h rename to Imaging/Core/vtkImageResize.h diff --git a/Imaging/vtkImageReslice.cxx b/Imaging/Core/vtkImageReslice.cxx similarity index 100% rename from Imaging/vtkImageReslice.cxx rename to Imaging/Core/vtkImageReslice.cxx diff --git a/Imaging/vtkImageReslice.h b/Imaging/Core/vtkImageReslice.h similarity index 100% rename from Imaging/vtkImageReslice.h rename to Imaging/Core/vtkImageReslice.h diff --git a/Imaging/vtkImageResliceToColors.cxx b/Imaging/Core/vtkImageResliceToColors.cxx similarity index 100% rename from Imaging/vtkImageResliceToColors.cxx rename to Imaging/Core/vtkImageResliceToColors.cxx diff --git a/Imaging/vtkImageResliceToColors.h b/Imaging/Core/vtkImageResliceToColors.h similarity index 100% rename from Imaging/vtkImageResliceToColors.h rename to Imaging/Core/vtkImageResliceToColors.h diff --git a/Imaging/vtkImageShiftScale.cxx b/Imaging/Core/vtkImageShiftScale.cxx similarity index 100% rename from Imaging/vtkImageShiftScale.cxx rename to Imaging/Core/vtkImageShiftScale.cxx diff --git a/Imaging/vtkImageShiftScale.h b/Imaging/Core/vtkImageShiftScale.h similarity index 100% rename from Imaging/vtkImageShiftScale.h rename to Imaging/Core/vtkImageShiftScale.h diff --git a/Imaging/vtkImageShrink3D.cxx b/Imaging/Core/vtkImageShrink3D.cxx similarity index 100% rename from Imaging/vtkImageShrink3D.cxx rename to Imaging/Core/vtkImageShrink3D.cxx diff --git a/Imaging/vtkImageShrink3D.h b/Imaging/Core/vtkImageShrink3D.h similarity index 100% rename from Imaging/vtkImageShrink3D.h rename to Imaging/Core/vtkImageShrink3D.h diff --git a/Filtering/vtkImageSincInterpolator.cxx b/Imaging/Core/vtkImageSincInterpolator.cxx similarity index 100% rename from Filtering/vtkImageSincInterpolator.cxx rename to Imaging/Core/vtkImageSincInterpolator.cxx diff --git a/Filtering/vtkImageSincInterpolator.h b/Imaging/Core/vtkImageSincInterpolator.h similarity index 100% rename from Filtering/vtkImageSincInterpolator.h rename to Imaging/Core/vtkImageSincInterpolator.h diff --git a/Imaging/vtkImageStencilAlgorithm.cxx b/Imaging/Core/vtkImageStencilAlgorithm.cxx similarity index 100% rename from Imaging/vtkImageStencilAlgorithm.cxx rename to Imaging/Core/vtkImageStencilAlgorithm.cxx diff --git a/Imaging/vtkImageStencilAlgorithm.h b/Imaging/Core/vtkImageStencilAlgorithm.h similarity index 100% rename from Imaging/vtkImageStencilAlgorithm.h rename to Imaging/Core/vtkImageStencilAlgorithm.h diff --git a/Imaging/vtkImageStencilData.cxx b/Imaging/Core/vtkImageStencilData.cxx similarity index 100% rename from Imaging/vtkImageStencilData.cxx rename to Imaging/Core/vtkImageStencilData.cxx diff --git a/Imaging/vtkImageStencilData.h b/Imaging/Core/vtkImageStencilData.h similarity index 100% rename from Imaging/vtkImageStencilData.h rename to Imaging/Core/vtkImageStencilData.h diff --git a/Imaging/vtkImageStencilIterator.cxx b/Imaging/Core/vtkImageStencilIterator.cxx similarity index 100% rename from Imaging/vtkImageStencilIterator.cxx rename to Imaging/Core/vtkImageStencilIterator.cxx diff --git a/Imaging/vtkImageStencilIterator.h b/Imaging/Core/vtkImageStencilIterator.h similarity index 100% rename from Imaging/vtkImageStencilIterator.h rename to Imaging/Core/vtkImageStencilIterator.h diff --git a/Imaging/vtkImageStencilIterator.txx b/Imaging/Core/vtkImageStencilIterator.txx similarity index 100% rename from Imaging/vtkImageStencilIterator.txx rename to Imaging/Core/vtkImageStencilIterator.txx diff --git a/Imaging/vtkImageStencilSource.cxx b/Imaging/Core/vtkImageStencilSource.cxx similarity index 100% rename from Imaging/vtkImageStencilSource.cxx rename to Imaging/Core/vtkImageStencilSource.cxx diff --git a/Imaging/vtkImageStencilSource.h b/Imaging/Core/vtkImageStencilSource.h similarity index 100% rename from Imaging/vtkImageStencilSource.h rename to Imaging/Core/vtkImageStencilSource.h diff --git a/Imaging/vtkImageThreshold.cxx b/Imaging/Core/vtkImageThreshold.cxx similarity index 100% rename from Imaging/vtkImageThreshold.cxx rename to Imaging/Core/vtkImageThreshold.cxx diff --git a/Imaging/vtkImageThreshold.h b/Imaging/Core/vtkImageThreshold.h similarity index 100% rename from Imaging/vtkImageThreshold.h rename to Imaging/Core/vtkImageThreshold.h diff --git a/Imaging/vtkImageTranslateExtent.cxx b/Imaging/Core/vtkImageTranslateExtent.cxx similarity index 100% rename from Imaging/vtkImageTranslateExtent.cxx rename to Imaging/Core/vtkImageTranslateExtent.cxx diff --git a/Imaging/vtkImageTranslateExtent.h b/Imaging/Core/vtkImageTranslateExtent.h similarity index 100% rename from Imaging/vtkImageTranslateExtent.h rename to Imaging/Core/vtkImageTranslateExtent.h diff --git a/Imaging/vtkImageWrapPad.cxx b/Imaging/Core/vtkImageWrapPad.cxx similarity index 100% rename from Imaging/vtkImageWrapPad.cxx rename to Imaging/Core/vtkImageWrapPad.cxx diff --git a/Imaging/vtkImageWrapPad.h b/Imaging/Core/vtkImageWrapPad.h similarity index 100% rename from Imaging/vtkImageWrapPad.h rename to Imaging/Core/vtkImageWrapPad.h diff --git a/Imaging/vtkRTAnalyticSource.cxx b/Imaging/Core/vtkRTAnalyticSource.cxx similarity index 100% rename from Imaging/vtkRTAnalyticSource.cxx rename to Imaging/Core/vtkRTAnalyticSource.cxx diff --git a/Imaging/vtkRTAnalyticSource.h b/Imaging/Core/vtkRTAnalyticSource.h similarity index 100% rename from Imaging/vtkRTAnalyticSource.h rename to Imaging/Core/vtkRTAnalyticSource.h diff --git a/Imaging/vtkImageFFT.cxx b/Imaging/Fourier/vtkImageFFT.cxx similarity index 100% rename from Imaging/vtkImageFFT.cxx rename to Imaging/Fourier/vtkImageFFT.cxx diff --git a/Imaging/vtkImageFFT.h b/Imaging/Fourier/vtkImageFFT.h similarity index 100% rename from Imaging/vtkImageFFT.h rename to Imaging/Fourier/vtkImageFFT.h diff --git a/Imaging/vtkImageFlip.cxx b/Imaging/Fourier/vtkImageFlip.cxx similarity index 100% rename from Imaging/vtkImageFlip.cxx rename to Imaging/Fourier/vtkImageFlip.cxx diff --git a/Imaging/vtkImageFlip.h b/Imaging/Fourier/vtkImageFlip.h similarity index 100% rename from Imaging/vtkImageFlip.h rename to Imaging/Fourier/vtkImageFlip.h diff --git a/Imaging/vtkImageFourierCenter.cxx b/Imaging/Fourier/vtkImageFourierCenter.cxx similarity index 100% rename from Imaging/vtkImageFourierCenter.cxx rename to Imaging/Fourier/vtkImageFourierCenter.cxx diff --git a/Imaging/vtkImageFourierCenter.h b/Imaging/Fourier/vtkImageFourierCenter.h similarity index 100% rename from Imaging/vtkImageFourierCenter.h rename to Imaging/Fourier/vtkImageFourierCenter.h diff --git a/Imaging/vtkImageFourierFilter.cxx b/Imaging/Fourier/vtkImageFourierFilter.cxx similarity index 100% rename from Imaging/vtkImageFourierFilter.cxx rename to Imaging/Fourier/vtkImageFourierFilter.cxx diff --git a/Imaging/vtkImageFourierFilter.h b/Imaging/Fourier/vtkImageFourierFilter.h similarity index 100% rename from Imaging/vtkImageFourierFilter.h rename to Imaging/Fourier/vtkImageFourierFilter.h diff --git a/Imaging/vtkImageRFFT.cxx b/Imaging/Fourier/vtkImageRFFT.cxx similarity index 100% rename from Imaging/vtkImageRFFT.cxx rename to Imaging/Fourier/vtkImageRFFT.cxx diff --git a/Imaging/vtkImageRFFT.h b/Imaging/Fourier/vtkImageRFFT.h similarity index 100% rename from Imaging/vtkImageRFFT.h rename to Imaging/Fourier/vtkImageRFFT.h diff --git a/Imaging/vtkImageAnisotropicDiffusion2D.cxx b/Imaging/General/vtkImageAnisotropicDiffusion2D.cxx similarity index 100% rename from Imaging/vtkImageAnisotropicDiffusion2D.cxx rename to Imaging/General/vtkImageAnisotropicDiffusion2D.cxx diff --git a/Imaging/vtkImageAnisotropicDiffusion2D.h b/Imaging/General/vtkImageAnisotropicDiffusion2D.h similarity index 100% rename from Imaging/vtkImageAnisotropicDiffusion2D.h rename to Imaging/General/vtkImageAnisotropicDiffusion2D.h diff --git a/Imaging/vtkImageAnisotropicDiffusion3D.cxx b/Imaging/General/vtkImageAnisotropicDiffusion3D.cxx similarity index 100% rename from Imaging/vtkImageAnisotropicDiffusion3D.cxx rename to Imaging/General/vtkImageAnisotropicDiffusion3D.cxx diff --git a/Imaging/vtkImageAnisotropicDiffusion3D.h b/Imaging/General/vtkImageAnisotropicDiffusion3D.h similarity index 100% rename from Imaging/vtkImageAnisotropicDiffusion3D.h rename to Imaging/General/vtkImageAnisotropicDiffusion3D.h diff --git a/Imaging/vtkImageButterworthHighPass.cxx b/Imaging/General/vtkImageButterworthHighPass.cxx similarity index 100% rename from Imaging/vtkImageButterworthHighPass.cxx rename to Imaging/General/vtkImageButterworthHighPass.cxx diff --git a/Imaging/vtkImageButterworthHighPass.h b/Imaging/General/vtkImageButterworthHighPass.h similarity index 100% rename from Imaging/vtkImageButterworthHighPass.h rename to Imaging/General/vtkImageButterworthHighPass.h diff --git a/Imaging/vtkImageButterworthLowPass.cxx b/Imaging/General/vtkImageButterworthLowPass.cxx similarity index 100% rename from Imaging/vtkImageButterworthLowPass.cxx rename to Imaging/General/vtkImageButterworthLowPass.cxx diff --git a/Imaging/vtkImageButterworthLowPass.h b/Imaging/General/vtkImageButterworthLowPass.h similarity index 100% rename from Imaging/vtkImageButterworthLowPass.h rename to Imaging/General/vtkImageButterworthLowPass.h diff --git a/Imaging/vtkImageCheckerboard.cxx b/Imaging/General/vtkImageCheckerboard.cxx similarity index 100% rename from Imaging/vtkImageCheckerboard.cxx rename to Imaging/General/vtkImageCheckerboard.cxx diff --git a/Imaging/vtkImageCheckerboard.h b/Imaging/General/vtkImageCheckerboard.h similarity index 100% rename from Imaging/vtkImageCheckerboard.h rename to Imaging/General/vtkImageCheckerboard.h diff --git a/Imaging/vtkImageCityBlockDistance.cxx b/Imaging/General/vtkImageCityBlockDistance.cxx similarity index 100% rename from Imaging/vtkImageCityBlockDistance.cxx rename to Imaging/General/vtkImageCityBlockDistance.cxx diff --git a/Imaging/vtkImageCityBlockDistance.h b/Imaging/General/vtkImageCityBlockDistance.h similarity index 100% rename from Imaging/vtkImageCityBlockDistance.h rename to Imaging/General/vtkImageCityBlockDistance.h diff --git a/Imaging/vtkImageConvolve.cxx b/Imaging/General/vtkImageConvolve.cxx similarity index 100% rename from Imaging/vtkImageConvolve.cxx rename to Imaging/General/vtkImageConvolve.cxx diff --git a/Imaging/vtkImageConvolve.h b/Imaging/General/vtkImageConvolve.h similarity index 100% rename from Imaging/vtkImageConvolve.h rename to Imaging/General/vtkImageConvolve.h diff --git a/Imaging/vtkImageCorrelation.cxx b/Imaging/General/vtkImageCorrelation.cxx similarity index 100% rename from Imaging/vtkImageCorrelation.cxx rename to Imaging/General/vtkImageCorrelation.cxx diff --git a/Imaging/vtkImageCorrelation.h b/Imaging/General/vtkImageCorrelation.h similarity index 100% rename from Imaging/vtkImageCorrelation.h rename to Imaging/General/vtkImageCorrelation.h diff --git a/Imaging/vtkImageEuclideanDistance.cxx b/Imaging/General/vtkImageEuclideanDistance.cxx similarity index 100% rename from Imaging/vtkImageEuclideanDistance.cxx rename to Imaging/General/vtkImageEuclideanDistance.cxx diff --git a/Imaging/vtkImageEuclideanDistance.h b/Imaging/General/vtkImageEuclideanDistance.h similarity index 100% rename from Imaging/vtkImageEuclideanDistance.h rename to Imaging/General/vtkImageEuclideanDistance.h diff --git a/Imaging/vtkImageEuclideanToPolar.cxx b/Imaging/General/vtkImageEuclideanToPolar.cxx similarity index 100% rename from Imaging/vtkImageEuclideanToPolar.cxx rename to Imaging/General/vtkImageEuclideanToPolar.cxx diff --git a/Imaging/vtkImageEuclideanToPolar.h b/Imaging/General/vtkImageEuclideanToPolar.h similarity index 100% rename from Imaging/vtkImageEuclideanToPolar.h rename to Imaging/General/vtkImageEuclideanToPolar.h diff --git a/Imaging/vtkImageGaussianSmooth.cxx b/Imaging/General/vtkImageGaussianSmooth.cxx similarity index 100% rename from Imaging/vtkImageGaussianSmooth.cxx rename to Imaging/General/vtkImageGaussianSmooth.cxx diff --git a/Imaging/vtkImageGaussianSmooth.h b/Imaging/General/vtkImageGaussianSmooth.h similarity index 100% rename from Imaging/vtkImageGaussianSmooth.h rename to Imaging/General/vtkImageGaussianSmooth.h diff --git a/Imaging/vtkImageGradient.cxx b/Imaging/General/vtkImageGradient.cxx similarity index 100% rename from Imaging/vtkImageGradient.cxx rename to Imaging/General/vtkImageGradient.cxx diff --git a/Imaging/vtkImageGradient.h b/Imaging/General/vtkImageGradient.h similarity index 100% rename from Imaging/vtkImageGradient.h rename to Imaging/General/vtkImageGradient.h diff --git a/Imaging/vtkImageGradientMagnitude.cxx b/Imaging/General/vtkImageGradientMagnitude.cxx similarity index 100% rename from Imaging/vtkImageGradientMagnitude.cxx rename to Imaging/General/vtkImageGradientMagnitude.cxx diff --git a/Imaging/vtkImageGradientMagnitude.h b/Imaging/General/vtkImageGradientMagnitude.h similarity index 100% rename from Imaging/vtkImageGradientMagnitude.h rename to Imaging/General/vtkImageGradientMagnitude.h diff --git a/Imaging/vtkImageHybridMedian2D.cxx b/Imaging/General/vtkImageHybridMedian2D.cxx similarity index 100% rename from Imaging/vtkImageHybridMedian2D.cxx rename to Imaging/General/vtkImageHybridMedian2D.cxx diff --git a/Imaging/vtkImageHybridMedian2D.h b/Imaging/General/vtkImageHybridMedian2D.h similarity index 100% rename from Imaging/vtkImageHybridMedian2D.h rename to Imaging/General/vtkImageHybridMedian2D.h diff --git a/Imaging/vtkImageIdealHighPass.cxx b/Imaging/General/vtkImageIdealHighPass.cxx similarity index 100% rename from Imaging/vtkImageIdealHighPass.cxx rename to Imaging/General/vtkImageIdealHighPass.cxx diff --git a/Imaging/vtkImageIdealHighPass.h b/Imaging/General/vtkImageIdealHighPass.h similarity index 100% rename from Imaging/vtkImageIdealHighPass.h rename to Imaging/General/vtkImageIdealHighPass.h diff --git a/Imaging/vtkImageIdealLowPass.cxx b/Imaging/General/vtkImageIdealLowPass.cxx similarity index 100% rename from Imaging/vtkImageIdealLowPass.cxx rename to Imaging/General/vtkImageIdealLowPass.cxx diff --git a/Imaging/vtkImageIdealLowPass.h b/Imaging/General/vtkImageIdealLowPass.h similarity index 100% rename from Imaging/vtkImageIdealLowPass.h rename to Imaging/General/vtkImageIdealLowPass.h diff --git a/Imaging/vtkImageLaplacian.cxx b/Imaging/General/vtkImageLaplacian.cxx similarity index 100% rename from Imaging/vtkImageLaplacian.cxx rename to Imaging/General/vtkImageLaplacian.cxx diff --git a/Imaging/vtkImageLaplacian.h b/Imaging/General/vtkImageLaplacian.h similarity index 100% rename from Imaging/vtkImageLaplacian.h rename to Imaging/General/vtkImageLaplacian.h diff --git a/Imaging/vtkImageMedian3D.cxx b/Imaging/General/vtkImageMedian3D.cxx similarity index 100% rename from Imaging/vtkImageMedian3D.cxx rename to Imaging/General/vtkImageMedian3D.cxx diff --git a/Imaging/vtkImageMedian3D.h b/Imaging/General/vtkImageMedian3D.h similarity index 100% rename from Imaging/vtkImageMedian3D.h rename to Imaging/General/vtkImageMedian3D.h diff --git a/Imaging/vtkImageNormalize.cxx b/Imaging/General/vtkImageNormalize.cxx similarity index 100% rename from Imaging/vtkImageNormalize.cxx rename to Imaging/General/vtkImageNormalize.cxx diff --git a/Imaging/vtkImageNormalize.h b/Imaging/General/vtkImageNormalize.h similarity index 100% rename from Imaging/vtkImageNormalize.h rename to Imaging/General/vtkImageNormalize.h diff --git a/Imaging/vtkImageRange3D.cxx b/Imaging/General/vtkImageRange3D.cxx similarity index 100% rename from Imaging/vtkImageRange3D.cxx rename to Imaging/General/vtkImageRange3D.cxx diff --git a/Imaging/vtkImageRange3D.h b/Imaging/General/vtkImageRange3D.h similarity index 100% rename from Imaging/vtkImageRange3D.h rename to Imaging/General/vtkImageRange3D.h diff --git a/Imaging/vtkImageSeparableConvolution.cxx b/Imaging/General/vtkImageSeparableConvolution.cxx similarity index 100% rename from Imaging/vtkImageSeparableConvolution.cxx rename to Imaging/General/vtkImageSeparableConvolution.cxx diff --git a/Imaging/vtkImageSeparableConvolution.h b/Imaging/General/vtkImageSeparableConvolution.h similarity index 100% rename from Imaging/vtkImageSeparableConvolution.h rename to Imaging/General/vtkImageSeparableConvolution.h diff --git a/Imaging/vtkImageSlab.cxx b/Imaging/General/vtkImageSlab.cxx similarity index 100% rename from Imaging/vtkImageSlab.cxx rename to Imaging/General/vtkImageSlab.cxx diff --git a/Imaging/vtkImageSlab.h b/Imaging/General/vtkImageSlab.h similarity index 100% rename from Imaging/vtkImageSlab.h rename to Imaging/General/vtkImageSlab.h diff --git a/Imaging/vtkImageSlabReslice.cxx b/Imaging/General/vtkImageSlabReslice.cxx similarity index 100% rename from Imaging/vtkImageSlabReslice.cxx rename to Imaging/General/vtkImageSlabReslice.cxx diff --git a/Imaging/vtkImageSlabReslice.h b/Imaging/General/vtkImageSlabReslice.h similarity index 100% rename from Imaging/vtkImageSlabReslice.h rename to Imaging/General/vtkImageSlabReslice.h diff --git a/Imaging/vtkImageSobel2D.cxx b/Imaging/General/vtkImageSobel2D.cxx similarity index 100% rename from Imaging/vtkImageSobel2D.cxx rename to Imaging/General/vtkImageSobel2D.cxx diff --git a/Imaging/vtkImageSobel2D.h b/Imaging/General/vtkImageSobel2D.h similarity index 100% rename from Imaging/vtkImageSobel2D.h rename to Imaging/General/vtkImageSobel2D.h diff --git a/Imaging/vtkImageSobel3D.cxx b/Imaging/General/vtkImageSobel3D.cxx similarity index 100% rename from Imaging/vtkImageSobel3D.cxx rename to Imaging/General/vtkImageSobel3D.cxx diff --git a/Imaging/vtkImageSobel3D.h b/Imaging/General/vtkImageSobel3D.h similarity index 100% rename from Imaging/vtkImageSobel3D.h rename to Imaging/General/vtkImageSobel3D.h diff --git a/Imaging/vtkImageSpatialAlgorithm.cxx b/Imaging/General/vtkImageSpatialAlgorithm.cxx similarity index 100% rename from Imaging/vtkImageSpatialAlgorithm.cxx rename to Imaging/General/vtkImageSpatialAlgorithm.cxx diff --git a/Imaging/vtkImageSpatialAlgorithm.h b/Imaging/General/vtkImageSpatialAlgorithm.h similarity index 100% rename from Imaging/vtkImageSpatialAlgorithm.h rename to Imaging/General/vtkImageSpatialAlgorithm.h diff --git a/Imaging/vtkImageVariance3D.cxx b/Imaging/General/vtkImageVariance3D.cxx similarity index 100% rename from Imaging/vtkImageVariance3D.cxx rename to Imaging/General/vtkImageVariance3D.cxx diff --git a/Imaging/vtkImageVariance3D.h b/Imaging/General/vtkImageVariance3D.h similarity index 100% rename from Imaging/vtkImageVariance3D.h rename to Imaging/General/vtkImageVariance3D.h diff --git a/Imaging/vtkSimpleImageFilterExample.cxx b/Imaging/General/vtkSimpleImageFilterExample.cxx similarity index 100% rename from Imaging/vtkSimpleImageFilterExample.cxx rename to Imaging/General/vtkSimpleImageFilterExample.cxx diff --git a/Imaging/vtkSimpleImageFilterExample.h b/Imaging/General/vtkSimpleImageFilterExample.h similarity index 100% rename from Imaging/vtkSimpleImageFilterExample.h rename to Imaging/General/vtkSimpleImageFilterExample.h diff --git a/Graphics/Testing/Tcl/iceCream.tcl b/Imaging/Hybrid/Testing/Tcl/iceCream.tcl similarity index 100% rename from Graphics/Testing/Tcl/iceCream.tcl rename to Imaging/Hybrid/Testing/Tcl/iceCream.tcl diff --git a/Graphics/Testing/Tcl/shepards.tcl b/Imaging/Hybrid/Testing/Tcl/shepards.tcl similarity index 100% rename from Graphics/Testing/Tcl/shepards.tcl rename to Imaging/Hybrid/Testing/Tcl/shepards.tcl diff --git a/Graphics/Testing/Tcl/triangularTexture.tcl b/Imaging/Hybrid/Testing/Tcl/triangularTexture.tcl similarity index 100% rename from Graphics/Testing/Tcl/triangularTexture.tcl rename to Imaging/Hybrid/Testing/Tcl/triangularTexture.tcl diff --git a/Imaging/vtkBooleanTexture.cxx b/Imaging/Hybrid/vtkBooleanTexture.cxx similarity index 100% rename from Imaging/vtkBooleanTexture.cxx rename to Imaging/Hybrid/vtkBooleanTexture.cxx diff --git a/Imaging/vtkBooleanTexture.h b/Imaging/Hybrid/vtkBooleanTexture.h similarity index 100% rename from Imaging/vtkBooleanTexture.h rename to Imaging/Hybrid/vtkBooleanTexture.h diff --git a/Imaging/vtkFastSplatter.cxx b/Imaging/Hybrid/vtkFastSplatter.cxx similarity index 100% rename from Imaging/vtkFastSplatter.cxx rename to Imaging/Hybrid/vtkFastSplatter.cxx diff --git a/Imaging/vtkFastSplatter.h b/Imaging/Hybrid/vtkFastSplatter.h similarity index 100% rename from Imaging/vtkFastSplatter.h rename to Imaging/Hybrid/vtkFastSplatter.h diff --git a/Imaging/vtkGaussianSplatter.cxx b/Imaging/Hybrid/vtkGaussianSplatter.cxx similarity index 100% rename from Imaging/vtkGaussianSplatter.cxx rename to Imaging/Hybrid/vtkGaussianSplatter.cxx diff --git a/Imaging/vtkGaussianSplatter.h b/Imaging/Hybrid/vtkGaussianSplatter.h similarity index 100% rename from Imaging/vtkGaussianSplatter.h rename to Imaging/Hybrid/vtkGaussianSplatter.h diff --git a/Imaging/vtkImageCursor3D.cxx b/Imaging/Hybrid/vtkImageCursor3D.cxx similarity index 100% rename from Imaging/vtkImageCursor3D.cxx rename to Imaging/Hybrid/vtkImageCursor3D.cxx diff --git a/Imaging/vtkImageCursor3D.h b/Imaging/Hybrid/vtkImageCursor3D.h similarity index 100% rename from Imaging/vtkImageCursor3D.h rename to Imaging/Hybrid/vtkImageCursor3D.h diff --git a/Imaging/vtkImageRectilinearWipe.cxx b/Imaging/Hybrid/vtkImageRectilinearWipe.cxx similarity index 100% rename from Imaging/vtkImageRectilinearWipe.cxx rename to Imaging/Hybrid/vtkImageRectilinearWipe.cxx diff --git a/Imaging/vtkImageRectilinearWipe.h b/Imaging/Hybrid/vtkImageRectilinearWipe.h similarity index 100% rename from Imaging/vtkImageRectilinearWipe.h rename to Imaging/Hybrid/vtkImageRectilinearWipe.h diff --git a/Imaging/vtkPointLoad.cxx b/Imaging/Hybrid/vtkPointLoad.cxx similarity index 100% rename from Imaging/vtkPointLoad.cxx rename to Imaging/Hybrid/vtkPointLoad.cxx diff --git a/Imaging/vtkPointLoad.h b/Imaging/Hybrid/vtkPointLoad.h similarity index 100% rename from Imaging/vtkPointLoad.h rename to Imaging/Hybrid/vtkPointLoad.h diff --git a/Imaging/vtkSampleFunction.cxx b/Imaging/Hybrid/vtkSampleFunction.cxx similarity index 100% rename from Imaging/vtkSampleFunction.cxx rename to Imaging/Hybrid/vtkSampleFunction.cxx diff --git a/Imaging/vtkSampleFunction.h b/Imaging/Hybrid/vtkSampleFunction.h similarity index 100% rename from Imaging/vtkSampleFunction.h rename to Imaging/Hybrid/vtkSampleFunction.h diff --git a/Imaging/vtkShepardMethod.cxx b/Imaging/Hybrid/vtkShepardMethod.cxx similarity index 100% rename from Imaging/vtkShepardMethod.cxx rename to Imaging/Hybrid/vtkShepardMethod.cxx diff --git a/Imaging/vtkShepardMethod.h b/Imaging/Hybrid/vtkShepardMethod.h similarity index 100% rename from Imaging/vtkShepardMethod.h rename to Imaging/Hybrid/vtkShepardMethod.h diff --git a/Imaging/vtkSurfaceReconstructionFilter.cxx b/Imaging/Hybrid/vtkSurfaceReconstructionFilter.cxx similarity index 100% rename from Imaging/vtkSurfaceReconstructionFilter.cxx rename to Imaging/Hybrid/vtkSurfaceReconstructionFilter.cxx diff --git a/Imaging/vtkSurfaceReconstructionFilter.h b/Imaging/Hybrid/vtkSurfaceReconstructionFilter.h similarity index 100% rename from Imaging/vtkSurfaceReconstructionFilter.h rename to Imaging/Hybrid/vtkSurfaceReconstructionFilter.h diff --git a/Imaging/vtkTriangularTexture.cxx b/Imaging/Hybrid/vtkTriangularTexture.cxx similarity index 100% rename from Imaging/vtkTriangularTexture.cxx rename to Imaging/Hybrid/vtkTriangularTexture.cxx diff --git a/Imaging/vtkTriangularTexture.h b/Imaging/Hybrid/vtkTriangularTexture.h similarity index 100% rename from Imaging/vtkTriangularTexture.h rename to Imaging/Hybrid/vtkTriangularTexture.h diff --git a/Imaging/vtkVoxelModeller.cxx b/Imaging/Hybrid/vtkVoxelModeller.cxx similarity index 100% rename from Imaging/vtkVoxelModeller.cxx rename to Imaging/Hybrid/vtkVoxelModeller.cxx diff --git a/Imaging/vtkVoxelModeller.h b/Imaging/Hybrid/vtkVoxelModeller.h similarity index 100% rename from Imaging/vtkVoxelModeller.h rename to Imaging/Hybrid/vtkVoxelModeller.h diff --git a/Imaging/vtkImageDivergence.cxx b/Imaging/Math/vtkImageDivergence.cxx similarity index 100% rename from Imaging/vtkImageDivergence.cxx rename to Imaging/Math/vtkImageDivergence.cxx diff --git a/Imaging/vtkImageDivergence.h b/Imaging/Math/vtkImageDivergence.h similarity index 100% rename from Imaging/vtkImageDivergence.h rename to Imaging/Math/vtkImageDivergence.h diff --git a/Imaging/vtkImageDotProduct.cxx b/Imaging/Math/vtkImageDotProduct.cxx similarity index 100% rename from Imaging/vtkImageDotProduct.cxx rename to Imaging/Math/vtkImageDotProduct.cxx diff --git a/Imaging/vtkImageDotProduct.h b/Imaging/Math/vtkImageDotProduct.h similarity index 100% rename from Imaging/vtkImageDotProduct.h rename to Imaging/Math/vtkImageDotProduct.h diff --git a/Imaging/vtkImageLogarithmicScale.cxx b/Imaging/Math/vtkImageLogarithmicScale.cxx similarity index 100% rename from Imaging/vtkImageLogarithmicScale.cxx rename to Imaging/Math/vtkImageLogarithmicScale.cxx diff --git a/Imaging/vtkImageLogarithmicScale.h b/Imaging/Math/vtkImageLogarithmicScale.h similarity index 100% rename from Imaging/vtkImageLogarithmicScale.h rename to Imaging/Math/vtkImageLogarithmicScale.h diff --git a/Imaging/vtkImageLogic.cxx b/Imaging/Math/vtkImageLogic.cxx similarity index 100% rename from Imaging/vtkImageLogic.cxx rename to Imaging/Math/vtkImageLogic.cxx diff --git a/Imaging/vtkImageLogic.h b/Imaging/Math/vtkImageLogic.h similarity index 100% rename from Imaging/vtkImageLogic.h rename to Imaging/Math/vtkImageLogic.h diff --git a/Imaging/vtkImageMagnitude.cxx b/Imaging/Math/vtkImageMagnitude.cxx similarity index 100% rename from Imaging/vtkImageMagnitude.cxx rename to Imaging/Math/vtkImageMagnitude.cxx diff --git a/Imaging/vtkImageMagnitude.h b/Imaging/Math/vtkImageMagnitude.h similarity index 100% rename from Imaging/vtkImageMagnitude.h rename to Imaging/Math/vtkImageMagnitude.h diff --git a/Imaging/vtkImageMathematics.cxx b/Imaging/Math/vtkImageMathematics.cxx similarity index 100% rename from Imaging/vtkImageMathematics.cxx rename to Imaging/Math/vtkImageMathematics.cxx diff --git a/Imaging/vtkImageMathematics.h b/Imaging/Math/vtkImageMathematics.h similarity index 100% rename from Imaging/vtkImageMathematics.h rename to Imaging/Math/vtkImageMathematics.h diff --git a/Imaging/vtkImageWeightedSum.cxx b/Imaging/Math/vtkImageWeightedSum.cxx similarity index 100% rename from Imaging/vtkImageWeightedSum.cxx rename to Imaging/Math/vtkImageWeightedSum.cxx diff --git a/Imaging/vtkImageWeightedSum.h b/Imaging/Math/vtkImageWeightedSum.h similarity index 100% rename from Imaging/vtkImageWeightedSum.h rename to Imaging/Math/vtkImageWeightedSum.h diff --git a/Imaging/vtkImageConnector.cxx b/Imaging/Morphological/vtkImageConnector.cxx similarity index 100% rename from Imaging/vtkImageConnector.cxx rename to Imaging/Morphological/vtkImageConnector.cxx diff --git a/Imaging/vtkImageConnector.h b/Imaging/Morphological/vtkImageConnector.h similarity index 100% rename from Imaging/vtkImageConnector.h rename to Imaging/Morphological/vtkImageConnector.h diff --git a/Imaging/vtkImageContinuousDilate3D.cxx b/Imaging/Morphological/vtkImageContinuousDilate3D.cxx similarity index 100% rename from Imaging/vtkImageContinuousDilate3D.cxx rename to Imaging/Morphological/vtkImageContinuousDilate3D.cxx diff --git a/Imaging/vtkImageContinuousDilate3D.h b/Imaging/Morphological/vtkImageContinuousDilate3D.h similarity index 100% rename from Imaging/vtkImageContinuousDilate3D.h rename to Imaging/Morphological/vtkImageContinuousDilate3D.h diff --git a/Imaging/vtkImageContinuousErode3D.cxx b/Imaging/Morphological/vtkImageContinuousErode3D.cxx similarity index 100% rename from Imaging/vtkImageContinuousErode3D.cxx rename to Imaging/Morphological/vtkImageContinuousErode3D.cxx diff --git a/Imaging/vtkImageContinuousErode3D.h b/Imaging/Morphological/vtkImageContinuousErode3D.h similarity index 100% rename from Imaging/vtkImageContinuousErode3D.h rename to Imaging/Morphological/vtkImageContinuousErode3D.h diff --git a/Imaging/vtkImageDilateErode3D.cxx b/Imaging/Morphological/vtkImageDilateErode3D.cxx similarity index 100% rename from Imaging/vtkImageDilateErode3D.cxx rename to Imaging/Morphological/vtkImageDilateErode3D.cxx diff --git a/Imaging/vtkImageDilateErode3D.h b/Imaging/Morphological/vtkImageDilateErode3D.h similarity index 100% rename from Imaging/vtkImageDilateErode3D.h rename to Imaging/Morphological/vtkImageDilateErode3D.h diff --git a/Imaging/vtkImageIslandRemoval2D.cxx b/Imaging/Morphological/vtkImageIslandRemoval2D.cxx similarity index 100% rename from Imaging/vtkImageIslandRemoval2D.cxx rename to Imaging/Morphological/vtkImageIslandRemoval2D.cxx diff --git a/Imaging/vtkImageIslandRemoval2D.h b/Imaging/Morphological/vtkImageIslandRemoval2D.h similarity index 100% rename from Imaging/vtkImageIslandRemoval2D.h rename to Imaging/Morphological/vtkImageIslandRemoval2D.h diff --git a/Imaging/vtkImageNonMaximumSuppression.cxx b/Imaging/Morphological/vtkImageNonMaximumSuppression.cxx similarity index 100% rename from Imaging/vtkImageNonMaximumSuppression.cxx rename to Imaging/Morphological/vtkImageNonMaximumSuppression.cxx diff --git a/Imaging/vtkImageNonMaximumSuppression.h b/Imaging/Morphological/vtkImageNonMaximumSuppression.h similarity index 100% rename from Imaging/vtkImageNonMaximumSuppression.h rename to Imaging/Morphological/vtkImageNonMaximumSuppression.h diff --git a/Imaging/vtkImageOpenClose3D.cxx b/Imaging/Morphological/vtkImageOpenClose3D.cxx similarity index 100% rename from Imaging/vtkImageOpenClose3D.cxx rename to Imaging/Morphological/vtkImageOpenClose3D.cxx diff --git a/Imaging/vtkImageOpenClose3D.h b/Imaging/Morphological/vtkImageOpenClose3D.h similarity index 100% rename from Imaging/vtkImageOpenClose3D.h rename to Imaging/Morphological/vtkImageOpenClose3D.h diff --git a/Imaging/vtkImageSeedConnectivity.cxx b/Imaging/Morphological/vtkImageSeedConnectivity.cxx similarity index 100% rename from Imaging/vtkImageSeedConnectivity.cxx rename to Imaging/Morphological/vtkImageSeedConnectivity.cxx diff --git a/Imaging/vtkImageSeedConnectivity.h b/Imaging/Morphological/vtkImageSeedConnectivity.h similarity index 100% rename from Imaging/vtkImageSeedConnectivity.h rename to Imaging/Morphological/vtkImageSeedConnectivity.h diff --git a/Imaging/vtkImageSkeleton2D.cxx b/Imaging/Morphological/vtkImageSkeleton2D.cxx similarity index 100% rename from Imaging/vtkImageSkeleton2D.cxx rename to Imaging/Morphological/vtkImageSkeleton2D.cxx diff --git a/Imaging/vtkImageSkeleton2D.h b/Imaging/Morphological/vtkImageSkeleton2D.h similarity index 100% rename from Imaging/vtkImageSkeleton2D.h rename to Imaging/Morphological/vtkImageSkeleton2D.h diff --git a/Imaging/vtkImageThresholdConnectivity.cxx b/Imaging/Morphological/vtkImageThresholdConnectivity.cxx similarity index 100% rename from Imaging/vtkImageThresholdConnectivity.cxx rename to Imaging/Morphological/vtkImageThresholdConnectivity.cxx diff --git a/Imaging/vtkImageThresholdConnectivity.h b/Imaging/Morphological/vtkImageThresholdConnectivity.h similarity index 100% rename from Imaging/vtkImageThresholdConnectivity.h rename to Imaging/Morphological/vtkImageThresholdConnectivity.h diff --git a/Imaging/vtkImageCanvasSource2D.cxx b/Imaging/Sources/vtkImageCanvasSource2D.cxx similarity index 100% rename from Imaging/vtkImageCanvasSource2D.cxx rename to Imaging/Sources/vtkImageCanvasSource2D.cxx diff --git a/Imaging/vtkImageCanvasSource2D.h b/Imaging/Sources/vtkImageCanvasSource2D.h similarity index 100% rename from Imaging/vtkImageCanvasSource2D.h rename to Imaging/Sources/vtkImageCanvasSource2D.h diff --git a/Imaging/vtkImageEllipsoidSource.cxx b/Imaging/Sources/vtkImageEllipsoidSource.cxx similarity index 100% rename from Imaging/vtkImageEllipsoidSource.cxx rename to Imaging/Sources/vtkImageEllipsoidSource.cxx diff --git a/Imaging/vtkImageEllipsoidSource.h b/Imaging/Sources/vtkImageEllipsoidSource.h similarity index 100% rename from Imaging/vtkImageEllipsoidSource.h rename to Imaging/Sources/vtkImageEllipsoidSource.h diff --git a/Imaging/vtkImageGaussianSource.cxx b/Imaging/Sources/vtkImageGaussianSource.cxx similarity index 100% rename from Imaging/vtkImageGaussianSource.cxx rename to Imaging/Sources/vtkImageGaussianSource.cxx diff --git a/Imaging/vtkImageGaussianSource.h b/Imaging/Sources/vtkImageGaussianSource.h similarity index 100% rename from Imaging/vtkImageGaussianSource.h rename to Imaging/Sources/vtkImageGaussianSource.h diff --git a/Imaging/vtkImageGridSource.cxx b/Imaging/Sources/vtkImageGridSource.cxx similarity index 100% rename from Imaging/vtkImageGridSource.cxx rename to Imaging/Sources/vtkImageGridSource.cxx diff --git a/Imaging/vtkImageGridSource.h b/Imaging/Sources/vtkImageGridSource.h similarity index 100% rename from Imaging/vtkImageGridSource.h rename to Imaging/Sources/vtkImageGridSource.h diff --git a/Imaging/vtkImageMandelbrotSource.cxx b/Imaging/Sources/vtkImageMandelbrotSource.cxx similarity index 100% rename from Imaging/vtkImageMandelbrotSource.cxx rename to Imaging/Sources/vtkImageMandelbrotSource.cxx diff --git a/Imaging/vtkImageMandelbrotSource.h b/Imaging/Sources/vtkImageMandelbrotSource.h similarity index 100% rename from Imaging/vtkImageMandelbrotSource.h rename to Imaging/Sources/vtkImageMandelbrotSource.h diff --git a/Imaging/vtkImageNoiseSource.cxx b/Imaging/Sources/vtkImageNoiseSource.cxx similarity index 100% rename from Imaging/vtkImageNoiseSource.cxx rename to Imaging/Sources/vtkImageNoiseSource.cxx diff --git a/Imaging/vtkImageNoiseSource.h b/Imaging/Sources/vtkImageNoiseSource.h similarity index 100% rename from Imaging/vtkImageNoiseSource.h rename to Imaging/Sources/vtkImageNoiseSource.h diff --git a/Imaging/vtkImageSinusoidSource.cxx b/Imaging/Sources/vtkImageSinusoidSource.cxx similarity index 100% rename from Imaging/vtkImageSinusoidSource.cxx rename to Imaging/Sources/vtkImageSinusoidSource.cxx diff --git a/Imaging/vtkImageSinusoidSource.h b/Imaging/Sources/vtkImageSinusoidSource.h similarity index 100% rename from Imaging/vtkImageSinusoidSource.h rename to Imaging/Sources/vtkImageSinusoidSource.h diff --git a/Imaging/vtkImageAccumulate.cxx b/Imaging/Statistics/vtkImageAccumulate.cxx similarity index 100% rename from Imaging/vtkImageAccumulate.cxx rename to Imaging/Statistics/vtkImageAccumulate.cxx diff --git a/Imaging/vtkImageAccumulate.h b/Imaging/Statistics/vtkImageAccumulate.h similarity index 100% rename from Imaging/vtkImageAccumulate.h rename to Imaging/Statistics/vtkImageAccumulate.h diff --git a/Imaging/vtkImageHistogram.cxx b/Imaging/Statistics/vtkImageHistogram.cxx similarity index 100% rename from Imaging/vtkImageHistogram.cxx rename to Imaging/Statistics/vtkImageHistogram.cxx diff --git a/Imaging/vtkImageHistogram.h b/Imaging/Statistics/vtkImageHistogram.h similarity index 100% rename from Imaging/vtkImageHistogram.h rename to Imaging/Statistics/vtkImageHistogram.h diff --git a/Imaging/vtkImageHistogramStatistics.cxx b/Imaging/Statistics/vtkImageHistogramStatistics.cxx similarity index 100% rename from Imaging/vtkImageHistogramStatistics.cxx rename to Imaging/Statistics/vtkImageHistogramStatistics.cxx diff --git a/Imaging/vtkImageHistogramStatistics.h b/Imaging/Statistics/vtkImageHistogramStatistics.h similarity index 100% rename from Imaging/vtkImageHistogramStatistics.h rename to Imaging/Statistics/vtkImageHistogramStatistics.h diff --git a/Imaging/vtkImageStencil.cxx b/Imaging/Stencil/vtkImageStencil.cxx similarity index 100% rename from Imaging/vtkImageStencil.cxx rename to Imaging/Stencil/vtkImageStencil.cxx diff --git a/Imaging/vtkImageStencil.h b/Imaging/Stencil/vtkImageStencil.h similarity index 100% rename from Imaging/vtkImageStencil.h rename to Imaging/Stencil/vtkImageStencil.h diff --git a/Imaging/vtkImageStencilToImage.cxx b/Imaging/Stencil/vtkImageStencilToImage.cxx similarity index 100% rename from Imaging/vtkImageStencilToImage.cxx rename to Imaging/Stencil/vtkImageStencilToImage.cxx diff --git a/Imaging/vtkImageStencilToImage.h b/Imaging/Stencil/vtkImageStencilToImage.h similarity index 100% rename from Imaging/vtkImageStencilToImage.h rename to Imaging/Stencil/vtkImageStencilToImage.h diff --git a/Imaging/vtkImageToImageStencil.cxx b/Imaging/Stencil/vtkImageToImageStencil.cxx similarity index 100% rename from Imaging/vtkImageToImageStencil.cxx rename to Imaging/Stencil/vtkImageToImageStencil.cxx diff --git a/Imaging/vtkImageToImageStencil.h b/Imaging/Stencil/vtkImageToImageStencil.h similarity index 100% rename from Imaging/vtkImageToImageStencil.h rename to Imaging/Stencil/vtkImageToImageStencil.h diff --git a/Imaging/vtkImplicitFunctionToImageStencil.cxx b/Imaging/Stencil/vtkImplicitFunctionToImageStencil.cxx similarity index 100% rename from Imaging/vtkImplicitFunctionToImageStencil.cxx rename to Imaging/Stencil/vtkImplicitFunctionToImageStencil.cxx diff --git a/Imaging/vtkImplicitFunctionToImageStencil.h b/Imaging/Stencil/vtkImplicitFunctionToImageStencil.h similarity index 100% rename from Imaging/vtkImplicitFunctionToImageStencil.h rename to Imaging/Stencil/vtkImplicitFunctionToImageStencil.h diff --git a/Imaging/vtkLassoStencilSource.cxx b/Imaging/Stencil/vtkLassoStencilSource.cxx similarity index 100% rename from Imaging/vtkLassoStencilSource.cxx rename to Imaging/Stencil/vtkLassoStencilSource.cxx diff --git a/Imaging/vtkLassoStencilSource.h b/Imaging/Stencil/vtkLassoStencilSource.h similarity index 100% rename from Imaging/vtkLassoStencilSource.h rename to Imaging/Stencil/vtkLassoStencilSource.h diff --git a/Hybrid/vtkPolyDataToImageStencil.cxx b/Imaging/Stencil/vtkPolyDataToImageStencil.cxx similarity index 100% rename from Hybrid/vtkPolyDataToImageStencil.cxx rename to Imaging/Stencil/vtkPolyDataToImageStencil.cxx diff --git a/Hybrid/vtkPolyDataToImageStencil.h b/Imaging/Stencil/vtkPolyDataToImageStencil.h similarity index 100% rename from Hybrid/vtkPolyDataToImageStencil.h rename to Imaging/Stencil/vtkPolyDataToImageStencil.h diff --git a/Imaging/vtkROIStencilSource.cxx b/Imaging/Stencil/vtkROIStencilSource.cxx similarity index 100% rename from Imaging/vtkROIStencilSource.cxx rename to Imaging/Stencil/vtkROIStencilSource.cxx diff --git a/Imaging/vtkROIStencilSource.h b/Imaging/Stencil/vtkROIStencilSource.h similarity index 100% rename from Imaging/vtkROIStencilSource.h rename to Imaging/Stencil/vtkROIStencilSource.h diff --git a/Infovis/Testing/Cxx/TestVariantSerialization.cxx b/Infovis/Boost/Testing/Cxx/TestVariantSerialization.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestVariantSerialization.cxx rename to Infovis/Boost/Testing/Cxx/TestVariantSerialization.cxx diff --git a/Common/vtkTryDowncast.h b/Infovis/Boost/vtkTryDowncast.h similarity index 100% rename from Common/vtkTryDowncast.h rename to Infovis/Boost/vtkTryDowncast.h diff --git a/Common/vtkVariantBoostSerialization.h b/Infovis/Boost/vtkVariantBoostSerialization.h similarity index 100% rename from Common/vtkVariantBoostSerialization.h rename to Infovis/Boost/vtkVariantBoostSerialization.h diff --git a/Infovis/Testing/Cxx/BoostArrayLogWeighting.cxx b/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayLogWeighting.cxx similarity index 100% rename from Infovis/Testing/Cxx/BoostArrayLogWeighting.cxx rename to Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayLogWeighting.cxx diff --git a/Infovis/Testing/Cxx/BoostArrayRandomSparseArraySource.cxx b/Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayRandomSparseArraySource.cxx similarity index 100% rename from Infovis/Testing/Cxx/BoostArrayRandomSparseArraySource.cxx rename to Infovis/BoostGraphAlgorithms/Testing/Cxx/BoostArrayRandomSparseArraySource.cxx diff --git a/Infovis/Testing/Cxx/TestBoostAdapter.cxx b/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostAdapter.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestBoostAdapter.cxx rename to Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostAdapter.cxx diff --git a/Infovis/Testing/Cxx/TestBoostAlgorithms.cxx b/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostAlgorithms.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestBoostAlgorithms.cxx rename to Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostAlgorithms.cxx diff --git a/Infovis/Testing/Cxx/TestBoostBetweennessClustering.cxx b/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostBetweennessClustering.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestBoostBetweennessClustering.cxx rename to Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostBetweennessClustering.cxx diff --git a/Infovis/Testing/Cxx/TestBoostBrandesCentrality.cxx b/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostBrandesCentrality.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestBoostBrandesCentrality.cxx rename to Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostBrandesCentrality.cxx diff --git a/Infovis/Testing/Cxx/TestBoostExtractLargestComponent.cxx b/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostExtractLargestComponent.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestBoostExtractLargestComponent.cxx rename to Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostExtractLargestComponent.cxx diff --git a/Infovis/Testing/Cxx/TestBoostSplitTableField.cxx b/Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostSplitTableField.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestBoostSplitTableField.cxx rename to Infovis/BoostGraphAlgorithms/Testing/Cxx/TestBoostSplitTableField.cxx diff --git a/Infovis/vtkBoostBetweennessClustering.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostBetweennessClustering.cxx similarity index 100% rename from Infovis/vtkBoostBetweennessClustering.cxx rename to Infovis/BoostGraphAlgorithms/vtkBoostBetweennessClustering.cxx diff --git a/Infovis/vtkBoostBetweennessClustering.h b/Infovis/BoostGraphAlgorithms/vtkBoostBetweennessClustering.h similarity index 100% rename from Infovis/vtkBoostBetweennessClustering.h rename to Infovis/BoostGraphAlgorithms/vtkBoostBetweennessClustering.h diff --git a/Infovis/vtkBoostBiconnectedComponents.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostBiconnectedComponents.cxx similarity index 100% rename from Infovis/vtkBoostBiconnectedComponents.cxx rename to Infovis/BoostGraphAlgorithms/vtkBoostBiconnectedComponents.cxx diff --git a/Infovis/vtkBoostBiconnectedComponents.h b/Infovis/BoostGraphAlgorithms/vtkBoostBiconnectedComponents.h similarity index 100% rename from Infovis/vtkBoostBiconnectedComponents.h rename to Infovis/BoostGraphAlgorithms/vtkBoostBiconnectedComponents.h diff --git a/Infovis/vtkBoostBrandesCentrality.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostBrandesCentrality.cxx similarity index 100% rename from Infovis/vtkBoostBrandesCentrality.cxx rename to Infovis/BoostGraphAlgorithms/vtkBoostBrandesCentrality.cxx diff --git a/Infovis/vtkBoostBrandesCentrality.h b/Infovis/BoostGraphAlgorithms/vtkBoostBrandesCentrality.h similarity index 100% rename from Infovis/vtkBoostBrandesCentrality.h rename to Infovis/BoostGraphAlgorithms/vtkBoostBrandesCentrality.h diff --git a/Infovis/vtkBoostBreadthFirstSearch.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.cxx similarity index 100% rename from Infovis/vtkBoostBreadthFirstSearch.cxx rename to Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.cxx diff --git a/Infovis/vtkBoostBreadthFirstSearch.h b/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.h similarity index 100% rename from Infovis/vtkBoostBreadthFirstSearch.h rename to Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearch.h diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearchTree.cxx similarity index 100% rename from Infovis/vtkBoostBreadthFirstSearchTree.cxx rename to Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearchTree.cxx diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.h b/Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearchTree.h similarity index 100% rename from Infovis/vtkBoostBreadthFirstSearchTree.h rename to Infovis/BoostGraphAlgorithms/vtkBoostBreadthFirstSearchTree.h diff --git a/Infovis/vtkBoostConnectedComponents.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostConnectedComponents.cxx similarity index 100% rename from Infovis/vtkBoostConnectedComponents.cxx rename to Infovis/BoostGraphAlgorithms/vtkBoostConnectedComponents.cxx diff --git a/Infovis/vtkBoostConnectedComponents.h b/Infovis/BoostGraphAlgorithms/vtkBoostConnectedComponents.h similarity index 100% rename from Infovis/vtkBoostConnectedComponents.h rename to Infovis/BoostGraphAlgorithms/vtkBoostConnectedComponents.h diff --git a/Infovis/vtkBoostExtractLargestComponent.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostExtractLargestComponent.cxx similarity index 100% rename from Infovis/vtkBoostExtractLargestComponent.cxx rename to Infovis/BoostGraphAlgorithms/vtkBoostExtractLargestComponent.cxx diff --git a/Infovis/vtkBoostExtractLargestComponent.h b/Infovis/BoostGraphAlgorithms/vtkBoostExtractLargestComponent.h similarity index 100% rename from Infovis/vtkBoostExtractLargestComponent.h rename to Infovis/BoostGraphAlgorithms/vtkBoostExtractLargestComponent.h diff --git a/Infovis/vtkBoostGraphAdapter.h b/Infovis/BoostGraphAlgorithms/vtkBoostGraphAdapter.h similarity index 100% rename from Infovis/vtkBoostGraphAdapter.h rename to Infovis/BoostGraphAlgorithms/vtkBoostGraphAdapter.h diff --git a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostKruskalMinimumSpanningTree.cxx similarity index 100% rename from Infovis/vtkBoostKruskalMinimumSpanningTree.cxx rename to Infovis/BoostGraphAlgorithms/vtkBoostKruskalMinimumSpanningTree.cxx diff --git a/Infovis/vtkBoostKruskalMinimumSpanningTree.h b/Infovis/BoostGraphAlgorithms/vtkBoostKruskalMinimumSpanningTree.h similarity index 100% rename from Infovis/vtkBoostKruskalMinimumSpanningTree.h rename to Infovis/BoostGraphAlgorithms/vtkBoostKruskalMinimumSpanningTree.h diff --git a/Infovis/vtkBoostLogWeighting.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostLogWeighting.cxx similarity index 100% rename from Infovis/vtkBoostLogWeighting.cxx rename to Infovis/BoostGraphAlgorithms/vtkBoostLogWeighting.cxx diff --git a/Infovis/vtkBoostLogWeighting.h b/Infovis/BoostGraphAlgorithms/vtkBoostLogWeighting.h similarity index 100% rename from Infovis/vtkBoostLogWeighting.h rename to Infovis/BoostGraphAlgorithms/vtkBoostLogWeighting.h diff --git a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostPrimMinimumSpanningTree.cxx similarity index 100% rename from Infovis/vtkBoostPrimMinimumSpanningTree.cxx rename to Infovis/BoostGraphAlgorithms/vtkBoostPrimMinimumSpanningTree.cxx diff --git a/Infovis/vtkBoostPrimMinimumSpanningTree.h b/Infovis/BoostGraphAlgorithms/vtkBoostPrimMinimumSpanningTree.h similarity index 100% rename from Infovis/vtkBoostPrimMinimumSpanningTree.h rename to Infovis/BoostGraphAlgorithms/vtkBoostPrimMinimumSpanningTree.h diff --git a/Infovis/vtkBoostRandomSparseArraySource.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostRandomSparseArraySource.cxx similarity index 100% rename from Infovis/vtkBoostRandomSparseArraySource.cxx rename to Infovis/BoostGraphAlgorithms/vtkBoostRandomSparseArraySource.cxx diff --git a/Infovis/vtkBoostRandomSparseArraySource.h b/Infovis/BoostGraphAlgorithms/vtkBoostRandomSparseArraySource.h similarity index 100% rename from Infovis/vtkBoostRandomSparseArraySource.h rename to Infovis/BoostGraphAlgorithms/vtkBoostRandomSparseArraySource.h diff --git a/Infovis/vtkBoostSplitTableField.cxx b/Infovis/BoostGraphAlgorithms/vtkBoostSplitTableField.cxx similarity index 100% rename from Infovis/vtkBoostSplitTableField.cxx rename to Infovis/BoostGraphAlgorithms/vtkBoostSplitTableField.cxx diff --git a/Infovis/vtkBoostSplitTableField.h b/Infovis/BoostGraphAlgorithms/vtkBoostSplitTableField.h similarity index 100% rename from Infovis/vtkBoostSplitTableField.h rename to Infovis/BoostGraphAlgorithms/vtkBoostSplitTableField.h diff --git a/Infovis/Testing/Cxx/ArrayDotProductSimilarity.cxx b/Infovis/Core/Testing/Cxx/ArrayDotProductSimilarity.cxx similarity index 100% rename from Infovis/Testing/Cxx/ArrayDotProductSimilarity.cxx rename to Infovis/Core/Testing/Cxx/ArrayDotProductSimilarity.cxx diff --git a/Infovis/Testing/Cxx/ArraySparseArrayToTable.cxx b/Infovis/Core/Testing/Cxx/ArraySparseArrayToTable.cxx similarity index 100% rename from Infovis/Testing/Cxx/ArraySparseArrayToTable.cxx rename to Infovis/Core/Testing/Cxx/ArraySparseArrayToTable.cxx diff --git a/Infovis/Testing/Cxx/ArrayTableToSparseArray.cxx b/Infovis/Core/Testing/Cxx/ArrayTableToSparseArray.cxx similarity index 100% rename from Infovis/Testing/Cxx/ArrayTableToSparseArray.cxx rename to Infovis/Core/Testing/Cxx/ArrayTableToSparseArray.cxx diff --git a/Infovis/Testing/Cxx/ArrayToTable.cxx b/Infovis/Core/Testing/Cxx/ArrayToTable.cxx similarity index 100% rename from Infovis/Testing/Cxx/ArrayToTable.cxx rename to Infovis/Core/Testing/Cxx/ArrayToTable.cxx diff --git a/Infovis/Testing/Cxx/ArrayTransposeMatrix.cxx b/Infovis/Core/Testing/Cxx/ArrayTransposeMatrix.cxx similarity index 100% rename from Infovis/Testing/Cxx/ArrayTransposeMatrix.cxx rename to Infovis/Core/Testing/Cxx/ArrayTransposeMatrix.cxx diff --git a/Infovis/Testing/Cxx/TestArrayNorm.cxx b/Infovis/Core/Testing/Cxx/TestArrayNorm.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestArrayNorm.cxx rename to Infovis/Core/Testing/Cxx/TestArrayNorm.cxx diff --git a/Infovis/Testing/Cxx/TestCollapseVerticesByArray.cxx b/Infovis/Core/Testing/Cxx/TestCollapseVerticesByArray.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestCollapseVerticesByArray.cxx rename to Infovis/Core/Testing/Cxx/TestCollapseVerticesByArray.cxx diff --git a/Infovis/Testing/Cxx/TestConvexHull2D.cxx b/Infovis/Core/Testing/Cxx/TestConvexHull2D.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestConvexHull2D.cxx rename to Infovis/Core/Testing/Cxx/TestConvexHull2D.cxx diff --git a/Infovis/Testing/Cxx/TestDataObjectToTable.cxx b/Infovis/Core/Testing/Cxx/TestDataObjectToTable.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestDataObjectToTable.cxx rename to Infovis/Core/Testing/Cxx/TestDataObjectToTable.cxx diff --git a/Infovis/Testing/Cxx/TestExtractSelectedGraph.cxx b/Infovis/Core/Testing/Cxx/TestExtractSelectedGraph.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestExtractSelectedGraph.cxx rename to Infovis/Core/Testing/Cxx/TestExtractSelectedGraph.cxx diff --git a/Infovis/Testing/Cxx/TestGraphAlgorithms.cxx b/Infovis/Core/Testing/Cxx/TestGraphAlgorithms.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestGraphAlgorithms.cxx rename to Infovis/Core/Testing/Cxx/TestGraphAlgorithms.cxx diff --git a/Infovis/Testing/Cxx/TestKCoreDecomposition.cxx b/Infovis/Core/Testing/Cxx/TestKCoreDecomposition.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestKCoreDecomposition.cxx rename to Infovis/Core/Testing/Cxx/TestKCoreDecomposition.cxx diff --git a/Infovis/Testing/Cxx/TestMergeGraphs.cxx b/Infovis/Core/Testing/Cxx/TestMergeGraphs.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestMergeGraphs.cxx rename to Infovis/Core/Testing/Cxx/TestMergeGraphs.cxx diff --git a/Infovis/Testing/Cxx/TestMergeTables.cxx b/Infovis/Core/Testing/Cxx/TestMergeTables.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestMergeTables.cxx rename to Infovis/Core/Testing/Cxx/TestMergeTables.cxx diff --git a/Infovis/Testing/Cxx/TestRandomGraphSource.cxx b/Infovis/Core/Testing/Cxx/TestRandomGraphSource.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestRandomGraphSource.cxx rename to Infovis/Core/Testing/Cxx/TestRandomGraphSource.cxx diff --git a/Infovis/Testing/Cxx/TestRemoveIsolatedVertices.cxx b/Infovis/Core/Testing/Cxx/TestRemoveIsolatedVertices.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestRemoveIsolatedVertices.cxx rename to Infovis/Core/Testing/Cxx/TestRemoveIsolatedVertices.cxx diff --git a/Infovis/Testing/Cxx/TestStreamGraph.cxx b/Infovis/Core/Testing/Cxx/TestStreamGraph.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestStreamGraph.cxx rename to Infovis/Core/Testing/Cxx/TestStreamGraph.cxx diff --git a/Infovis/Testing/Cxx/TestStringToCategory.cxx b/Infovis/Core/Testing/Cxx/TestStringToCategory.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestStringToCategory.cxx rename to Infovis/Core/Testing/Cxx/TestStringToCategory.cxx diff --git a/Infovis/Testing/Cxx/TestStringToNumeric.cxx b/Infovis/Core/Testing/Cxx/TestStringToNumeric.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestStringToNumeric.cxx rename to Infovis/Core/Testing/Cxx/TestStringToNumeric.cxx diff --git a/Infovis/Testing/Cxx/TestTableToArray.cxx b/Infovis/Core/Testing/Cxx/TestTableToArray.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestTableToArray.cxx rename to Infovis/Core/Testing/Cxx/TestTableToArray.cxx diff --git a/Infovis/Testing/Cxx/TestTableToGraph.cxx b/Infovis/Core/Testing/Cxx/TestTableToGraph.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestTableToGraph.cxx rename to Infovis/Core/Testing/Cxx/TestTableToGraph.cxx diff --git a/Infovis/Testing/Cxx/TestThresholdTable.cxx b/Infovis/Core/Testing/Cxx/TestThresholdTable.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestThresholdTable.cxx rename to Infovis/Core/Testing/Cxx/TestThresholdTable.cxx diff --git a/Infovis/Testing/Cxx/TestTimePoint.cxx b/Infovis/Core/Testing/Cxx/TestTimePoint.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestTimePoint.cxx rename to Infovis/Core/Testing/Cxx/TestTimePoint.cxx diff --git a/Infovis/vtkAddMembershipArray.cxx b/Infovis/Core/vtkAddMembershipArray.cxx similarity index 100% rename from Infovis/vtkAddMembershipArray.cxx rename to Infovis/Core/vtkAddMembershipArray.cxx diff --git a/Infovis/vtkAddMembershipArray.h b/Infovis/Core/vtkAddMembershipArray.h similarity index 100% rename from Infovis/vtkAddMembershipArray.h rename to Infovis/Core/vtkAddMembershipArray.h diff --git a/Infovis/vtkAdjacencyMatrixToEdgeTable.cxx b/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx similarity index 100% rename from Infovis/vtkAdjacencyMatrixToEdgeTable.cxx rename to Infovis/Core/vtkAdjacencyMatrixToEdgeTable.cxx diff --git a/Infovis/vtkAdjacencyMatrixToEdgeTable.h b/Infovis/Core/vtkAdjacencyMatrixToEdgeTable.h similarity index 100% rename from Infovis/vtkAdjacencyMatrixToEdgeTable.h rename to Infovis/Core/vtkAdjacencyMatrixToEdgeTable.h diff --git a/Infovis/vtkArrayNorm.cxx b/Infovis/Core/vtkArrayNorm.cxx similarity index 100% rename from Infovis/vtkArrayNorm.cxx rename to Infovis/Core/vtkArrayNorm.cxx diff --git a/Infovis/vtkArrayNorm.h b/Infovis/Core/vtkArrayNorm.h similarity index 100% rename from Infovis/vtkArrayNorm.h rename to Infovis/Core/vtkArrayNorm.h diff --git a/Infovis/vtkArrayToTable.cxx b/Infovis/Core/vtkArrayToTable.cxx similarity index 100% rename from Infovis/vtkArrayToTable.cxx rename to Infovis/Core/vtkArrayToTable.cxx diff --git a/Infovis/vtkArrayToTable.h b/Infovis/Core/vtkArrayToTable.h similarity index 100% rename from Infovis/vtkArrayToTable.h rename to Infovis/Core/vtkArrayToTable.h diff --git a/Infovis/vtkCollapseGraph.cxx b/Infovis/Core/vtkCollapseGraph.cxx similarity index 100% rename from Infovis/vtkCollapseGraph.cxx rename to Infovis/Core/vtkCollapseGraph.cxx diff --git a/Infovis/vtkCollapseGraph.h b/Infovis/Core/vtkCollapseGraph.h similarity index 100% rename from Infovis/vtkCollapseGraph.h rename to Infovis/Core/vtkCollapseGraph.h diff --git a/Infovis/vtkCollapseVerticesByArray.cxx b/Infovis/Core/vtkCollapseVerticesByArray.cxx similarity index 100% rename from Infovis/vtkCollapseVerticesByArray.cxx rename to Infovis/Core/vtkCollapseVerticesByArray.cxx diff --git a/Infovis/vtkCollapseVerticesByArray.h b/Infovis/Core/vtkCollapseVerticesByArray.h similarity index 100% rename from Infovis/vtkCollapseVerticesByArray.h rename to Infovis/Core/vtkCollapseVerticesByArray.h diff --git a/Infovis/vtkConvexHull2D.cxx b/Infovis/Core/vtkConvexHull2D.cxx similarity index 100% rename from Infovis/vtkConvexHull2D.cxx rename to Infovis/Core/vtkConvexHull2D.cxx diff --git a/Infovis/vtkConvexHull2D.h b/Infovis/Core/vtkConvexHull2D.h similarity index 100% rename from Infovis/vtkConvexHull2D.h rename to Infovis/Core/vtkConvexHull2D.h diff --git a/Infovis/vtkDataObjectToTable.cxx b/Infovis/Core/vtkDataObjectToTable.cxx similarity index 100% rename from Infovis/vtkDataObjectToTable.cxx rename to Infovis/Core/vtkDataObjectToTable.cxx diff --git a/Infovis/vtkDataObjectToTable.h b/Infovis/Core/vtkDataObjectToTable.h similarity index 100% rename from Infovis/vtkDataObjectToTable.h rename to Infovis/Core/vtkDataObjectToTable.h diff --git a/Infovis/vtkDotProductSimilarity.cxx b/Infovis/Core/vtkDotProductSimilarity.cxx similarity index 100% rename from Infovis/vtkDotProductSimilarity.cxx rename to Infovis/Core/vtkDotProductSimilarity.cxx diff --git a/Infovis/vtkDotProductSimilarity.h b/Infovis/Core/vtkDotProductSimilarity.h similarity index 100% rename from Infovis/vtkDotProductSimilarity.h rename to Infovis/Core/vtkDotProductSimilarity.h diff --git a/Infovis/vtkEdgeCenters.cxx b/Infovis/Core/vtkEdgeCenters.cxx similarity index 100% rename from Infovis/vtkEdgeCenters.cxx rename to Infovis/Core/vtkEdgeCenters.cxx diff --git a/Infovis/vtkEdgeCenters.h b/Infovis/Core/vtkEdgeCenters.h similarity index 100% rename from Infovis/vtkEdgeCenters.h rename to Infovis/Core/vtkEdgeCenters.h diff --git a/Infovis/vtkExpandSelectedGraph.cxx b/Infovis/Core/vtkExpandSelectedGraph.cxx similarity index 100% rename from Infovis/vtkExpandSelectedGraph.cxx rename to Infovis/Core/vtkExpandSelectedGraph.cxx diff --git a/Infovis/vtkExpandSelectedGraph.h b/Infovis/Core/vtkExpandSelectedGraph.h similarity index 100% rename from Infovis/vtkExpandSelectedGraph.h rename to Infovis/Core/vtkExpandSelectedGraph.h diff --git a/Infovis/vtkExtractSelectedGraph.cxx b/Infovis/Core/vtkExtractSelectedGraph.cxx similarity index 100% rename from Infovis/vtkExtractSelectedGraph.cxx rename to Infovis/Core/vtkExtractSelectedGraph.cxx diff --git a/Infovis/vtkExtractSelectedGraph.h b/Infovis/Core/vtkExtractSelectedGraph.h similarity index 100% rename from Infovis/vtkExtractSelectedGraph.h rename to Infovis/Core/vtkExtractSelectedGraph.h diff --git a/Infovis/vtkGenerateIndexArray.cxx b/Infovis/Core/vtkGenerateIndexArray.cxx similarity index 100% rename from Infovis/vtkGenerateIndexArray.cxx rename to Infovis/Core/vtkGenerateIndexArray.cxx diff --git a/Infovis/vtkGenerateIndexArray.h b/Infovis/Core/vtkGenerateIndexArray.h similarity index 100% rename from Infovis/vtkGenerateIndexArray.h rename to Infovis/Core/vtkGenerateIndexArray.h diff --git a/Infovis/vtkGraphAnnotationLayersFilter.cxx b/Infovis/Core/vtkGraphAnnotationLayersFilter.cxx similarity index 100% rename from Infovis/vtkGraphAnnotationLayersFilter.cxx rename to Infovis/Core/vtkGraphAnnotationLayersFilter.cxx diff --git a/Infovis/vtkGraphAnnotationLayersFilter.h b/Infovis/Core/vtkGraphAnnotationLayersFilter.h similarity index 100% rename from Infovis/vtkGraphAnnotationLayersFilter.h rename to Infovis/Core/vtkGraphAnnotationLayersFilter.h diff --git a/Infovis/vtkGraphHierarchicalBundleEdges.cxx b/Infovis/Core/vtkGraphHierarchicalBundleEdges.cxx similarity index 100% rename from Infovis/vtkGraphHierarchicalBundleEdges.cxx rename to Infovis/Core/vtkGraphHierarchicalBundleEdges.cxx diff --git a/Infovis/vtkGraphHierarchicalBundleEdges.h b/Infovis/Core/vtkGraphHierarchicalBundleEdges.h similarity index 100% rename from Infovis/vtkGraphHierarchicalBundleEdges.h rename to Infovis/Core/vtkGraphHierarchicalBundleEdges.h diff --git a/Infovis/vtkGroupLeafVertices.cxx b/Infovis/Core/vtkGroupLeafVertices.cxx similarity index 100% rename from Infovis/vtkGroupLeafVertices.cxx rename to Infovis/Core/vtkGroupLeafVertices.cxx diff --git a/Infovis/vtkGroupLeafVertices.h b/Infovis/Core/vtkGroupLeafVertices.h similarity index 100% rename from Infovis/vtkGroupLeafVertices.h rename to Infovis/Core/vtkGroupLeafVertices.h diff --git a/Infovis/vtkKCoreDecomposition.cxx b/Infovis/Core/vtkKCoreDecomposition.cxx similarity index 100% rename from Infovis/vtkKCoreDecomposition.cxx rename to Infovis/Core/vtkKCoreDecomposition.cxx diff --git a/Infovis/vtkKCoreDecomposition.h b/Infovis/Core/vtkKCoreDecomposition.h similarity index 100% rename from Infovis/vtkKCoreDecomposition.h rename to Infovis/Core/vtkKCoreDecomposition.h diff --git a/Infovis/vtkMergeColumns.cxx b/Infovis/Core/vtkMergeColumns.cxx similarity index 100% rename from Infovis/vtkMergeColumns.cxx rename to Infovis/Core/vtkMergeColumns.cxx diff --git a/Infovis/vtkMergeColumns.h b/Infovis/Core/vtkMergeColumns.h similarity index 100% rename from Infovis/vtkMergeColumns.h rename to Infovis/Core/vtkMergeColumns.h diff --git a/Infovis/vtkMergeGraphs.cxx b/Infovis/Core/vtkMergeGraphs.cxx similarity index 100% rename from Infovis/vtkMergeGraphs.cxx rename to Infovis/Core/vtkMergeGraphs.cxx diff --git a/Infovis/vtkMergeGraphs.h b/Infovis/Core/vtkMergeGraphs.h similarity index 100% rename from Infovis/vtkMergeGraphs.h rename to Infovis/Core/vtkMergeGraphs.h diff --git a/Infovis/vtkMergeTables.cxx b/Infovis/Core/vtkMergeTables.cxx similarity index 100% rename from Infovis/vtkMergeTables.cxx rename to Infovis/Core/vtkMergeTables.cxx diff --git a/Infovis/vtkMergeTables.h b/Infovis/Core/vtkMergeTables.h similarity index 100% rename from Infovis/vtkMergeTables.h rename to Infovis/Core/vtkMergeTables.h diff --git a/Infovis/vtkMutableGraphHelper.cxx b/Infovis/Core/vtkMutableGraphHelper.cxx similarity index 100% rename from Infovis/vtkMutableGraphHelper.cxx rename to Infovis/Core/vtkMutableGraphHelper.cxx diff --git a/Infovis/vtkMutableGraphHelper.h b/Infovis/Core/vtkMutableGraphHelper.h similarity index 100% rename from Infovis/vtkMutableGraphHelper.h rename to Infovis/Core/vtkMutableGraphHelper.h diff --git a/Infovis/vtkNetworkHierarchy.cxx b/Infovis/Core/vtkNetworkHierarchy.cxx similarity index 100% rename from Infovis/vtkNetworkHierarchy.cxx rename to Infovis/Core/vtkNetworkHierarchy.cxx diff --git a/Infovis/vtkNetworkHierarchy.h b/Infovis/Core/vtkNetworkHierarchy.h similarity index 100% rename from Infovis/vtkNetworkHierarchy.h rename to Infovis/Core/vtkNetworkHierarchy.h diff --git a/Infovis/vtkPruneTreeFilter.cxx b/Infovis/Core/vtkPruneTreeFilter.cxx similarity index 100% rename from Infovis/vtkPruneTreeFilter.cxx rename to Infovis/Core/vtkPruneTreeFilter.cxx diff --git a/Infovis/vtkPruneTreeFilter.h b/Infovis/Core/vtkPruneTreeFilter.h similarity index 100% rename from Infovis/vtkPruneTreeFilter.h rename to Infovis/Core/vtkPruneTreeFilter.h diff --git a/Infovis/vtkRandomGraphSource.cxx b/Infovis/Core/vtkRandomGraphSource.cxx similarity index 100% rename from Infovis/vtkRandomGraphSource.cxx rename to Infovis/Core/vtkRandomGraphSource.cxx diff --git a/Infovis/vtkRandomGraphSource.h b/Infovis/Core/vtkRandomGraphSource.h similarity index 100% rename from Infovis/vtkRandomGraphSource.h rename to Infovis/Core/vtkRandomGraphSource.h diff --git a/Infovis/vtkRemoveHiddenData.cxx b/Infovis/Core/vtkRemoveHiddenData.cxx similarity index 100% rename from Infovis/vtkRemoveHiddenData.cxx rename to Infovis/Core/vtkRemoveHiddenData.cxx diff --git a/Infovis/vtkRemoveHiddenData.h b/Infovis/Core/vtkRemoveHiddenData.h similarity index 100% rename from Infovis/vtkRemoveHiddenData.h rename to Infovis/Core/vtkRemoveHiddenData.h diff --git a/Infovis/vtkRemoveIsolatedVertices.cxx b/Infovis/Core/vtkRemoveIsolatedVertices.cxx similarity index 100% rename from Infovis/vtkRemoveIsolatedVertices.cxx rename to Infovis/Core/vtkRemoveIsolatedVertices.cxx diff --git a/Infovis/vtkRemoveIsolatedVertices.h b/Infovis/Core/vtkRemoveIsolatedVertices.h similarity index 100% rename from Infovis/vtkRemoveIsolatedVertices.h rename to Infovis/Core/vtkRemoveIsolatedVertices.h diff --git a/Infovis/vtkSparseArrayToTable.cxx b/Infovis/Core/vtkSparseArrayToTable.cxx similarity index 100% rename from Infovis/vtkSparseArrayToTable.cxx rename to Infovis/Core/vtkSparseArrayToTable.cxx diff --git a/Infovis/vtkSparseArrayToTable.h b/Infovis/Core/vtkSparseArrayToTable.h similarity index 100% rename from Infovis/vtkSparseArrayToTable.h rename to Infovis/Core/vtkSparseArrayToTable.h diff --git a/Infovis/vtkStreamGraph.cxx b/Infovis/Core/vtkStreamGraph.cxx similarity index 100% rename from Infovis/vtkStreamGraph.cxx rename to Infovis/Core/vtkStreamGraph.cxx diff --git a/Infovis/vtkStreamGraph.h b/Infovis/Core/vtkStreamGraph.h similarity index 100% rename from Infovis/vtkStreamGraph.h rename to Infovis/Core/vtkStreamGraph.h diff --git a/Infovis/vtkStringToCategory.cxx b/Infovis/Core/vtkStringToCategory.cxx similarity index 100% rename from Infovis/vtkStringToCategory.cxx rename to Infovis/Core/vtkStringToCategory.cxx diff --git a/Infovis/vtkStringToCategory.h b/Infovis/Core/vtkStringToCategory.h similarity index 100% rename from Infovis/vtkStringToCategory.h rename to Infovis/Core/vtkStringToCategory.h diff --git a/Infovis/vtkStringToNumeric.cxx b/Infovis/Core/vtkStringToNumeric.cxx similarity index 100% rename from Infovis/vtkStringToNumeric.cxx rename to Infovis/Core/vtkStringToNumeric.cxx diff --git a/Infovis/vtkStringToNumeric.h b/Infovis/Core/vtkStringToNumeric.h similarity index 100% rename from Infovis/vtkStringToNumeric.h rename to Infovis/Core/vtkStringToNumeric.h diff --git a/Infovis/vtkTableToArray.cxx b/Infovis/Core/vtkTableToArray.cxx similarity index 100% rename from Infovis/vtkTableToArray.cxx rename to Infovis/Core/vtkTableToArray.cxx diff --git a/Infovis/vtkTableToArray.h b/Infovis/Core/vtkTableToArray.h similarity index 100% rename from Infovis/vtkTableToArray.h rename to Infovis/Core/vtkTableToArray.h diff --git a/Infovis/vtkTableToGraph.cxx b/Infovis/Core/vtkTableToGraph.cxx similarity index 100% rename from Infovis/vtkTableToGraph.cxx rename to Infovis/Core/vtkTableToGraph.cxx diff --git a/Infovis/vtkTableToGraph.h b/Infovis/Core/vtkTableToGraph.h similarity index 100% rename from Infovis/vtkTableToGraph.h rename to Infovis/Core/vtkTableToGraph.h diff --git a/Infovis/vtkTableToSparseArray.cxx b/Infovis/Core/vtkTableToSparseArray.cxx similarity index 100% rename from Infovis/vtkTableToSparseArray.cxx rename to Infovis/Core/vtkTableToSparseArray.cxx diff --git a/Infovis/vtkTableToSparseArray.h b/Infovis/Core/vtkTableToSparseArray.h similarity index 100% rename from Infovis/vtkTableToSparseArray.h rename to Infovis/Core/vtkTableToSparseArray.h diff --git a/Infovis/vtkTableToTreeFilter.cxx b/Infovis/Core/vtkTableToTreeFilter.cxx similarity index 100% rename from Infovis/vtkTableToTreeFilter.cxx rename to Infovis/Core/vtkTableToTreeFilter.cxx diff --git a/Infovis/vtkTableToTreeFilter.h b/Infovis/Core/vtkTableToTreeFilter.h similarity index 100% rename from Infovis/vtkTableToTreeFilter.h rename to Infovis/Core/vtkTableToTreeFilter.h diff --git a/Infovis/vtkThresholdGraph.cxx b/Infovis/Core/vtkThresholdGraph.cxx similarity index 100% rename from Infovis/vtkThresholdGraph.cxx rename to Infovis/Core/vtkThresholdGraph.cxx diff --git a/Infovis/vtkThresholdGraph.h b/Infovis/Core/vtkThresholdGraph.h similarity index 100% rename from Infovis/vtkThresholdGraph.h rename to Infovis/Core/vtkThresholdGraph.h diff --git a/Infovis/vtkThresholdTable.cxx b/Infovis/Core/vtkThresholdTable.cxx similarity index 100% rename from Infovis/vtkThresholdTable.cxx rename to Infovis/Core/vtkThresholdTable.cxx diff --git a/Infovis/vtkThresholdTable.h b/Infovis/Core/vtkThresholdTable.h similarity index 100% rename from Infovis/vtkThresholdTable.h rename to Infovis/Core/vtkThresholdTable.h diff --git a/Infovis/vtkTransferAttributes.cxx b/Infovis/Core/vtkTransferAttributes.cxx similarity index 100% rename from Infovis/vtkTransferAttributes.cxx rename to Infovis/Core/vtkTransferAttributes.cxx diff --git a/Infovis/vtkTransferAttributes.h b/Infovis/Core/vtkTransferAttributes.h similarity index 100% rename from Infovis/vtkTransferAttributes.h rename to Infovis/Core/vtkTransferAttributes.h diff --git a/Infovis/vtkTransposeMatrix.cxx b/Infovis/Core/vtkTransposeMatrix.cxx similarity index 100% rename from Infovis/vtkTransposeMatrix.cxx rename to Infovis/Core/vtkTransposeMatrix.cxx diff --git a/Infovis/vtkTransposeMatrix.h b/Infovis/Core/vtkTransposeMatrix.h similarity index 100% rename from Infovis/vtkTransposeMatrix.h rename to Infovis/Core/vtkTransposeMatrix.h diff --git a/Infovis/vtkTreeFieldAggregator.cxx b/Infovis/Core/vtkTreeFieldAggregator.cxx similarity index 100% rename from Infovis/vtkTreeFieldAggregator.cxx rename to Infovis/Core/vtkTreeFieldAggregator.cxx diff --git a/Infovis/vtkTreeFieldAggregator.h b/Infovis/Core/vtkTreeFieldAggregator.h similarity index 100% rename from Infovis/vtkTreeFieldAggregator.h rename to Infovis/Core/vtkTreeFieldAggregator.h diff --git a/Infovis/vtkTreeLevelsFilter.cxx b/Infovis/Core/vtkTreeLevelsFilter.cxx similarity index 100% rename from Infovis/vtkTreeLevelsFilter.cxx rename to Infovis/Core/vtkTreeLevelsFilter.cxx diff --git a/Infovis/vtkTreeLevelsFilter.h b/Infovis/Core/vtkTreeLevelsFilter.h similarity index 100% rename from Infovis/vtkTreeLevelsFilter.h rename to Infovis/Core/vtkTreeLevelsFilter.h diff --git a/Infovis/vtkVertexDegree.cxx b/Infovis/Core/vtkVertexDegree.cxx similarity index 100% rename from Infovis/vtkVertexDegree.cxx rename to Infovis/Core/vtkVertexDegree.cxx diff --git a/Infovis/vtkVertexDegree.h b/Infovis/Core/vtkVertexDegree.h similarity index 100% rename from Infovis/vtkVertexDegree.h rename to Infovis/Core/vtkVertexDegree.h diff --git a/Infovis/Testing/Cxx/TestArcEdges.cxx b/Infovis/Layout/Testing/Cxx/TestArcEdges.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestArcEdges.cxx rename to Infovis/Layout/Testing/Cxx/TestArcEdges.cxx diff --git a/Infovis/Testing/Cxx/TestAssignCoordinates.cxx b/Infovis/Layout/Testing/Cxx/TestAssignCoordinates.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestAssignCoordinates.cxx rename to Infovis/Layout/Testing/Cxx/TestAssignCoordinates.cxx diff --git a/Infovis/Testing/Cxx/TestChacoGraphReader.cxx b/Infovis/Layout/Testing/Cxx/TestChacoGraphReader.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestChacoGraphReader.cxx rename to Infovis/Layout/Testing/Cxx/TestChacoGraphReader.cxx diff --git a/Infovis/Testing/Cxx/TestCirclePackLayoutStrategy.cxx b/Infovis/Layout/Testing/Cxx/TestCirclePackLayoutStrategy.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestCirclePackLayoutStrategy.cxx rename to Infovis/Layout/Testing/Cxx/TestCirclePackLayoutStrategy.cxx diff --git a/Infovis/Testing/Cxx/TestCosmicTreeLayoutStrategy.cxx b/Infovis/Layout/Testing/Cxx/TestCosmicTreeLayoutStrategy.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestCosmicTreeLayoutStrategy.cxx rename to Infovis/Layout/Testing/Cxx/TestCosmicTreeLayoutStrategy.cxx diff --git a/Infovis/Testing/Cxx/TestGraphLayoutStrategy.cxx b/Infovis/Layout/Testing/Cxx/TestGraphLayoutStrategy.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestGraphLayoutStrategy.cxx rename to Infovis/Layout/Testing/Cxx/TestGraphLayoutStrategy.cxx diff --git a/Infovis/Testing/Cxx/TestGroupLeafVertices.cxx b/Infovis/Layout/Testing/Cxx/TestGroupLeafVertices.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestGroupLeafVertices.cxx rename to Infovis/Layout/Testing/Cxx/TestGroupLeafVertices.cxx diff --git a/Infovis/Testing/Cxx/TestKCoreLayout.cxx b/Infovis/Layout/Testing/Cxx/TestKCoreLayout.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestKCoreLayout.cxx rename to Infovis/Layout/Testing/Cxx/TestKCoreLayout.cxx diff --git a/Infovis/Testing/Cxx/TestKdTreeBoxSelection.cxx b/Infovis/Layout/Testing/Cxx/TestKdTreeBoxSelection.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestKdTreeBoxSelection.cxx rename to Infovis/Layout/Testing/Cxx/TestKdTreeBoxSelection.cxx diff --git a/Infovis/Testing/Cxx/TestPruneTreeFilter.cxx b/Infovis/Layout/Testing/Cxx/TestPruneTreeFilter.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestPruneTreeFilter.cxx rename to Infovis/Layout/Testing/Cxx/TestPruneTreeFilter.cxx diff --git a/Infovis/Testing/Cxx/TestSimple3DCirclesStrategy.cxx b/Infovis/Layout/Testing/Cxx/TestSimple3DCirclesStrategy.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestSimple3DCirclesStrategy.cxx rename to Infovis/Layout/Testing/Cxx/TestSimple3DCirclesStrategy.cxx diff --git a/Infovis/Testing/Cxx/TestTreeMapLayoutStrategy.cxx b/Infovis/Layout/Testing/Cxx/TestTreeMapLayoutStrategy.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestTreeMapLayoutStrategy.cxx rename to Infovis/Layout/Testing/Cxx/TestTreeMapLayoutStrategy.cxx diff --git a/Infovis/vtkArcParallelEdgeStrategy.cxx b/Infovis/Layout/vtkArcParallelEdgeStrategy.cxx similarity index 100% rename from Infovis/vtkArcParallelEdgeStrategy.cxx rename to Infovis/Layout/vtkArcParallelEdgeStrategy.cxx diff --git a/Infovis/vtkArcParallelEdgeStrategy.h b/Infovis/Layout/vtkArcParallelEdgeStrategy.h similarity index 100% rename from Infovis/vtkArcParallelEdgeStrategy.h rename to Infovis/Layout/vtkArcParallelEdgeStrategy.h diff --git a/Infovis/vtkAreaLayout.cxx b/Infovis/Layout/vtkAreaLayout.cxx similarity index 100% rename from Infovis/vtkAreaLayout.cxx rename to Infovis/Layout/vtkAreaLayout.cxx diff --git a/Infovis/vtkAreaLayout.h b/Infovis/Layout/vtkAreaLayout.h similarity index 100% rename from Infovis/vtkAreaLayout.h rename to Infovis/Layout/vtkAreaLayout.h diff --git a/Infovis/vtkAreaLayoutStrategy.cxx b/Infovis/Layout/vtkAreaLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkAreaLayoutStrategy.cxx rename to Infovis/Layout/vtkAreaLayoutStrategy.cxx diff --git a/Infovis/vtkAreaLayoutStrategy.h b/Infovis/Layout/vtkAreaLayoutStrategy.h similarity index 100% rename from Infovis/vtkAreaLayoutStrategy.h rename to Infovis/Layout/vtkAreaLayoutStrategy.h diff --git a/Infovis/vtkAssignCoordinates.cxx b/Infovis/Layout/vtkAssignCoordinates.cxx similarity index 100% rename from Infovis/vtkAssignCoordinates.cxx rename to Infovis/Layout/vtkAssignCoordinates.cxx diff --git a/Infovis/vtkAssignCoordinates.h b/Infovis/Layout/vtkAssignCoordinates.h similarity index 100% rename from Infovis/vtkAssignCoordinates.h rename to Infovis/Layout/vtkAssignCoordinates.h diff --git a/Infovis/vtkAssignCoordinatesLayoutStrategy.cxx b/Infovis/Layout/vtkAssignCoordinatesLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkAssignCoordinatesLayoutStrategy.cxx rename to Infovis/Layout/vtkAssignCoordinatesLayoutStrategy.cxx diff --git a/Infovis/vtkAssignCoordinatesLayoutStrategy.h b/Infovis/Layout/vtkAssignCoordinatesLayoutStrategy.h similarity index 100% rename from Infovis/vtkAssignCoordinatesLayoutStrategy.h rename to Infovis/Layout/vtkAssignCoordinatesLayoutStrategy.h diff --git a/Infovis/vtkAttributeClustering2DLayoutStrategy.cxx b/Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkAttributeClustering2DLayoutStrategy.cxx rename to Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.cxx diff --git a/Infovis/vtkAttributeClustering2DLayoutStrategy.h b/Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.h similarity index 100% rename from Infovis/vtkAttributeClustering2DLayoutStrategy.h rename to Infovis/Layout/vtkAttributeClustering2DLayoutStrategy.h diff --git a/Infovis/vtkBoxLayoutStrategy.cxx b/Infovis/Layout/vtkBoxLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkBoxLayoutStrategy.cxx rename to Infovis/Layout/vtkBoxLayoutStrategy.cxx diff --git a/Infovis/vtkBoxLayoutStrategy.h b/Infovis/Layout/vtkBoxLayoutStrategy.h similarity index 100% rename from Infovis/vtkBoxLayoutStrategy.h rename to Infovis/Layout/vtkBoxLayoutStrategy.h diff --git a/Infovis/vtkCirclePackFrontChainLayoutStrategy.cxx b/Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkCirclePackFrontChainLayoutStrategy.cxx rename to Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.cxx diff --git a/Infovis/vtkCirclePackFrontChainLayoutStrategy.h b/Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.h similarity index 100% rename from Infovis/vtkCirclePackFrontChainLayoutStrategy.h rename to Infovis/Layout/vtkCirclePackFrontChainLayoutStrategy.h diff --git a/Infovis/vtkCirclePackLayout.cxx b/Infovis/Layout/vtkCirclePackLayout.cxx similarity index 100% rename from Infovis/vtkCirclePackLayout.cxx rename to Infovis/Layout/vtkCirclePackLayout.cxx diff --git a/Infovis/vtkCirclePackLayout.h b/Infovis/Layout/vtkCirclePackLayout.h similarity index 100% rename from Infovis/vtkCirclePackLayout.h rename to Infovis/Layout/vtkCirclePackLayout.h diff --git a/Infovis/vtkCirclePackLayoutStrategy.cxx b/Infovis/Layout/vtkCirclePackLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkCirclePackLayoutStrategy.cxx rename to Infovis/Layout/vtkCirclePackLayoutStrategy.cxx diff --git a/Infovis/vtkCirclePackLayoutStrategy.h b/Infovis/Layout/vtkCirclePackLayoutStrategy.h similarity index 100% rename from Infovis/vtkCirclePackLayoutStrategy.h rename to Infovis/Layout/vtkCirclePackLayoutStrategy.h diff --git a/Infovis/vtkCirclePackToPolyData.cxx b/Infovis/Layout/vtkCirclePackToPolyData.cxx similarity index 100% rename from Infovis/vtkCirclePackToPolyData.cxx rename to Infovis/Layout/vtkCirclePackToPolyData.cxx diff --git a/Infovis/vtkCirclePackToPolyData.h b/Infovis/Layout/vtkCirclePackToPolyData.h similarity index 100% rename from Infovis/vtkCirclePackToPolyData.h rename to Infovis/Layout/vtkCirclePackToPolyData.h diff --git a/Infovis/vtkCircularLayoutStrategy.cxx b/Infovis/Layout/vtkCircularLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkCircularLayoutStrategy.cxx rename to Infovis/Layout/vtkCircularLayoutStrategy.cxx diff --git a/Infovis/vtkCircularLayoutStrategy.h b/Infovis/Layout/vtkCircularLayoutStrategy.h similarity index 100% rename from Infovis/vtkCircularLayoutStrategy.h rename to Infovis/Layout/vtkCircularLayoutStrategy.h diff --git a/Infovis/vtkClustering2DLayoutStrategy.cxx b/Infovis/Layout/vtkClustering2DLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkClustering2DLayoutStrategy.cxx rename to Infovis/Layout/vtkClustering2DLayoutStrategy.cxx diff --git a/Infovis/vtkClustering2DLayoutStrategy.h b/Infovis/Layout/vtkClustering2DLayoutStrategy.h similarity index 100% rename from Infovis/vtkClustering2DLayoutStrategy.h rename to Infovis/Layout/vtkClustering2DLayoutStrategy.h diff --git a/Infovis/vtkCommunity2DLayoutStrategy.cxx b/Infovis/Layout/vtkCommunity2DLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkCommunity2DLayoutStrategy.cxx rename to Infovis/Layout/vtkCommunity2DLayoutStrategy.cxx diff --git a/Infovis/vtkCommunity2DLayoutStrategy.h b/Infovis/Layout/vtkCommunity2DLayoutStrategy.h similarity index 100% rename from Infovis/vtkCommunity2DLayoutStrategy.h rename to Infovis/Layout/vtkCommunity2DLayoutStrategy.h diff --git a/Infovis/vtkConeLayoutStrategy.cxx b/Infovis/Layout/vtkConeLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkConeLayoutStrategy.cxx rename to Infovis/Layout/vtkConeLayoutStrategy.cxx diff --git a/Infovis/vtkConeLayoutStrategy.h b/Infovis/Layout/vtkConeLayoutStrategy.h similarity index 100% rename from Infovis/vtkConeLayoutStrategy.h rename to Infovis/Layout/vtkConeLayoutStrategy.h diff --git a/Infovis/vtkConstrained2DLayoutStrategy.cxx b/Infovis/Layout/vtkConstrained2DLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkConstrained2DLayoutStrategy.cxx rename to Infovis/Layout/vtkConstrained2DLayoutStrategy.cxx diff --git a/Infovis/vtkConstrained2DLayoutStrategy.h b/Infovis/Layout/vtkConstrained2DLayoutStrategy.h similarity index 100% rename from Infovis/vtkConstrained2DLayoutStrategy.h rename to Infovis/Layout/vtkConstrained2DLayoutStrategy.h diff --git a/Infovis/vtkCosmicTreeLayoutStrategy.cxx b/Infovis/Layout/vtkCosmicTreeLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkCosmicTreeLayoutStrategy.cxx rename to Infovis/Layout/vtkCosmicTreeLayoutStrategy.cxx diff --git a/Infovis/vtkCosmicTreeLayoutStrategy.h b/Infovis/Layout/vtkCosmicTreeLayoutStrategy.h similarity index 100% rename from Infovis/vtkCosmicTreeLayoutStrategy.h rename to Infovis/Layout/vtkCosmicTreeLayoutStrategy.h diff --git a/Infovis/vtkEdgeLayout.cxx b/Infovis/Layout/vtkEdgeLayout.cxx similarity index 100% rename from Infovis/vtkEdgeLayout.cxx rename to Infovis/Layout/vtkEdgeLayout.cxx diff --git a/Infovis/vtkEdgeLayout.h b/Infovis/Layout/vtkEdgeLayout.h similarity index 100% rename from Infovis/vtkEdgeLayout.h rename to Infovis/Layout/vtkEdgeLayout.h diff --git a/Infovis/vtkEdgeLayoutStrategy.cxx b/Infovis/Layout/vtkEdgeLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkEdgeLayoutStrategy.cxx rename to Infovis/Layout/vtkEdgeLayoutStrategy.cxx diff --git a/Infovis/vtkEdgeLayoutStrategy.h b/Infovis/Layout/vtkEdgeLayoutStrategy.h similarity index 100% rename from Infovis/vtkEdgeLayoutStrategy.h rename to Infovis/Layout/vtkEdgeLayoutStrategy.h diff --git a/Infovis/vtkFast2DLayoutStrategy.cxx b/Infovis/Layout/vtkFast2DLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkFast2DLayoutStrategy.cxx rename to Infovis/Layout/vtkFast2DLayoutStrategy.cxx diff --git a/Infovis/vtkFast2DLayoutStrategy.h b/Infovis/Layout/vtkFast2DLayoutStrategy.h similarity index 100% rename from Infovis/vtkFast2DLayoutStrategy.h rename to Infovis/Layout/vtkFast2DLayoutStrategy.h diff --git a/Infovis/vtkForceDirectedLayoutStrategy.cxx b/Infovis/Layout/vtkForceDirectedLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkForceDirectedLayoutStrategy.cxx rename to Infovis/Layout/vtkForceDirectedLayoutStrategy.cxx diff --git a/Infovis/vtkForceDirectedLayoutStrategy.h b/Infovis/Layout/vtkForceDirectedLayoutStrategy.h similarity index 100% rename from Infovis/vtkForceDirectedLayoutStrategy.h rename to Infovis/Layout/vtkForceDirectedLayoutStrategy.h diff --git a/Infovis/vtkGeoEdgeStrategy.cxx b/Infovis/Layout/vtkGeoEdgeStrategy.cxx similarity index 100% rename from Infovis/vtkGeoEdgeStrategy.cxx rename to Infovis/Layout/vtkGeoEdgeStrategy.cxx diff --git a/Infovis/vtkGeoEdgeStrategy.h b/Infovis/Layout/vtkGeoEdgeStrategy.h similarity index 100% rename from Infovis/vtkGeoEdgeStrategy.h rename to Infovis/Layout/vtkGeoEdgeStrategy.h diff --git a/Infovis/vtkGeoMath.cxx b/Infovis/Layout/vtkGeoMath.cxx similarity index 100% rename from Infovis/vtkGeoMath.cxx rename to Infovis/Layout/vtkGeoMath.cxx diff --git a/Infovis/vtkGeoMath.h b/Infovis/Layout/vtkGeoMath.h similarity index 100% rename from Infovis/vtkGeoMath.h rename to Infovis/Layout/vtkGeoMath.h diff --git a/Infovis/vtkGraphLayout.cxx b/Infovis/Layout/vtkGraphLayout.cxx similarity index 100% rename from Infovis/vtkGraphLayout.cxx rename to Infovis/Layout/vtkGraphLayout.cxx diff --git a/Infovis/vtkGraphLayout.h b/Infovis/Layout/vtkGraphLayout.h similarity index 100% rename from Infovis/vtkGraphLayout.h rename to Infovis/Layout/vtkGraphLayout.h diff --git a/Infovis/vtkGraphLayoutStrategy.cxx b/Infovis/Layout/vtkGraphLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkGraphLayoutStrategy.cxx rename to Infovis/Layout/vtkGraphLayoutStrategy.cxx diff --git a/Infovis/vtkGraphLayoutStrategy.h b/Infovis/Layout/vtkGraphLayoutStrategy.h similarity index 100% rename from Infovis/vtkGraphLayoutStrategy.h rename to Infovis/Layout/vtkGraphLayoutStrategy.h diff --git a/Infovis/vtkKCoreLayout.cxx b/Infovis/Layout/vtkKCoreLayout.cxx similarity index 100% rename from Infovis/vtkKCoreLayout.cxx rename to Infovis/Layout/vtkKCoreLayout.cxx diff --git a/Infovis/vtkKCoreLayout.h b/Infovis/Layout/vtkKCoreLayout.h similarity index 100% rename from Infovis/vtkKCoreLayout.h rename to Infovis/Layout/vtkKCoreLayout.h diff --git a/Infovis/vtkPassThroughEdgeStrategy.cxx b/Infovis/Layout/vtkPassThroughEdgeStrategy.cxx similarity index 100% rename from Infovis/vtkPassThroughEdgeStrategy.cxx rename to Infovis/Layout/vtkPassThroughEdgeStrategy.cxx diff --git a/Infovis/vtkPassThroughEdgeStrategy.h b/Infovis/Layout/vtkPassThroughEdgeStrategy.h similarity index 100% rename from Infovis/vtkPassThroughEdgeStrategy.h rename to Infovis/Layout/vtkPassThroughEdgeStrategy.h diff --git a/Infovis/vtkPassThroughLayoutStrategy.cxx b/Infovis/Layout/vtkPassThroughLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkPassThroughLayoutStrategy.cxx rename to Infovis/Layout/vtkPassThroughLayoutStrategy.cxx diff --git a/Infovis/vtkPassThroughLayoutStrategy.h b/Infovis/Layout/vtkPassThroughLayoutStrategy.h similarity index 100% rename from Infovis/vtkPassThroughLayoutStrategy.h rename to Infovis/Layout/vtkPassThroughLayoutStrategy.h diff --git a/Infovis/vtkPerturbCoincidentVertices.cxx b/Infovis/Layout/vtkPerturbCoincidentVertices.cxx similarity index 100% rename from Infovis/vtkPerturbCoincidentVertices.cxx rename to Infovis/Layout/vtkPerturbCoincidentVertices.cxx diff --git a/Infovis/vtkPerturbCoincidentVertices.h b/Infovis/Layout/vtkPerturbCoincidentVertices.h similarity index 100% rename from Infovis/vtkPerturbCoincidentVertices.h rename to Infovis/Layout/vtkPerturbCoincidentVertices.h diff --git a/Infovis/vtkRandomLayoutStrategy.cxx b/Infovis/Layout/vtkRandomLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkRandomLayoutStrategy.cxx rename to Infovis/Layout/vtkRandomLayoutStrategy.cxx diff --git a/Infovis/vtkRandomLayoutStrategy.h b/Infovis/Layout/vtkRandomLayoutStrategy.h similarity index 100% rename from Infovis/vtkRandomLayoutStrategy.h rename to Infovis/Layout/vtkRandomLayoutStrategy.h diff --git a/Infovis/vtkSimple2DLayoutStrategy.cxx b/Infovis/Layout/vtkSimple2DLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkSimple2DLayoutStrategy.cxx rename to Infovis/Layout/vtkSimple2DLayoutStrategy.cxx diff --git a/Infovis/vtkSimple2DLayoutStrategy.h b/Infovis/Layout/vtkSimple2DLayoutStrategy.h similarity index 100% rename from Infovis/vtkSimple2DLayoutStrategy.h rename to Infovis/Layout/vtkSimple2DLayoutStrategy.h diff --git a/Infovis/vtkSimple3DCirclesStrategy.cxx b/Infovis/Layout/vtkSimple3DCirclesStrategy.cxx similarity index 100% rename from Infovis/vtkSimple3DCirclesStrategy.cxx rename to Infovis/Layout/vtkSimple3DCirclesStrategy.cxx diff --git a/Infovis/vtkSimple3DCirclesStrategy.h b/Infovis/Layout/vtkSimple3DCirclesStrategy.h similarity index 100% rename from Infovis/vtkSimple3DCirclesStrategy.h rename to Infovis/Layout/vtkSimple3DCirclesStrategy.h diff --git a/Infovis/vtkSliceAndDiceLayoutStrategy.cxx b/Infovis/Layout/vtkSliceAndDiceLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkSliceAndDiceLayoutStrategy.cxx rename to Infovis/Layout/vtkSliceAndDiceLayoutStrategy.cxx diff --git a/Infovis/vtkSliceAndDiceLayoutStrategy.h b/Infovis/Layout/vtkSliceAndDiceLayoutStrategy.h similarity index 100% rename from Infovis/vtkSliceAndDiceLayoutStrategy.h rename to Infovis/Layout/vtkSliceAndDiceLayoutStrategy.h diff --git a/Infovis/vtkSpanTreeLayoutStrategy.cxx b/Infovis/Layout/vtkSpanTreeLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkSpanTreeLayoutStrategy.cxx rename to Infovis/Layout/vtkSpanTreeLayoutStrategy.cxx diff --git a/Infovis/vtkSpanTreeLayoutStrategy.h b/Infovis/Layout/vtkSpanTreeLayoutStrategy.h similarity index 100% rename from Infovis/vtkSpanTreeLayoutStrategy.h rename to Infovis/Layout/vtkSpanTreeLayoutStrategy.h diff --git a/Infovis/vtkSplineGraphEdges.cxx b/Infovis/Layout/vtkSplineGraphEdges.cxx similarity index 100% rename from Infovis/vtkSplineGraphEdges.cxx rename to Infovis/Layout/vtkSplineGraphEdges.cxx diff --git a/Infovis/vtkSplineGraphEdges.h b/Infovis/Layout/vtkSplineGraphEdges.h similarity index 100% rename from Infovis/vtkSplineGraphEdges.h rename to Infovis/Layout/vtkSplineGraphEdges.h diff --git a/Infovis/vtkSquarifyLayoutStrategy.cxx b/Infovis/Layout/vtkSquarifyLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkSquarifyLayoutStrategy.cxx rename to Infovis/Layout/vtkSquarifyLayoutStrategy.cxx diff --git a/Infovis/vtkSquarifyLayoutStrategy.h b/Infovis/Layout/vtkSquarifyLayoutStrategy.h similarity index 100% rename from Infovis/vtkSquarifyLayoutStrategy.h rename to Infovis/Layout/vtkSquarifyLayoutStrategy.h diff --git a/Infovis/vtkStackedTreeLayoutStrategy.cxx b/Infovis/Layout/vtkStackedTreeLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkStackedTreeLayoutStrategy.cxx rename to Infovis/Layout/vtkStackedTreeLayoutStrategy.cxx diff --git a/Infovis/vtkStackedTreeLayoutStrategy.h b/Infovis/Layout/vtkStackedTreeLayoutStrategy.h similarity index 100% rename from Infovis/vtkStackedTreeLayoutStrategy.h rename to Infovis/Layout/vtkStackedTreeLayoutStrategy.h diff --git a/Infovis/vtkTreeLayoutStrategy.cxx b/Infovis/Layout/vtkTreeLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkTreeLayoutStrategy.cxx rename to Infovis/Layout/vtkTreeLayoutStrategy.cxx diff --git a/Infovis/vtkTreeLayoutStrategy.h b/Infovis/Layout/vtkTreeLayoutStrategy.h similarity index 100% rename from Infovis/vtkTreeLayoutStrategy.h rename to Infovis/Layout/vtkTreeLayoutStrategy.h diff --git a/Infovis/vtkTreeMapLayout.cxx b/Infovis/Layout/vtkTreeMapLayout.cxx similarity index 100% rename from Infovis/vtkTreeMapLayout.cxx rename to Infovis/Layout/vtkTreeMapLayout.cxx diff --git a/Infovis/vtkTreeMapLayout.h b/Infovis/Layout/vtkTreeMapLayout.h similarity index 100% rename from Infovis/vtkTreeMapLayout.h rename to Infovis/Layout/vtkTreeMapLayout.h diff --git a/Infovis/vtkTreeMapLayoutStrategy.cxx b/Infovis/Layout/vtkTreeMapLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkTreeMapLayoutStrategy.cxx rename to Infovis/Layout/vtkTreeMapLayoutStrategy.cxx diff --git a/Infovis/vtkTreeMapLayoutStrategy.h b/Infovis/Layout/vtkTreeMapLayoutStrategy.h similarity index 100% rename from Infovis/vtkTreeMapLayoutStrategy.h rename to Infovis/Layout/vtkTreeMapLayoutStrategy.h diff --git a/Infovis/vtkTreeMapToPolyData.cxx b/Infovis/Layout/vtkTreeMapToPolyData.cxx similarity index 100% rename from Infovis/vtkTreeMapToPolyData.cxx rename to Infovis/Layout/vtkTreeMapToPolyData.cxx diff --git a/Infovis/vtkTreeMapToPolyData.h b/Infovis/Layout/vtkTreeMapToPolyData.h similarity index 100% rename from Infovis/vtkTreeMapToPolyData.h rename to Infovis/Layout/vtkTreeMapToPolyData.h diff --git a/Infovis/vtkTreeOrbitLayoutStrategy.cxx b/Infovis/Layout/vtkTreeOrbitLayoutStrategy.cxx similarity index 100% rename from Infovis/vtkTreeOrbitLayoutStrategy.cxx rename to Infovis/Layout/vtkTreeOrbitLayoutStrategy.cxx diff --git a/Infovis/vtkTreeOrbitLayoutStrategy.h b/Infovis/Layout/vtkTreeOrbitLayoutStrategy.h similarity index 100% rename from Infovis/vtkTreeOrbitLayoutStrategy.h rename to Infovis/Layout/vtkTreeOrbitLayoutStrategy.h diff --git a/Infovis/vtkTreeRingToPolyData.cxx b/Infovis/Layout/vtkTreeRingToPolyData.cxx similarity index 100% rename from Infovis/vtkTreeRingToPolyData.cxx rename to Infovis/Layout/vtkTreeRingToPolyData.cxx diff --git a/Infovis/vtkTreeRingToPolyData.h b/Infovis/Layout/vtkTreeRingToPolyData.h similarity index 100% rename from Infovis/vtkTreeRingToPolyData.h rename to Infovis/Layout/vtkTreeRingToPolyData.h diff --git a/Parallel/Testing/Cxx/PBGLNamedVertexGraph.cxx b/Infovis/Parallel/Testing/Cxx/PBGLNamedVertexGraph.cxx similarity index 100% rename from Parallel/Testing/Cxx/PBGLNamedVertexGraph.cxx rename to Infovis/Parallel/Testing/Cxx/PBGLNamedVertexGraph.cxx diff --git a/Parallel/Testing/Cxx/PBGLRandomGraph.cxx b/Infovis/Parallel/Testing/Cxx/PBGLRandomGraph.cxx similarity index 100% rename from Parallel/Testing/Cxx/PBGLRandomGraph.cxx rename to Infovis/Parallel/Testing/Cxx/PBGLRandomGraph.cxx diff --git a/Infovis/Testing/Cxx/TestPBGLAlgorithms.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLAlgorithms.cxx similarity index 100% rename from Infovis/Testing/Cxx/TestPBGLAlgorithms.cxx rename to Infovis/Parallel/Testing/Cxx/TestPBGLAlgorithms.cxx diff --git a/Parallel/Testing/Cxx/TestPBGLCollapseGraph.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLCollapseGraph.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestPBGLCollapseGraph.cxx rename to Infovis/Parallel/Testing/Cxx/TestPBGLCollapseGraph.cxx diff --git a/Parallel/Testing/Cxx/TestPBGLCollectGraph.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLCollectGraph.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestPBGLCollectGraph.cxx rename to Infovis/Parallel/Testing/Cxx/TestPBGLCollectGraph.cxx diff --git a/Parallel/Testing/Cxx/TestPBGLEdgesPedigrees.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLEdgesPedigrees.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestPBGLEdgesPedigrees.cxx rename to Infovis/Parallel/Testing/Cxx/TestPBGLEdgesPedigrees.cxx diff --git a/Parallel/Testing/Cxx/TestPBGLGraphSQLReader.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReader.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestPBGLGraphSQLReader.cxx rename to Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReader.cxx diff --git a/Parallel/Testing/Cxx/TestPBGLGraphSQLReaderFile.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReaderFile.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestPBGLGraphSQLReaderFile.cxx rename to Infovis/Parallel/Testing/Cxx/TestPBGLGraphSQLReaderFile.cxx diff --git a/Parallel/Testing/Cxx/TestPBGLPedigrees.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLPedigrees.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestPBGLPedigrees.cxx rename to Infovis/Parallel/Testing/Cxx/TestPBGLPedigrees.cxx diff --git a/Parallel/Testing/Cxx/TestPBGLPipeline.cxx b/Infovis/Parallel/Testing/Cxx/TestPBGLPipeline.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestPBGLPipeline.cxx rename to Infovis/Parallel/Testing/Cxx/TestPBGLPipeline.cxx diff --git a/Parallel/Testing/Cxx/TestPRMATGraphSource.cxx b/Infovis/Parallel/Testing/Cxx/TestPRMATGraphSource.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestPRMATGraphSource.cxx rename to Infovis/Parallel/Testing/Cxx/TestPRMATGraphSource.cxx diff --git a/Parallel/Testing/Cxx/TestPRandomGraphSource.cxx b/Infovis/Parallel/Testing/Cxx/TestPRandomGraphSource.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestPRandomGraphSource.cxx rename to Infovis/Parallel/Testing/Cxx/TestPRandomGraphSource.cxx diff --git a/Parallel/vtkPBGLBreadthFirstSearch.cxx b/Infovis/Parallel/vtkPBGLBreadthFirstSearch.cxx similarity index 100% rename from Parallel/vtkPBGLBreadthFirstSearch.cxx rename to Infovis/Parallel/vtkPBGLBreadthFirstSearch.cxx diff --git a/Parallel/vtkPBGLBreadthFirstSearch.h b/Infovis/Parallel/vtkPBGLBreadthFirstSearch.h similarity index 100% rename from Parallel/vtkPBGLBreadthFirstSearch.h rename to Infovis/Parallel/vtkPBGLBreadthFirstSearch.h diff --git a/Parallel/vtkPBGLCollapseGraph.cxx b/Infovis/Parallel/vtkPBGLCollapseGraph.cxx similarity index 100% rename from Parallel/vtkPBGLCollapseGraph.cxx rename to Infovis/Parallel/vtkPBGLCollapseGraph.cxx diff --git a/Parallel/vtkPBGLCollapseGraph.h b/Infovis/Parallel/vtkPBGLCollapseGraph.h similarity index 100% rename from Parallel/vtkPBGLCollapseGraph.h rename to Infovis/Parallel/vtkPBGLCollapseGraph.h diff --git a/Parallel/vtkPBGLCollapseParallelEdges.cxx b/Infovis/Parallel/vtkPBGLCollapseParallelEdges.cxx similarity index 100% rename from Parallel/vtkPBGLCollapseParallelEdges.cxx rename to Infovis/Parallel/vtkPBGLCollapseParallelEdges.cxx diff --git a/Parallel/vtkPBGLCollapseParallelEdges.h b/Infovis/Parallel/vtkPBGLCollapseParallelEdges.h similarity index 100% rename from Parallel/vtkPBGLCollapseParallelEdges.h rename to Infovis/Parallel/vtkPBGLCollapseParallelEdges.h diff --git a/Parallel/vtkPBGLCollectGraph.cxx b/Infovis/Parallel/vtkPBGLCollectGraph.cxx similarity index 100% rename from Parallel/vtkPBGLCollectGraph.cxx rename to Infovis/Parallel/vtkPBGLCollectGraph.cxx diff --git a/Parallel/vtkPBGLCollectGraph.h b/Infovis/Parallel/vtkPBGLCollectGraph.h similarity index 100% rename from Parallel/vtkPBGLCollectGraph.h rename to Infovis/Parallel/vtkPBGLCollectGraph.h diff --git a/Parallel/vtkPBGLConnectedComponents.cxx b/Infovis/Parallel/vtkPBGLConnectedComponents.cxx similarity index 100% rename from Parallel/vtkPBGLConnectedComponents.cxx rename to Infovis/Parallel/vtkPBGLConnectedComponents.cxx diff --git a/Parallel/vtkPBGLConnectedComponents.h b/Infovis/Parallel/vtkPBGLConnectedComponents.h similarity index 100% rename from Parallel/vtkPBGLConnectedComponents.h rename to Infovis/Parallel/vtkPBGLConnectedComponents.h diff --git a/Parallel/vtkPBGLDistributedGraphHelper.cxx b/Infovis/Parallel/vtkPBGLDistributedGraphHelper.cxx similarity index 100% rename from Parallel/vtkPBGLDistributedGraphHelper.cxx rename to Infovis/Parallel/vtkPBGLDistributedGraphHelper.cxx diff --git a/Parallel/vtkPBGLDistributedGraphHelper.h b/Infovis/Parallel/vtkPBGLDistributedGraphHelper.h similarity index 100% rename from Parallel/vtkPBGLDistributedGraphHelper.h rename to Infovis/Parallel/vtkPBGLDistributedGraphHelper.h diff --git a/Parallel/vtkPBGLGraphAdapter.h b/Infovis/Parallel/vtkPBGLGraphAdapter.h similarity index 100% rename from Parallel/vtkPBGLGraphAdapter.h rename to Infovis/Parallel/vtkPBGLGraphAdapter.h diff --git a/Parallel/vtkPBGLGraphSQLReader.cxx b/Infovis/Parallel/vtkPBGLGraphSQLReader.cxx similarity index 100% rename from Parallel/vtkPBGLGraphSQLReader.cxx rename to Infovis/Parallel/vtkPBGLGraphSQLReader.cxx diff --git a/Parallel/vtkPBGLGraphSQLReader.h b/Infovis/Parallel/vtkPBGLGraphSQLReader.h similarity index 100% rename from Parallel/vtkPBGLGraphSQLReader.h rename to Infovis/Parallel/vtkPBGLGraphSQLReader.h diff --git a/Parallel/vtkPBGLMinimumSpanningTree.cxx b/Infovis/Parallel/vtkPBGLMinimumSpanningTree.cxx similarity index 100% rename from Parallel/vtkPBGLMinimumSpanningTree.cxx rename to Infovis/Parallel/vtkPBGLMinimumSpanningTree.cxx diff --git a/Parallel/vtkPBGLMinimumSpanningTree.h b/Infovis/Parallel/vtkPBGLMinimumSpanningTree.h similarity index 100% rename from Parallel/vtkPBGLMinimumSpanningTree.h rename to Infovis/Parallel/vtkPBGLMinimumSpanningTree.h diff --git a/Parallel/vtkPBGLRMATGraphSource.cxx b/Infovis/Parallel/vtkPBGLRMATGraphSource.cxx similarity index 100% rename from Parallel/vtkPBGLRMATGraphSource.cxx rename to Infovis/Parallel/vtkPBGLRMATGraphSource.cxx diff --git a/Parallel/vtkPBGLRMATGraphSource.h b/Infovis/Parallel/vtkPBGLRMATGraphSource.h similarity index 100% rename from Parallel/vtkPBGLRMATGraphSource.h rename to Infovis/Parallel/vtkPBGLRMATGraphSource.h diff --git a/Parallel/vtkPBGLRandomGraphSource.cxx b/Infovis/Parallel/vtkPBGLRandomGraphSource.cxx similarity index 100% rename from Parallel/vtkPBGLRandomGraphSource.cxx rename to Infovis/Parallel/vtkPBGLRandomGraphSource.cxx diff --git a/Parallel/vtkPBGLRandomGraphSource.h b/Infovis/Parallel/vtkPBGLRandomGraphSource.h similarity index 100% rename from Parallel/vtkPBGLRandomGraphSource.h rename to Infovis/Parallel/vtkPBGLRandomGraphSource.h diff --git a/Parallel/vtkPBGLShortestPaths.cxx b/Infovis/Parallel/vtkPBGLShortestPaths.cxx similarity index 100% rename from Parallel/vtkPBGLShortestPaths.cxx rename to Infovis/Parallel/vtkPBGLShortestPaths.cxx diff --git a/Parallel/vtkPBGLShortestPaths.h b/Infovis/Parallel/vtkPBGLShortestPaths.h similarity index 100% rename from Parallel/vtkPBGLShortestPaths.h rename to Infovis/Parallel/vtkPBGLShortestPaths.h diff --git a/Parallel/vtkPBGLVertexColoring.cxx b/Infovis/Parallel/vtkPBGLVertexColoring.cxx similarity index 100% rename from Parallel/vtkPBGLVertexColoring.cxx rename to Infovis/Parallel/vtkPBGLVertexColoring.cxx diff --git a/Parallel/vtkPBGLVertexColoring.h b/Infovis/Parallel/vtkPBGLVertexColoring.h similarity index 100% rename from Parallel/vtkPBGLVertexColoring.h rename to Infovis/Parallel/vtkPBGLVertexColoring.h diff --git a/Rendering/Testing/Tcl/TestFlyTo.tcl b/Interaction/Style/Testing/Tcl/TestFlyTo.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestFlyTo.tcl rename to Interaction/Style/Testing/Tcl/TestFlyTo.tcl diff --git a/Rendering/Testing/Tcl/TestInteractorStyleTerrain.tcl b/Interaction/Style/Testing/Tcl/TestInteractorStyleTerrain.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestInteractorStyleTerrain.tcl rename to Interaction/Style/Testing/Tcl/TestInteractorStyleTerrain.tcl diff --git a/Rendering/Testing/Tcl/TestStyleBase.tcl b/Interaction/Style/Testing/Tcl/TestStyleBase.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestStyleBase.tcl rename to Interaction/Style/Testing/Tcl/TestStyleBase.tcl diff --git a/Rendering/Testing/Tcl/TestStyleBaseSpike.tcl b/Interaction/Style/Testing/Tcl/TestStyleBaseSpike.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestStyleBaseSpike.tcl rename to Interaction/Style/Testing/Tcl/TestStyleBaseSpike.tcl diff --git a/Rendering/Testing/Tcl/TestStyleJoystickActor.tcl b/Interaction/Style/Testing/Tcl/TestStyleJoystickActor.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestStyleJoystickActor.tcl rename to Interaction/Style/Testing/Tcl/TestStyleJoystickActor.tcl diff --git a/Rendering/Testing/Tcl/TestStyleJoystickCamera.tcl b/Interaction/Style/Testing/Tcl/TestStyleJoystickCamera.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestStyleJoystickCamera.tcl rename to Interaction/Style/Testing/Tcl/TestStyleJoystickCamera.tcl diff --git a/Rendering/Testing/Tcl/TestStyleRubberBandZoom.tcl b/Interaction/Style/Testing/Tcl/TestStyleRubberBandZoom.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestStyleRubberBandZoom.tcl rename to Interaction/Style/Testing/Tcl/TestStyleRubberBandZoom.tcl diff --git a/Rendering/Testing/Tcl/TestStyleTerrain.tcl b/Interaction/Style/Testing/Tcl/TestStyleTerrain.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestStyleTerrain.tcl rename to Interaction/Style/Testing/Tcl/TestStyleTerrain.tcl diff --git a/Rendering/Testing/Tcl/TestStyleTrackballActor.tcl b/Interaction/Style/Testing/Tcl/TestStyleTrackballActor.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestStyleTrackballActor.tcl rename to Interaction/Style/Testing/Tcl/TestStyleTrackballActor.tcl diff --git a/Rendering/Testing/Tcl/TestStyleTrackballCamera.tcl b/Interaction/Style/Testing/Tcl/TestStyleTrackballCamera.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestStyleTrackballCamera.tcl rename to Interaction/Style/Testing/Tcl/TestStyleTrackballCamera.tcl diff --git a/Rendering/vtkInteractorStyleFlight.cxx b/Interaction/Style/vtkInteractorStyleFlight.cxx similarity index 100% rename from Rendering/vtkInteractorStyleFlight.cxx rename to Interaction/Style/vtkInteractorStyleFlight.cxx diff --git a/Rendering/vtkInteractorStyleFlight.h b/Interaction/Style/vtkInteractorStyleFlight.h similarity index 100% rename from Rendering/vtkInteractorStyleFlight.h rename to Interaction/Style/vtkInteractorStyleFlight.h diff --git a/Rendering/vtkInteractorStyleImage.cxx b/Interaction/Style/vtkInteractorStyleImage.cxx similarity index 100% rename from Rendering/vtkInteractorStyleImage.cxx rename to Interaction/Style/vtkInteractorStyleImage.cxx diff --git a/Rendering/vtkInteractorStyleImage.h b/Interaction/Style/vtkInteractorStyleImage.h similarity index 100% rename from Rendering/vtkInteractorStyleImage.h rename to Interaction/Style/vtkInteractorStyleImage.h diff --git a/Rendering/vtkInteractorStyleJoystickActor.cxx b/Interaction/Style/vtkInteractorStyleJoystickActor.cxx similarity index 100% rename from Rendering/vtkInteractorStyleJoystickActor.cxx rename to Interaction/Style/vtkInteractorStyleJoystickActor.cxx diff --git a/Rendering/vtkInteractorStyleJoystickActor.h b/Interaction/Style/vtkInteractorStyleJoystickActor.h similarity index 100% rename from Rendering/vtkInteractorStyleJoystickActor.h rename to Interaction/Style/vtkInteractorStyleJoystickActor.h diff --git a/Rendering/vtkInteractorStyleJoystickCamera.cxx b/Interaction/Style/vtkInteractorStyleJoystickCamera.cxx similarity index 100% rename from Rendering/vtkInteractorStyleJoystickCamera.cxx rename to Interaction/Style/vtkInteractorStyleJoystickCamera.cxx diff --git a/Rendering/vtkInteractorStyleJoystickCamera.h b/Interaction/Style/vtkInteractorStyleJoystickCamera.h similarity index 100% rename from Rendering/vtkInteractorStyleJoystickCamera.h rename to Interaction/Style/vtkInteractorStyleJoystickCamera.h diff --git a/Rendering/vtkInteractorStyleRubberBand2D.cxx b/Interaction/Style/vtkInteractorStyleRubberBand2D.cxx similarity index 100% rename from Rendering/vtkInteractorStyleRubberBand2D.cxx rename to Interaction/Style/vtkInteractorStyleRubberBand2D.cxx diff --git a/Rendering/vtkInteractorStyleRubberBand2D.h b/Interaction/Style/vtkInteractorStyleRubberBand2D.h similarity index 100% rename from Rendering/vtkInteractorStyleRubberBand2D.h rename to Interaction/Style/vtkInteractorStyleRubberBand2D.h diff --git a/Rendering/vtkInteractorStyleRubberBand3D.cxx b/Interaction/Style/vtkInteractorStyleRubberBand3D.cxx similarity index 100% rename from Rendering/vtkInteractorStyleRubberBand3D.cxx rename to Interaction/Style/vtkInteractorStyleRubberBand3D.cxx diff --git a/Rendering/vtkInteractorStyleRubberBand3D.h b/Interaction/Style/vtkInteractorStyleRubberBand3D.h similarity index 100% rename from Rendering/vtkInteractorStyleRubberBand3D.h rename to Interaction/Style/vtkInteractorStyleRubberBand3D.h diff --git a/Rendering/vtkInteractorStyleRubberBandPick.cxx b/Interaction/Style/vtkInteractorStyleRubberBandPick.cxx similarity index 100% rename from Rendering/vtkInteractorStyleRubberBandPick.cxx rename to Interaction/Style/vtkInteractorStyleRubberBandPick.cxx diff --git a/Rendering/vtkInteractorStyleRubberBandPick.h b/Interaction/Style/vtkInteractorStyleRubberBandPick.h similarity index 100% rename from Rendering/vtkInteractorStyleRubberBandPick.h rename to Interaction/Style/vtkInteractorStyleRubberBandPick.h diff --git a/Rendering/vtkInteractorStyleRubberBandZoom.cxx b/Interaction/Style/vtkInteractorStyleRubberBandZoom.cxx similarity index 100% rename from Rendering/vtkInteractorStyleRubberBandZoom.cxx rename to Interaction/Style/vtkInteractorStyleRubberBandZoom.cxx diff --git a/Rendering/vtkInteractorStyleRubberBandZoom.h b/Interaction/Style/vtkInteractorStyleRubberBandZoom.h similarity index 100% rename from Rendering/vtkInteractorStyleRubberBandZoom.h rename to Interaction/Style/vtkInteractorStyleRubberBandZoom.h diff --git a/Rendering/vtkInteractorStyleSwitch.cxx b/Interaction/Style/vtkInteractorStyleSwitch.cxx similarity index 100% rename from Rendering/vtkInteractorStyleSwitch.cxx rename to Interaction/Style/vtkInteractorStyleSwitch.cxx diff --git a/Rendering/vtkInteractorStyleSwitch.h b/Interaction/Style/vtkInteractorStyleSwitch.h similarity index 100% rename from Rendering/vtkInteractorStyleSwitch.h rename to Interaction/Style/vtkInteractorStyleSwitch.h diff --git a/Rendering/vtkInteractorStyleTerrain.cxx b/Interaction/Style/vtkInteractorStyleTerrain.cxx similarity index 100% rename from Rendering/vtkInteractorStyleTerrain.cxx rename to Interaction/Style/vtkInteractorStyleTerrain.cxx diff --git a/Rendering/vtkInteractorStyleTerrain.h b/Interaction/Style/vtkInteractorStyleTerrain.h similarity index 100% rename from Rendering/vtkInteractorStyleTerrain.h rename to Interaction/Style/vtkInteractorStyleTerrain.h diff --git a/Rendering/vtkInteractorStyleTrackball.cxx b/Interaction/Style/vtkInteractorStyleTrackball.cxx similarity index 100% rename from Rendering/vtkInteractorStyleTrackball.cxx rename to Interaction/Style/vtkInteractorStyleTrackball.cxx diff --git a/Rendering/vtkInteractorStyleTrackball.h b/Interaction/Style/vtkInteractorStyleTrackball.h similarity index 100% rename from Rendering/vtkInteractorStyleTrackball.h rename to Interaction/Style/vtkInteractorStyleTrackball.h diff --git a/Rendering/vtkInteractorStyleTrackballActor.cxx b/Interaction/Style/vtkInteractorStyleTrackballActor.cxx similarity index 100% rename from Rendering/vtkInteractorStyleTrackballActor.cxx rename to Interaction/Style/vtkInteractorStyleTrackballActor.cxx diff --git a/Rendering/vtkInteractorStyleTrackballActor.h b/Interaction/Style/vtkInteractorStyleTrackballActor.h similarity index 100% rename from Rendering/vtkInteractorStyleTrackballActor.h rename to Interaction/Style/vtkInteractorStyleTrackballActor.h diff --git a/Rendering/vtkInteractorStyleTrackballCamera.cxx b/Interaction/Style/vtkInteractorStyleTrackballCamera.cxx similarity index 100% rename from Rendering/vtkInteractorStyleTrackballCamera.cxx rename to Interaction/Style/vtkInteractorStyleTrackballCamera.cxx diff --git a/Rendering/vtkInteractorStyleTrackballCamera.h b/Interaction/Style/vtkInteractorStyleTrackballCamera.h similarity index 100% rename from Rendering/vtkInteractorStyleTrackballCamera.h rename to Interaction/Style/vtkInteractorStyleTrackballCamera.h diff --git a/Rendering/vtkInteractorStyleUnicam.cxx b/Interaction/Style/vtkInteractorStyleUnicam.cxx similarity index 100% rename from Rendering/vtkInteractorStyleUnicam.cxx rename to Interaction/Style/vtkInteractorStyleUnicam.cxx diff --git a/Rendering/vtkInteractorStyleUnicam.h b/Interaction/Style/vtkInteractorStyleUnicam.h similarity index 100% rename from Rendering/vtkInteractorStyleUnicam.h rename to Interaction/Style/vtkInteractorStyleUnicam.h diff --git a/Rendering/vtkInteractorStyleUser.cxx b/Interaction/Style/vtkInteractorStyleUser.cxx similarity index 100% rename from Rendering/vtkInteractorStyleUser.cxx rename to Interaction/Style/vtkInteractorStyleUser.cxx diff --git a/Rendering/vtkInteractorStyleUser.h b/Interaction/Style/vtkInteractorStyleUser.h similarity index 100% rename from Rendering/vtkInteractorStyleUser.h rename to Interaction/Style/vtkInteractorStyleUser.h diff --git a/Rendering/vtkParallelCoordinatesInteractorStyle.cxx b/Interaction/Style/vtkParallelCoordinatesInteractorStyle.cxx similarity index 100% rename from Rendering/vtkParallelCoordinatesInteractorStyle.cxx rename to Interaction/Style/vtkParallelCoordinatesInteractorStyle.cxx diff --git a/Rendering/vtkParallelCoordinatesInteractorStyle.h b/Interaction/Style/vtkParallelCoordinatesInteractorStyle.h similarity index 100% rename from Rendering/vtkParallelCoordinatesInteractorStyle.h rename to Interaction/Style/vtkParallelCoordinatesInteractorStyle.h diff --git a/Widgets/Testing/Cxx/BoxWidget.cxx b/Interaction/Widgets/Testing/Cxx/BoxWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/BoxWidget.cxx rename to Interaction/Widgets/Testing/Cxx/BoxWidget.cxx diff --git a/Widgets/Testing/Cxx/BoxWidget2.cxx b/Interaction/Widgets/Testing/Cxx/BoxWidget2.cxx similarity index 100% rename from Widgets/Testing/Cxx/BoxWidget2.cxx rename to Interaction/Widgets/Testing/Cxx/BoxWidget2.cxx diff --git a/Widgets/Testing/Cxx/CMakeLists.txt b/Interaction/Widgets/Testing/Cxx/CMakeLists.txt similarity index 100% rename from Widgets/Testing/Cxx/CMakeLists.txt rename to Interaction/Widgets/Testing/Cxx/CMakeLists.txt diff --git a/Widgets/Testing/Cxx/ImagePlaneWidget.cxx b/Interaction/Widgets/Testing/Cxx/ImagePlaneWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/ImagePlaneWidget.cxx rename to Interaction/Widgets/Testing/Cxx/ImagePlaneWidget.cxx diff --git a/Widgets/Testing/Cxx/ScaledBoxWidget2.cxx b/Interaction/Widgets/Testing/Cxx/ScaledBoxWidget2.cxx similarity index 100% rename from Widgets/Testing/Cxx/ScaledBoxWidget2.cxx rename to Interaction/Widgets/Testing/Cxx/ScaledBoxWidget2.cxx diff --git a/Widgets/Testing/Cxx/TerrainPolylineEditor.cxx b/Interaction/Widgets/Testing/Cxx/TerrainPolylineEditor.cxx similarity index 100% rename from Widgets/Testing/Cxx/TerrainPolylineEditor.cxx rename to Interaction/Widgets/Testing/Cxx/TerrainPolylineEditor.cxx diff --git a/Widgets/Testing/Cxx/TestAffineWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestAffineWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestAffineWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestAffineWidget.cxx diff --git a/Widgets/Testing/Cxx/TestAngleWidget2D.cxx b/Interaction/Widgets/Testing/Cxx/TestAngleWidget2D.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestAngleWidget2D.cxx rename to Interaction/Widgets/Testing/Cxx/TestAngleWidget2D.cxx diff --git a/Widgets/Testing/Cxx/TestAngleWidget3D.cxx b/Interaction/Widgets/Testing/Cxx/TestAngleWidget3D.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestAngleWidget3D.cxx rename to Interaction/Widgets/Testing/Cxx/TestAngleWidget3D.cxx diff --git a/Widgets/Testing/Cxx/TestAxesTransformWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestAxesTransformWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestAxesTransformWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestAxesTransformWidget.cxx diff --git a/Widgets/Testing/Cxx/TestBalloonWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestBalloonWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestBalloonWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestBalloonWidget.cxx diff --git a/Widgets/Testing/Cxx/TestBiDimensionalWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestBiDimensionalWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestBiDimensionalWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestBiDimensionalWidget.cxx diff --git a/Widgets/Testing/Cxx/TestBorderWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestBorderWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestBorderWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestBorderWidget.cxx diff --git a/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestBrokenLineWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestBrokenLineWidget.cxx diff --git a/Widgets/Testing/Cxx/TestButtonWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestButtonWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestButtonWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestButtonWidget.cxx diff --git a/Widgets/Testing/Cxx/TestCameraWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestCameraWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestCameraWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestCameraWidget.cxx diff --git a/Widgets/Testing/Cxx/TestCaptionWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestCaptionWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestCaptionWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestCaptionWidget.cxx diff --git a/Widgets/Testing/Cxx/TestCellCentersPointPlacer.cxx b/Interaction/Widgets/Testing/Cxx/TestCellCentersPointPlacer.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestCellCentersPointPlacer.cxx rename to Interaction/Widgets/Testing/Cxx/TestCellCentersPointPlacer.cxx diff --git a/Widgets/Testing/Cxx/TestCenteredSliderWidget2D.cxx b/Interaction/Widgets/Testing/Cxx/TestCenteredSliderWidget2D.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestCenteredSliderWidget2D.cxx rename to Interaction/Widgets/Testing/Cxx/TestCenteredSliderWidget2D.cxx diff --git a/Widgets/Testing/Cxx/TestCheckerboardWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestCheckerboardWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestCheckerboardWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestCheckerboardWidget.cxx diff --git a/Widgets/Testing/Cxx/TestConstrainedHandleWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestConstrainedHandleWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestConstrainedHandleWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestConstrainedHandleWidget.cxx diff --git a/Widgets/Testing/Cxx/TestContourWidget2.cxx b/Interaction/Widgets/Testing/Cxx/TestContourWidget2.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestContourWidget2.cxx rename to Interaction/Widgets/Testing/Cxx/TestContourWidget2.cxx diff --git a/Widgets/Testing/Cxx/TestDijkstraGraphGeodesicPath.cxx b/Interaction/Widgets/Testing/Cxx/TestDijkstraGraphGeodesicPath.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestDijkstraGraphGeodesicPath.cxx rename to Interaction/Widgets/Testing/Cxx/TestDijkstraGraphGeodesicPath.cxx diff --git a/Widgets/Testing/Cxx/TestDijkstraImageGeodesicPath.cxx b/Interaction/Widgets/Testing/Cxx/TestDijkstraImageGeodesicPath.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestDijkstraImageGeodesicPath.cxx rename to Interaction/Widgets/Testing/Cxx/TestDijkstraImageGeodesicPath.cxx diff --git a/Widgets/Testing/Cxx/TestDistanceWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestDistanceWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestDistanceWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestDistanceWidget.cxx diff --git a/Widgets/Testing/Cxx/TestDistanceWidget3D.cxx b/Interaction/Widgets/Testing/Cxx/TestDistanceWidget3D.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestDistanceWidget3D.cxx rename to Interaction/Widgets/Testing/Cxx/TestDistanceWidget3D.cxx diff --git a/Widgets/Testing/Cxx/TestFixedSizeHandleRepresentation3D.cxx b/Interaction/Widgets/Testing/Cxx/TestFixedSizeHandleRepresentation3D.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestFixedSizeHandleRepresentation3D.cxx rename to Interaction/Widgets/Testing/Cxx/TestFixedSizeHandleRepresentation3D.cxx diff --git a/Widgets/Testing/Cxx/TestFocalPlaneContour.cxx b/Interaction/Widgets/Testing/Cxx/TestFocalPlaneContour.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestFocalPlaneContour.cxx rename to Interaction/Widgets/Testing/Cxx/TestFocalPlaneContour.cxx diff --git a/Widgets/Testing/Cxx/TestHandleWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestHandleWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestHandleWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestHandleWidget.cxx diff --git a/Widgets/Testing/Cxx/TestHandleWidget2D.cxx b/Interaction/Widgets/Testing/Cxx/TestHandleWidget2D.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestHandleWidget2D.cxx rename to Interaction/Widgets/Testing/Cxx/TestHandleWidget2D.cxx diff --git a/Widgets/Testing/Cxx/TestImageActorContourWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestImageActorContourWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestImageActorContourWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestImageActorContourWidget.cxx diff --git a/Widgets/Testing/Cxx/TestImageTracerWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestImageTracerWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestImageTracerWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestImageTracerWidget.cxx diff --git a/Widgets/Testing/Cxx/TestImplicitPlaneWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestImplicitPlaneWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget.cxx diff --git a/Widgets/Testing/Cxx/TestImplicitPlaneWidget2.cxx b/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestImplicitPlaneWidget2.cxx rename to Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2.cxx diff --git a/Widgets/Testing/Cxx/TestImplicitPlaneWidget2LockNormalToCamera.cxx b/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2LockNormalToCamera.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestImplicitPlaneWidget2LockNormalToCamera.cxx rename to Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2LockNormalToCamera.cxx diff --git a/Widgets/Testing/Cxx/TestImplicitPlaneWidget2b.cxx b/Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2b.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestImplicitPlaneWidget2b.cxx rename to Interaction/Widgets/Testing/Cxx/TestImplicitPlaneWidget2b.cxx diff --git a/Widgets/Testing/Cxx/TestLineWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestLineWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestLineWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestLineWidget.cxx diff --git a/Widgets/Testing/Cxx/TestLineWidget2.cxx b/Interaction/Widgets/Testing/Cxx/TestLineWidget2.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestLineWidget2.cxx rename to Interaction/Widgets/Testing/Cxx/TestLineWidget2.cxx diff --git a/Widgets/Testing/Cxx/TestLogoWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestLogoWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestLogoWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestLogoWidget.cxx diff --git a/Widgets/Testing/Cxx/TestLogoWidgetAlphaBlending.cxx b/Interaction/Widgets/Testing/Cxx/TestLogoWidgetAlphaBlending.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestLogoWidgetAlphaBlending.cxx rename to Interaction/Widgets/Testing/Cxx/TestLogoWidgetAlphaBlending.cxx diff --git a/Widgets/Testing/Cxx/TestLogoWidgetDepthPeeling.cxx b/Interaction/Widgets/Testing/Cxx/TestLogoWidgetDepthPeeling.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestLogoWidgetDepthPeeling.cxx rename to Interaction/Widgets/Testing/Cxx/TestLogoWidgetDepthPeeling.cxx diff --git a/Widgets/Testing/Cxx/TestOrientationMarkerWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestOrientationMarkerWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestOrientationMarkerWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestOrientationMarkerWidget.cxx diff --git a/Widgets/Testing/Cxx/TestOrientedGlyphContour.cxx b/Interaction/Widgets/Testing/Cxx/TestOrientedGlyphContour.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestOrientedGlyphContour.cxx rename to Interaction/Widgets/Testing/Cxx/TestOrientedGlyphContour.cxx diff --git a/Widgets/Testing/Cxx/TestOrthoPlanes.cxx b/Interaction/Widgets/Testing/Cxx/TestOrthoPlanes.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestOrthoPlanes.cxx rename to Interaction/Widgets/Testing/Cxx/TestOrthoPlanes.cxx diff --git a/Widgets/Testing/Cxx/TestParallelopipedWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestParallelopipedWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestParallelopipedWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestParallelopipedWidget.cxx diff --git a/Widgets/Testing/Cxx/TestPlaneWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestPlaneWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestPlaneWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestPlaneWidget.cxx diff --git a/Widgets/Testing/Cxx/TestPlaybackWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestPlaybackWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestPlaybackWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestPlaybackWidget.cxx diff --git a/Widgets/Testing/Cxx/TestPointHandleRepresentation3D.cxx b/Interaction/Widgets/Testing/Cxx/TestPointHandleRepresentation3D.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestPointHandleRepresentation3D.cxx rename to Interaction/Widgets/Testing/Cxx/TestPointHandleRepresentation3D.cxx diff --git a/Widgets/Testing/Cxx/TestPointWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestPointWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestPointWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestPointWidget.cxx diff --git a/Widgets/Testing/Cxx/TestPolyPlane.cxx b/Interaction/Widgets/Testing/Cxx/TestPolyPlane.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestPolyPlane.cxx rename to Interaction/Widgets/Testing/Cxx/TestPolyPlane.cxx diff --git a/Widgets/Testing/Cxx/TestPolygonalHandleRepresentations.cxx b/Interaction/Widgets/Testing/Cxx/TestPolygonalHandleRepresentations.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestPolygonalHandleRepresentations.cxx rename to Interaction/Widgets/Testing/Cxx/TestPolygonalHandleRepresentations.cxx diff --git a/Widgets/Testing/Cxx/TestPolygonalRepresentationHandleWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestPolygonalRepresentationHandleWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestPolygonalRepresentationHandleWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestPolygonalRepresentationHandleWidget.cxx diff --git a/Widgets/Testing/Cxx/TestPolygonalSurfaceConstrainedDistanceWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestPolygonalSurfaceConstrainedDistanceWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestPolygonalSurfaceConstrainedDistanceWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestPolygonalSurfaceConstrainedDistanceWidget.cxx diff --git a/Widgets/Testing/Cxx/TestProgrammaticPlacement.cxx b/Interaction/Widgets/Testing/Cxx/TestProgrammaticPlacement.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestProgrammaticPlacement.cxx rename to Interaction/Widgets/Testing/Cxx/TestProgrammaticPlacement.cxx diff --git a/Widgets/Testing/Cxx/TestRectilinearWipeWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestRectilinearWipeWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestRectilinearWipeWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestRectilinearWipeWidget.cxx diff --git a/Widgets/Testing/Cxx/TestResliceCursorWidget2.cxx b/Interaction/Widgets/Testing/Cxx/TestResliceCursorWidget2.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestResliceCursorWidget2.cxx rename to Interaction/Widgets/Testing/Cxx/TestResliceCursorWidget2.cxx diff --git a/Widgets/Testing/Cxx/TestResliceCursorWidget3.cxx b/Interaction/Widgets/Testing/Cxx/TestResliceCursorWidget3.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestResliceCursorWidget3.cxx rename to Interaction/Widgets/Testing/Cxx/TestResliceCursorWidget3.cxx diff --git a/Widgets/Testing/Cxx/TestScalarBarWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestScalarBarWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestScalarBarWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestScalarBarWidget.cxx diff --git a/Widgets/Testing/Cxx/TestSeedWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestSeedWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestSeedWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestSeedWidget.cxx diff --git a/Widgets/Testing/Cxx/TestSeedWidget2.cxx b/Interaction/Widgets/Testing/Cxx/TestSeedWidget2.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestSeedWidget2.cxx rename to Interaction/Widgets/Testing/Cxx/TestSeedWidget2.cxx diff --git a/Widgets/Testing/Cxx/TestSeedWidgetNonUniformRepresentations.cxx b/Interaction/Widgets/Testing/Cxx/TestSeedWidgetNonUniformRepresentations.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestSeedWidgetNonUniformRepresentations.cxx rename to Interaction/Widgets/Testing/Cxx/TestSeedWidgetNonUniformRepresentations.cxx diff --git a/Widgets/Testing/Cxx/TestSliderWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestSliderWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestSliderWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestSliderWidget.cxx diff --git a/Widgets/Testing/Cxx/TestSliderWidget2D.cxx b/Interaction/Widgets/Testing/Cxx/TestSliderWidget2D.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestSliderWidget2D.cxx rename to Interaction/Widgets/Testing/Cxx/TestSliderWidget2D.cxx diff --git a/Widgets/Testing/Cxx/TestSphereHandleWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestSphereHandleWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestSphereHandleWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestSphereHandleWidget.cxx diff --git a/Widgets/Testing/Cxx/TestSplineWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestSplineWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestSplineWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestSplineWidget.cxx diff --git a/Widgets/Testing/Cxx/TestSurfaceConstrainedHandleWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestSurfaceConstrainedHandleWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestSurfaceConstrainedHandleWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestSurfaceConstrainedHandleWidget.cxx diff --git a/Widgets/Testing/Cxx/TestTensorProbeWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestTensorProbeWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestTensorProbeWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestTensorProbeWidget.cxx diff --git a/Widgets/Testing/Cxx/TestTextWidget.cxx b/Interaction/Widgets/Testing/Cxx/TestTextWidget.cxx similarity index 100% rename from Widgets/Testing/Cxx/TestTextWidget.cxx rename to Interaction/Widgets/Testing/Cxx/TestTextWidget.cxx diff --git a/Widgets/Testing/Cxx/WidgetTestingMacros.h b/Interaction/Widgets/Testing/Cxx/WidgetTestingMacros.h similarity index 100% rename from Widgets/Testing/Cxx/WidgetTestingMacros.h rename to Interaction/Widgets/Testing/Cxx/WidgetTestingMacros.h diff --git a/Widgets/Testing/Cxx/vtkAngleRepresentation2DTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkAngleRepresentation2DTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkAngleRepresentation2DTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkAngleRepresentation2DTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkAngleRepresentation3DTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkAngleRepresentation3DTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkAngleRepresentation3DTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkAngleRepresentation3DTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkAngleWidgetTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkAngleWidgetTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkAngleWidgetTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkAngleWidgetTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkBalloonRepresentationTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkBalloonRepresentationTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkBalloonRepresentationTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkBalloonRepresentationTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkBalloonWidgetTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkBalloonWidgetTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkBalloonWidgetTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkBalloonWidgetTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkBiDimensionalRepresentation2DTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkBiDimensionalRepresentation2DTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkBiDimensionalRepresentation2DTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkBiDimensionalRepresentation2DTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkBiDimensionalWidgetTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkBiDimensionalWidgetTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkBiDimensionalWidgetTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkBiDimensionalWidgetTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkBorderWidgetTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkBorderWidgetTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkBorderWidgetTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkBorderWidgetTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkCaptionRepresentationTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkCaptionRepresentationTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkCaptionRepresentationTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkCaptionRepresentationTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkCaptionWidgetTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkCaptionWidgetTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkCaptionWidgetTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkCaptionWidgetTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkConstrainedPointHandleRepresentationTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkConstrainedPointHandleRepresentationTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkConstrainedPointHandleRepresentationTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkConstrainedPointHandleRepresentationTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkHoverWidgetTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkHoverWidgetTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkHoverWidgetTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkHoverWidgetTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkImplicitPlaneRepresentationTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkImplicitPlaneRepresentationTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkImplicitPlaneRepresentationTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkImplicitPlaneRepresentationTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkImplicitPlaneWidget2Test1.cxx b/Interaction/Widgets/Testing/Cxx/vtkImplicitPlaneWidget2Test1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkImplicitPlaneWidget2Test1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkImplicitPlaneWidget2Test1.cxx diff --git a/Widgets/Testing/Cxx/vtkLineRepresentationTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkLineRepresentationTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkLineRepresentationTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkLineRepresentationTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkLineWidget2Test1.cxx b/Interaction/Widgets/Testing/Cxx/vtkLineWidget2Test1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkLineWidget2Test1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkLineWidget2Test1.cxx diff --git a/Widgets/Testing/Cxx/vtkOrientedPolygonalHandleRepresentation3DTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkOrientedPolygonalHandleRepresentation3DTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkOrientedPolygonalHandleRepresentation3DTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkOrientedPolygonalHandleRepresentation3DTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkPointHandleRepresentation2DTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkPointHandleRepresentation2DTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkPointHandleRepresentation2DTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkPointHandleRepresentation2DTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkPointHandleRepresentation3DTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkPointHandleRepresentation3DTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkPointHandleRepresentation3DTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkPointHandleRepresentation3DTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkPolygonalHandleRepresentation3DTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkPolygonalHandleRepresentation3DTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkPolygonalHandleRepresentation3DTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkPolygonalHandleRepresentation3DTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkSeedRepresentationTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkSeedRepresentationTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkSeedRepresentationTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkSeedRepresentationTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkSeedWidgetTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkSeedWidgetTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkSeedWidgetTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkSeedWidgetTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkSphereHandleRepresentationTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkSphereHandleRepresentationTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkSphereHandleRepresentationTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkSphereHandleRepresentationTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkSplineRepresentationTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkSplineRepresentationTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkSplineRepresentationTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkSplineRepresentationTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkSplineWidget2Test1.cxx b/Interaction/Widgets/Testing/Cxx/vtkSplineWidget2Test1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkSplineWidget2Test1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkSplineWidget2Test1.cxx diff --git a/Widgets/Testing/Cxx/vtkTextRepresentationTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkTextRepresentationTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkTextRepresentationTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkTextRepresentationTest1.cxx diff --git a/Widgets/Testing/Cxx/vtkTextWidgetTest1.cxx b/Interaction/Widgets/Testing/Cxx/vtkTextWidgetTest1.cxx similarity index 100% rename from Widgets/Testing/Cxx/vtkTextWidgetTest1.cxx rename to Interaction/Widgets/Testing/Cxx/vtkTextWidgetTest1.cxx diff --git a/Widgets/Testing/Python/TestImagePlaneWidget.py b/Interaction/Widgets/Testing/Python/TestImagePlaneWidget.py similarity index 100% rename from Widgets/Testing/Python/TestImagePlaneWidget.py rename to Interaction/Widgets/Testing/Python/TestImagePlaneWidget.py diff --git a/Widgets/Testing/Tcl/TestBoxWidget.tcl b/Interaction/Widgets/Testing/Tcl/TestBoxWidget.tcl similarity index 100% rename from Widgets/Testing/Tcl/TestBoxWidget.tcl rename to Interaction/Widgets/Testing/Tcl/TestBoxWidget.tcl diff --git a/Widgets/Testing/Tcl/TestCameraWidget.tcl b/Interaction/Widgets/Testing/Tcl/TestCameraWidget.tcl similarity index 100% rename from Widgets/Testing/Tcl/TestCameraWidget.tcl rename to Interaction/Widgets/Testing/Tcl/TestCameraWidget.tcl diff --git a/Widgets/Testing/Tcl/TestInteractorEventRecorder.tcl b/Interaction/Widgets/Testing/Tcl/TestInteractorEventRecorder.tcl similarity index 100% rename from Widgets/Testing/Tcl/TestInteractorEventRecorder.tcl rename to Interaction/Widgets/Testing/Tcl/TestInteractorEventRecorder.tcl diff --git a/Widgets/Testing/Tcl/TestSphereWidget.tcl b/Interaction/Widgets/Testing/Tcl/TestSphereWidget.tcl similarity index 100% rename from Widgets/Testing/Tcl/TestSphereWidget.tcl rename to Interaction/Widgets/Testing/Tcl/TestSphereWidget.tcl diff --git a/Widgets/Testing/Tcl/TestTextWidget.tcl b/Interaction/Widgets/Testing/Tcl/TestTextWidget.tcl similarity index 100% rename from Widgets/Testing/Tcl/TestTextWidget.tcl rename to Interaction/Widgets/Testing/Tcl/TestTextWidget.tcl diff --git a/Widgets/vtk3DWidget.cxx b/Interaction/Widgets/vtk3DWidget.cxx similarity index 100% rename from Widgets/vtk3DWidget.cxx rename to Interaction/Widgets/vtk3DWidget.cxx diff --git a/Widgets/vtk3DWidget.h b/Interaction/Widgets/vtk3DWidget.h similarity index 100% rename from Widgets/vtk3DWidget.h rename to Interaction/Widgets/vtk3DWidget.h diff --git a/Widgets/vtkAbstractPolygonalHandleRepresentation3D.cxx b/Interaction/Widgets/vtkAbstractPolygonalHandleRepresentation3D.cxx similarity index 100% rename from Widgets/vtkAbstractPolygonalHandleRepresentation3D.cxx rename to Interaction/Widgets/vtkAbstractPolygonalHandleRepresentation3D.cxx diff --git a/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h b/Interaction/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h similarity index 100% rename from Widgets/vtkAbstractPolygonalHandleRepresentation3D.h rename to Interaction/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h diff --git a/Widgets/vtkAbstractWidget.cxx b/Interaction/Widgets/vtkAbstractWidget.cxx similarity index 100% rename from Widgets/vtkAbstractWidget.cxx rename to Interaction/Widgets/vtkAbstractWidget.cxx diff --git a/Widgets/vtkAbstractWidget.h b/Interaction/Widgets/vtkAbstractWidget.h similarity index 100% rename from Widgets/vtkAbstractWidget.h rename to Interaction/Widgets/vtkAbstractWidget.h diff --git a/Widgets/vtkAffineRepresentation.cxx b/Interaction/Widgets/vtkAffineRepresentation.cxx similarity index 100% rename from Widgets/vtkAffineRepresentation.cxx rename to Interaction/Widgets/vtkAffineRepresentation.cxx diff --git a/Widgets/vtkAffineRepresentation.h b/Interaction/Widgets/vtkAffineRepresentation.h similarity index 100% rename from Widgets/vtkAffineRepresentation.h rename to Interaction/Widgets/vtkAffineRepresentation.h diff --git a/Widgets/vtkAffineRepresentation2D.cxx b/Interaction/Widgets/vtkAffineRepresentation2D.cxx similarity index 100% rename from Widgets/vtkAffineRepresentation2D.cxx rename to Interaction/Widgets/vtkAffineRepresentation2D.cxx diff --git a/Widgets/vtkAffineRepresentation2D.h b/Interaction/Widgets/vtkAffineRepresentation2D.h similarity index 100% rename from Widgets/vtkAffineRepresentation2D.h rename to Interaction/Widgets/vtkAffineRepresentation2D.h diff --git a/Widgets/vtkAffineWidget.cxx b/Interaction/Widgets/vtkAffineWidget.cxx similarity index 100% rename from Widgets/vtkAffineWidget.cxx rename to Interaction/Widgets/vtkAffineWidget.cxx diff --git a/Widgets/vtkAffineWidget.h b/Interaction/Widgets/vtkAffineWidget.h similarity index 100% rename from Widgets/vtkAffineWidget.h rename to Interaction/Widgets/vtkAffineWidget.h diff --git a/Widgets/vtkAngleRepresentation.cxx b/Interaction/Widgets/vtkAngleRepresentation.cxx similarity index 100% rename from Widgets/vtkAngleRepresentation.cxx rename to Interaction/Widgets/vtkAngleRepresentation.cxx diff --git a/Widgets/vtkAngleRepresentation.h b/Interaction/Widgets/vtkAngleRepresentation.h similarity index 100% rename from Widgets/vtkAngleRepresentation.h rename to Interaction/Widgets/vtkAngleRepresentation.h diff --git a/Widgets/vtkAngleRepresentation2D.cxx b/Interaction/Widgets/vtkAngleRepresentation2D.cxx similarity index 100% rename from Widgets/vtkAngleRepresentation2D.cxx rename to Interaction/Widgets/vtkAngleRepresentation2D.cxx diff --git a/Widgets/vtkAngleRepresentation2D.h b/Interaction/Widgets/vtkAngleRepresentation2D.h similarity index 100% rename from Widgets/vtkAngleRepresentation2D.h rename to Interaction/Widgets/vtkAngleRepresentation2D.h diff --git a/Widgets/vtkAngleRepresentation3D.cxx b/Interaction/Widgets/vtkAngleRepresentation3D.cxx similarity index 100% rename from Widgets/vtkAngleRepresentation3D.cxx rename to Interaction/Widgets/vtkAngleRepresentation3D.cxx diff --git a/Widgets/vtkAngleRepresentation3D.h b/Interaction/Widgets/vtkAngleRepresentation3D.h similarity index 100% rename from Widgets/vtkAngleRepresentation3D.h rename to Interaction/Widgets/vtkAngleRepresentation3D.h diff --git a/Widgets/vtkAngleWidget.cxx b/Interaction/Widgets/vtkAngleWidget.cxx similarity index 100% rename from Widgets/vtkAngleWidget.cxx rename to Interaction/Widgets/vtkAngleWidget.cxx diff --git a/Widgets/vtkAngleWidget.h b/Interaction/Widgets/vtkAngleWidget.h similarity index 100% rename from Widgets/vtkAngleWidget.h rename to Interaction/Widgets/vtkAngleWidget.h diff --git a/Widgets/vtkAxesTransformRepresentation.cxx b/Interaction/Widgets/vtkAxesTransformRepresentation.cxx similarity index 100% rename from Widgets/vtkAxesTransformRepresentation.cxx rename to Interaction/Widgets/vtkAxesTransformRepresentation.cxx diff --git a/Widgets/vtkAxesTransformRepresentation.h b/Interaction/Widgets/vtkAxesTransformRepresentation.h similarity index 100% rename from Widgets/vtkAxesTransformRepresentation.h rename to Interaction/Widgets/vtkAxesTransformRepresentation.h diff --git a/Widgets/vtkAxesTransformWidget.cxx b/Interaction/Widgets/vtkAxesTransformWidget.cxx similarity index 100% rename from Widgets/vtkAxesTransformWidget.cxx rename to Interaction/Widgets/vtkAxesTransformWidget.cxx diff --git a/Widgets/vtkAxesTransformWidget.h b/Interaction/Widgets/vtkAxesTransformWidget.h similarity index 100% rename from Widgets/vtkAxesTransformWidget.h rename to Interaction/Widgets/vtkAxesTransformWidget.h diff --git a/Widgets/vtkBalloonRepresentation.cxx b/Interaction/Widgets/vtkBalloonRepresentation.cxx similarity index 100% rename from Widgets/vtkBalloonRepresentation.cxx rename to Interaction/Widgets/vtkBalloonRepresentation.cxx diff --git a/Widgets/vtkBalloonRepresentation.h b/Interaction/Widgets/vtkBalloonRepresentation.h similarity index 100% rename from Widgets/vtkBalloonRepresentation.h rename to Interaction/Widgets/vtkBalloonRepresentation.h diff --git a/Widgets/vtkBalloonWidget.cxx b/Interaction/Widgets/vtkBalloonWidget.cxx similarity index 100% rename from Widgets/vtkBalloonWidget.cxx rename to Interaction/Widgets/vtkBalloonWidget.cxx diff --git a/Widgets/vtkBalloonWidget.h b/Interaction/Widgets/vtkBalloonWidget.h similarity index 100% rename from Widgets/vtkBalloonWidget.h rename to Interaction/Widgets/vtkBalloonWidget.h diff --git a/Widgets/vtkBezierContourLineInterpolator.cxx b/Interaction/Widgets/vtkBezierContourLineInterpolator.cxx similarity index 100% rename from Widgets/vtkBezierContourLineInterpolator.cxx rename to Interaction/Widgets/vtkBezierContourLineInterpolator.cxx diff --git a/Widgets/vtkBezierContourLineInterpolator.h b/Interaction/Widgets/vtkBezierContourLineInterpolator.h similarity index 100% rename from Widgets/vtkBezierContourLineInterpolator.h rename to Interaction/Widgets/vtkBezierContourLineInterpolator.h diff --git a/Widgets/vtkBiDimensionalRepresentation.cxx b/Interaction/Widgets/vtkBiDimensionalRepresentation.cxx similarity index 100% rename from Widgets/vtkBiDimensionalRepresentation.cxx rename to Interaction/Widgets/vtkBiDimensionalRepresentation.cxx diff --git a/Widgets/vtkBiDimensionalRepresentation.h b/Interaction/Widgets/vtkBiDimensionalRepresentation.h similarity index 100% rename from Widgets/vtkBiDimensionalRepresentation.h rename to Interaction/Widgets/vtkBiDimensionalRepresentation.h diff --git a/Widgets/vtkBiDimensionalRepresentation2D.cxx b/Interaction/Widgets/vtkBiDimensionalRepresentation2D.cxx similarity index 100% rename from Widgets/vtkBiDimensionalRepresentation2D.cxx rename to Interaction/Widgets/vtkBiDimensionalRepresentation2D.cxx diff --git a/Widgets/vtkBiDimensionalRepresentation2D.h b/Interaction/Widgets/vtkBiDimensionalRepresentation2D.h similarity index 100% rename from Widgets/vtkBiDimensionalRepresentation2D.h rename to Interaction/Widgets/vtkBiDimensionalRepresentation2D.h diff --git a/Widgets/vtkBiDimensionalWidget.cxx b/Interaction/Widgets/vtkBiDimensionalWidget.cxx similarity index 100% rename from Widgets/vtkBiDimensionalWidget.cxx rename to Interaction/Widgets/vtkBiDimensionalWidget.cxx diff --git a/Widgets/vtkBiDimensionalWidget.h b/Interaction/Widgets/vtkBiDimensionalWidget.h similarity index 100% rename from Widgets/vtkBiDimensionalWidget.h rename to Interaction/Widgets/vtkBiDimensionalWidget.h diff --git a/Widgets/vtkBorderRepresentation.cxx b/Interaction/Widgets/vtkBorderRepresentation.cxx similarity index 100% rename from Widgets/vtkBorderRepresentation.cxx rename to Interaction/Widgets/vtkBorderRepresentation.cxx diff --git a/Widgets/vtkBorderRepresentation.h b/Interaction/Widgets/vtkBorderRepresentation.h similarity index 100% rename from Widgets/vtkBorderRepresentation.h rename to Interaction/Widgets/vtkBorderRepresentation.h diff --git a/Widgets/vtkBorderWidget.cxx b/Interaction/Widgets/vtkBorderWidget.cxx similarity index 100% rename from Widgets/vtkBorderWidget.cxx rename to Interaction/Widgets/vtkBorderWidget.cxx diff --git a/Widgets/vtkBorderWidget.h b/Interaction/Widgets/vtkBorderWidget.h similarity index 100% rename from Widgets/vtkBorderWidget.h rename to Interaction/Widgets/vtkBorderWidget.h diff --git a/Widgets/vtkBoundedPlanePointPlacer.cxx b/Interaction/Widgets/vtkBoundedPlanePointPlacer.cxx similarity index 100% rename from Widgets/vtkBoundedPlanePointPlacer.cxx rename to Interaction/Widgets/vtkBoundedPlanePointPlacer.cxx diff --git a/Widgets/vtkBoundedPlanePointPlacer.h b/Interaction/Widgets/vtkBoundedPlanePointPlacer.h similarity index 100% rename from Widgets/vtkBoundedPlanePointPlacer.h rename to Interaction/Widgets/vtkBoundedPlanePointPlacer.h diff --git a/Widgets/vtkBoxRepresentation.cxx b/Interaction/Widgets/vtkBoxRepresentation.cxx similarity index 100% rename from Widgets/vtkBoxRepresentation.cxx rename to Interaction/Widgets/vtkBoxRepresentation.cxx diff --git a/Widgets/vtkBoxRepresentation.h b/Interaction/Widgets/vtkBoxRepresentation.h similarity index 100% rename from Widgets/vtkBoxRepresentation.h rename to Interaction/Widgets/vtkBoxRepresentation.h diff --git a/Widgets/vtkBoxWidget.cxx b/Interaction/Widgets/vtkBoxWidget.cxx similarity index 100% rename from Widgets/vtkBoxWidget.cxx rename to Interaction/Widgets/vtkBoxWidget.cxx diff --git a/Widgets/vtkBoxWidget.h b/Interaction/Widgets/vtkBoxWidget.h similarity index 100% rename from Widgets/vtkBoxWidget.h rename to Interaction/Widgets/vtkBoxWidget.h diff --git a/Widgets/vtkBoxWidget2.cxx b/Interaction/Widgets/vtkBoxWidget2.cxx similarity index 100% rename from Widgets/vtkBoxWidget2.cxx rename to Interaction/Widgets/vtkBoxWidget2.cxx diff --git a/Widgets/vtkBoxWidget2.h b/Interaction/Widgets/vtkBoxWidget2.h similarity index 100% rename from Widgets/vtkBoxWidget2.h rename to Interaction/Widgets/vtkBoxWidget2.h diff --git a/Widgets/vtkBrokenLineWidget.cxx b/Interaction/Widgets/vtkBrokenLineWidget.cxx similarity index 100% rename from Widgets/vtkBrokenLineWidget.cxx rename to Interaction/Widgets/vtkBrokenLineWidget.cxx diff --git a/Widgets/vtkBrokenLineWidget.h b/Interaction/Widgets/vtkBrokenLineWidget.h similarity index 100% rename from Widgets/vtkBrokenLineWidget.h rename to Interaction/Widgets/vtkBrokenLineWidget.h diff --git a/Widgets/vtkButtonRepresentation.cxx b/Interaction/Widgets/vtkButtonRepresentation.cxx similarity index 100% rename from Widgets/vtkButtonRepresentation.cxx rename to Interaction/Widgets/vtkButtonRepresentation.cxx diff --git a/Widgets/vtkButtonRepresentation.h b/Interaction/Widgets/vtkButtonRepresentation.h similarity index 100% rename from Widgets/vtkButtonRepresentation.h rename to Interaction/Widgets/vtkButtonRepresentation.h diff --git a/Widgets/vtkButtonWidget.cxx b/Interaction/Widgets/vtkButtonWidget.cxx similarity index 100% rename from Widgets/vtkButtonWidget.cxx rename to Interaction/Widgets/vtkButtonWidget.cxx diff --git a/Widgets/vtkButtonWidget.h b/Interaction/Widgets/vtkButtonWidget.h similarity index 100% rename from Widgets/vtkButtonWidget.h rename to Interaction/Widgets/vtkButtonWidget.h diff --git a/Widgets/vtkCameraRepresentation.cxx b/Interaction/Widgets/vtkCameraRepresentation.cxx similarity index 100% rename from Widgets/vtkCameraRepresentation.cxx rename to Interaction/Widgets/vtkCameraRepresentation.cxx diff --git a/Widgets/vtkCameraRepresentation.h b/Interaction/Widgets/vtkCameraRepresentation.h similarity index 100% rename from Widgets/vtkCameraRepresentation.h rename to Interaction/Widgets/vtkCameraRepresentation.h diff --git a/Widgets/vtkCameraWidget.cxx b/Interaction/Widgets/vtkCameraWidget.cxx similarity index 100% rename from Widgets/vtkCameraWidget.cxx rename to Interaction/Widgets/vtkCameraWidget.cxx diff --git a/Widgets/vtkCameraWidget.h b/Interaction/Widgets/vtkCameraWidget.h similarity index 100% rename from Widgets/vtkCameraWidget.h rename to Interaction/Widgets/vtkCameraWidget.h diff --git a/Widgets/vtkCaptionRepresentation.cxx b/Interaction/Widgets/vtkCaptionRepresentation.cxx similarity index 100% rename from Widgets/vtkCaptionRepresentation.cxx rename to Interaction/Widgets/vtkCaptionRepresentation.cxx diff --git a/Widgets/vtkCaptionRepresentation.h b/Interaction/Widgets/vtkCaptionRepresentation.h similarity index 100% rename from Widgets/vtkCaptionRepresentation.h rename to Interaction/Widgets/vtkCaptionRepresentation.h diff --git a/Widgets/vtkCaptionWidget.cxx b/Interaction/Widgets/vtkCaptionWidget.cxx similarity index 100% rename from Widgets/vtkCaptionWidget.cxx rename to Interaction/Widgets/vtkCaptionWidget.cxx diff --git a/Widgets/vtkCaptionWidget.h b/Interaction/Widgets/vtkCaptionWidget.h similarity index 100% rename from Widgets/vtkCaptionWidget.h rename to Interaction/Widgets/vtkCaptionWidget.h diff --git a/Widgets/vtkCellCentersPointPlacer.cxx b/Interaction/Widgets/vtkCellCentersPointPlacer.cxx similarity index 100% rename from Widgets/vtkCellCentersPointPlacer.cxx rename to Interaction/Widgets/vtkCellCentersPointPlacer.cxx diff --git a/Widgets/vtkCellCentersPointPlacer.h b/Interaction/Widgets/vtkCellCentersPointPlacer.h similarity index 100% rename from Widgets/vtkCellCentersPointPlacer.h rename to Interaction/Widgets/vtkCellCentersPointPlacer.h diff --git a/Widgets/vtkCenteredSliderRepresentation.cxx b/Interaction/Widgets/vtkCenteredSliderRepresentation.cxx similarity index 100% rename from Widgets/vtkCenteredSliderRepresentation.cxx rename to Interaction/Widgets/vtkCenteredSliderRepresentation.cxx diff --git a/Widgets/vtkCenteredSliderRepresentation.h b/Interaction/Widgets/vtkCenteredSliderRepresentation.h similarity index 100% rename from Widgets/vtkCenteredSliderRepresentation.h rename to Interaction/Widgets/vtkCenteredSliderRepresentation.h diff --git a/Widgets/vtkCenteredSliderWidget.cxx b/Interaction/Widgets/vtkCenteredSliderWidget.cxx similarity index 100% rename from Widgets/vtkCenteredSliderWidget.cxx rename to Interaction/Widgets/vtkCenteredSliderWidget.cxx diff --git a/Widgets/vtkCenteredSliderWidget.h b/Interaction/Widgets/vtkCenteredSliderWidget.h similarity index 100% rename from Widgets/vtkCenteredSliderWidget.h rename to Interaction/Widgets/vtkCenteredSliderWidget.h diff --git a/Widgets/vtkCheckerboardRepresentation.cxx b/Interaction/Widgets/vtkCheckerboardRepresentation.cxx similarity index 100% rename from Widgets/vtkCheckerboardRepresentation.cxx rename to Interaction/Widgets/vtkCheckerboardRepresentation.cxx diff --git a/Widgets/vtkCheckerboardRepresentation.h b/Interaction/Widgets/vtkCheckerboardRepresentation.h similarity index 100% rename from Widgets/vtkCheckerboardRepresentation.h rename to Interaction/Widgets/vtkCheckerboardRepresentation.h diff --git a/Widgets/vtkCheckerboardWidget.cxx b/Interaction/Widgets/vtkCheckerboardWidget.cxx similarity index 100% rename from Widgets/vtkCheckerboardWidget.cxx rename to Interaction/Widgets/vtkCheckerboardWidget.cxx diff --git a/Widgets/vtkCheckerboardWidget.h b/Interaction/Widgets/vtkCheckerboardWidget.h similarity index 100% rename from Widgets/vtkCheckerboardWidget.h rename to Interaction/Widgets/vtkCheckerboardWidget.h diff --git a/Widgets/vtkClosedSurfacePointPlacer.cxx b/Interaction/Widgets/vtkClosedSurfacePointPlacer.cxx similarity index 100% rename from Widgets/vtkClosedSurfacePointPlacer.cxx rename to Interaction/Widgets/vtkClosedSurfacePointPlacer.cxx diff --git a/Widgets/vtkClosedSurfacePointPlacer.h b/Interaction/Widgets/vtkClosedSurfacePointPlacer.h similarity index 100% rename from Widgets/vtkClosedSurfacePointPlacer.h rename to Interaction/Widgets/vtkClosedSurfacePointPlacer.h diff --git a/Widgets/vtkConstrainedPointHandleRepresentation.cxx b/Interaction/Widgets/vtkConstrainedPointHandleRepresentation.cxx similarity index 100% rename from Widgets/vtkConstrainedPointHandleRepresentation.cxx rename to Interaction/Widgets/vtkConstrainedPointHandleRepresentation.cxx diff --git a/Widgets/vtkConstrainedPointHandleRepresentation.h b/Interaction/Widgets/vtkConstrainedPointHandleRepresentation.h similarity index 100% rename from Widgets/vtkConstrainedPointHandleRepresentation.h rename to Interaction/Widgets/vtkConstrainedPointHandleRepresentation.h diff --git a/Widgets/vtkContinuousValueWidget.cxx b/Interaction/Widgets/vtkContinuousValueWidget.cxx similarity index 100% rename from Widgets/vtkContinuousValueWidget.cxx rename to Interaction/Widgets/vtkContinuousValueWidget.cxx diff --git a/Widgets/vtkContinuousValueWidget.h b/Interaction/Widgets/vtkContinuousValueWidget.h similarity index 100% rename from Widgets/vtkContinuousValueWidget.h rename to Interaction/Widgets/vtkContinuousValueWidget.h diff --git a/Widgets/vtkContinuousValueWidgetRepresentation.cxx b/Interaction/Widgets/vtkContinuousValueWidgetRepresentation.cxx similarity index 100% rename from Widgets/vtkContinuousValueWidgetRepresentation.cxx rename to Interaction/Widgets/vtkContinuousValueWidgetRepresentation.cxx diff --git a/Widgets/vtkContinuousValueWidgetRepresentation.h b/Interaction/Widgets/vtkContinuousValueWidgetRepresentation.h similarity index 100% rename from Widgets/vtkContinuousValueWidgetRepresentation.h rename to Interaction/Widgets/vtkContinuousValueWidgetRepresentation.h diff --git a/Widgets/vtkContourLineInterpolator.cxx b/Interaction/Widgets/vtkContourLineInterpolator.cxx similarity index 100% rename from Widgets/vtkContourLineInterpolator.cxx rename to Interaction/Widgets/vtkContourLineInterpolator.cxx diff --git a/Widgets/vtkContourLineInterpolator.h b/Interaction/Widgets/vtkContourLineInterpolator.h similarity index 100% rename from Widgets/vtkContourLineInterpolator.h rename to Interaction/Widgets/vtkContourLineInterpolator.h diff --git a/Widgets/vtkContourRepresentation.cxx b/Interaction/Widgets/vtkContourRepresentation.cxx similarity index 100% rename from Widgets/vtkContourRepresentation.cxx rename to Interaction/Widgets/vtkContourRepresentation.cxx diff --git a/Widgets/vtkContourRepresentation.h b/Interaction/Widgets/vtkContourRepresentation.h similarity index 100% rename from Widgets/vtkContourRepresentation.h rename to Interaction/Widgets/vtkContourRepresentation.h diff --git a/Widgets/vtkContourWidget.cxx b/Interaction/Widgets/vtkContourWidget.cxx similarity index 100% rename from Widgets/vtkContourWidget.cxx rename to Interaction/Widgets/vtkContourWidget.cxx diff --git a/Widgets/vtkContourWidget.h b/Interaction/Widgets/vtkContourWidget.h similarity index 100% rename from Widgets/vtkContourWidget.h rename to Interaction/Widgets/vtkContourWidget.h diff --git a/Widgets/vtkDijkstraImageContourLineInterpolator.cxx b/Interaction/Widgets/vtkDijkstraImageContourLineInterpolator.cxx similarity index 100% rename from Widgets/vtkDijkstraImageContourLineInterpolator.cxx rename to Interaction/Widgets/vtkDijkstraImageContourLineInterpolator.cxx diff --git a/Widgets/vtkDijkstraImageContourLineInterpolator.h b/Interaction/Widgets/vtkDijkstraImageContourLineInterpolator.h similarity index 100% rename from Widgets/vtkDijkstraImageContourLineInterpolator.h rename to Interaction/Widgets/vtkDijkstraImageContourLineInterpolator.h diff --git a/Widgets/vtkDistanceRepresentation.cxx b/Interaction/Widgets/vtkDistanceRepresentation.cxx similarity index 100% rename from Widgets/vtkDistanceRepresentation.cxx rename to Interaction/Widgets/vtkDistanceRepresentation.cxx diff --git a/Widgets/vtkDistanceRepresentation.h b/Interaction/Widgets/vtkDistanceRepresentation.h similarity index 100% rename from Widgets/vtkDistanceRepresentation.h rename to Interaction/Widgets/vtkDistanceRepresentation.h diff --git a/Widgets/vtkDistanceRepresentation2D.cxx b/Interaction/Widgets/vtkDistanceRepresentation2D.cxx similarity index 100% rename from Widgets/vtkDistanceRepresentation2D.cxx rename to Interaction/Widgets/vtkDistanceRepresentation2D.cxx diff --git a/Widgets/vtkDistanceRepresentation2D.h b/Interaction/Widgets/vtkDistanceRepresentation2D.h similarity index 100% rename from Widgets/vtkDistanceRepresentation2D.h rename to Interaction/Widgets/vtkDistanceRepresentation2D.h diff --git a/Widgets/vtkDistanceRepresentation3D.cxx b/Interaction/Widgets/vtkDistanceRepresentation3D.cxx similarity index 100% rename from Widgets/vtkDistanceRepresentation3D.cxx rename to Interaction/Widgets/vtkDistanceRepresentation3D.cxx diff --git a/Widgets/vtkDistanceRepresentation3D.h b/Interaction/Widgets/vtkDistanceRepresentation3D.h similarity index 100% rename from Widgets/vtkDistanceRepresentation3D.h rename to Interaction/Widgets/vtkDistanceRepresentation3D.h diff --git a/Widgets/vtkDistanceWidget.cxx b/Interaction/Widgets/vtkDistanceWidget.cxx similarity index 100% rename from Widgets/vtkDistanceWidget.cxx rename to Interaction/Widgets/vtkDistanceWidget.cxx diff --git a/Widgets/vtkDistanceWidget.h b/Interaction/Widgets/vtkDistanceWidget.h similarity index 100% rename from Widgets/vtkDistanceWidget.h rename to Interaction/Widgets/vtkDistanceWidget.h diff --git a/Widgets/vtkEllipsoidTensorProbeRepresentation.cxx b/Interaction/Widgets/vtkEllipsoidTensorProbeRepresentation.cxx similarity index 100% rename from Widgets/vtkEllipsoidTensorProbeRepresentation.cxx rename to Interaction/Widgets/vtkEllipsoidTensorProbeRepresentation.cxx diff --git a/Widgets/vtkEllipsoidTensorProbeRepresentation.h b/Interaction/Widgets/vtkEllipsoidTensorProbeRepresentation.h similarity index 100% rename from Widgets/vtkEllipsoidTensorProbeRepresentation.h rename to Interaction/Widgets/vtkEllipsoidTensorProbeRepresentation.h diff --git a/Widgets/vtkEvent.cxx b/Interaction/Widgets/vtkEvent.cxx similarity index 100% rename from Widgets/vtkEvent.cxx rename to Interaction/Widgets/vtkEvent.cxx diff --git a/Widgets/vtkEvent.h b/Interaction/Widgets/vtkEvent.h similarity index 100% rename from Widgets/vtkEvent.h rename to Interaction/Widgets/vtkEvent.h diff --git a/Widgets/vtkFixedSizeHandleRepresentation3D.cxx b/Interaction/Widgets/vtkFixedSizeHandleRepresentation3D.cxx similarity index 100% rename from Widgets/vtkFixedSizeHandleRepresentation3D.cxx rename to Interaction/Widgets/vtkFixedSizeHandleRepresentation3D.cxx diff --git a/Widgets/vtkFixedSizeHandleRepresentation3D.h b/Interaction/Widgets/vtkFixedSizeHandleRepresentation3D.h similarity index 100% rename from Widgets/vtkFixedSizeHandleRepresentation3D.h rename to Interaction/Widgets/vtkFixedSizeHandleRepresentation3D.h diff --git a/Widgets/vtkFocalPlaneContourRepresentation.cxx b/Interaction/Widgets/vtkFocalPlaneContourRepresentation.cxx similarity index 100% rename from Widgets/vtkFocalPlaneContourRepresentation.cxx rename to Interaction/Widgets/vtkFocalPlaneContourRepresentation.cxx diff --git a/Widgets/vtkFocalPlaneContourRepresentation.h b/Interaction/Widgets/vtkFocalPlaneContourRepresentation.h similarity index 100% rename from Widgets/vtkFocalPlaneContourRepresentation.h rename to Interaction/Widgets/vtkFocalPlaneContourRepresentation.h diff --git a/Widgets/vtkFocalPlanePointPlacer.cxx b/Interaction/Widgets/vtkFocalPlanePointPlacer.cxx similarity index 100% rename from Widgets/vtkFocalPlanePointPlacer.cxx rename to Interaction/Widgets/vtkFocalPlanePointPlacer.cxx diff --git a/Widgets/vtkFocalPlanePointPlacer.h b/Interaction/Widgets/vtkFocalPlanePointPlacer.h similarity index 100% rename from Widgets/vtkFocalPlanePointPlacer.h rename to Interaction/Widgets/vtkFocalPlanePointPlacer.h diff --git a/Widgets/vtkHandleRepresentation.cxx b/Interaction/Widgets/vtkHandleRepresentation.cxx similarity index 100% rename from Widgets/vtkHandleRepresentation.cxx rename to Interaction/Widgets/vtkHandleRepresentation.cxx diff --git a/Widgets/vtkHandleRepresentation.h b/Interaction/Widgets/vtkHandleRepresentation.h similarity index 100% rename from Widgets/vtkHandleRepresentation.h rename to Interaction/Widgets/vtkHandleRepresentation.h diff --git a/Widgets/vtkHandleWidget.cxx b/Interaction/Widgets/vtkHandleWidget.cxx similarity index 100% rename from Widgets/vtkHandleWidget.cxx rename to Interaction/Widgets/vtkHandleWidget.cxx diff --git a/Widgets/vtkHandleWidget.h b/Interaction/Widgets/vtkHandleWidget.h similarity index 100% rename from Widgets/vtkHandleWidget.h rename to Interaction/Widgets/vtkHandleWidget.h diff --git a/Widgets/vtkHoverWidget.cxx b/Interaction/Widgets/vtkHoverWidget.cxx similarity index 100% rename from Widgets/vtkHoverWidget.cxx rename to Interaction/Widgets/vtkHoverWidget.cxx diff --git a/Widgets/vtkHoverWidget.h b/Interaction/Widgets/vtkHoverWidget.h similarity index 100% rename from Widgets/vtkHoverWidget.h rename to Interaction/Widgets/vtkHoverWidget.h diff --git a/Widgets/vtkImageActorPointPlacer.cxx b/Interaction/Widgets/vtkImageActorPointPlacer.cxx similarity index 100% rename from Widgets/vtkImageActorPointPlacer.cxx rename to Interaction/Widgets/vtkImageActorPointPlacer.cxx diff --git a/Widgets/vtkImageActorPointPlacer.h b/Interaction/Widgets/vtkImageActorPointPlacer.h similarity index 100% rename from Widgets/vtkImageActorPointPlacer.h rename to Interaction/Widgets/vtkImageActorPointPlacer.h diff --git a/Widgets/vtkImageCroppingRegionsWidget.cxx b/Interaction/Widgets/vtkImageCroppingRegionsWidget.cxx similarity index 100% rename from Widgets/vtkImageCroppingRegionsWidget.cxx rename to Interaction/Widgets/vtkImageCroppingRegionsWidget.cxx diff --git a/Widgets/vtkImageCroppingRegionsWidget.h b/Interaction/Widgets/vtkImageCroppingRegionsWidget.h similarity index 100% rename from Widgets/vtkImageCroppingRegionsWidget.h rename to Interaction/Widgets/vtkImageCroppingRegionsWidget.h diff --git a/Widgets/vtkImageOrthoPlanes.cxx b/Interaction/Widgets/vtkImageOrthoPlanes.cxx similarity index 100% rename from Widgets/vtkImageOrthoPlanes.cxx rename to Interaction/Widgets/vtkImageOrthoPlanes.cxx diff --git a/Widgets/vtkImageOrthoPlanes.h b/Interaction/Widgets/vtkImageOrthoPlanes.h similarity index 100% rename from Widgets/vtkImageOrthoPlanes.h rename to Interaction/Widgets/vtkImageOrthoPlanes.h diff --git a/Widgets/vtkImagePlaneWidget.cxx b/Interaction/Widgets/vtkImagePlaneWidget.cxx similarity index 100% rename from Widgets/vtkImagePlaneWidget.cxx rename to Interaction/Widgets/vtkImagePlaneWidget.cxx diff --git a/Widgets/vtkImagePlaneWidget.h b/Interaction/Widgets/vtkImagePlaneWidget.h similarity index 100% rename from Widgets/vtkImagePlaneWidget.h rename to Interaction/Widgets/vtkImagePlaneWidget.h diff --git a/Widgets/vtkImageTracerWidget.cxx b/Interaction/Widgets/vtkImageTracerWidget.cxx similarity index 100% rename from Widgets/vtkImageTracerWidget.cxx rename to Interaction/Widgets/vtkImageTracerWidget.cxx diff --git a/Widgets/vtkImageTracerWidget.h b/Interaction/Widgets/vtkImageTracerWidget.h similarity index 100% rename from Widgets/vtkImageTracerWidget.h rename to Interaction/Widgets/vtkImageTracerWidget.h diff --git a/Widgets/vtkImplicitPlaneRepresentation.cxx b/Interaction/Widgets/vtkImplicitPlaneRepresentation.cxx similarity index 100% rename from Widgets/vtkImplicitPlaneRepresentation.cxx rename to Interaction/Widgets/vtkImplicitPlaneRepresentation.cxx diff --git a/Widgets/vtkImplicitPlaneRepresentation.h b/Interaction/Widgets/vtkImplicitPlaneRepresentation.h similarity index 100% rename from Widgets/vtkImplicitPlaneRepresentation.h rename to Interaction/Widgets/vtkImplicitPlaneRepresentation.h diff --git a/Widgets/vtkImplicitPlaneWidget.cxx b/Interaction/Widgets/vtkImplicitPlaneWidget.cxx similarity index 100% rename from Widgets/vtkImplicitPlaneWidget.cxx rename to Interaction/Widgets/vtkImplicitPlaneWidget.cxx diff --git a/Widgets/vtkImplicitPlaneWidget.h b/Interaction/Widgets/vtkImplicitPlaneWidget.h similarity index 100% rename from Widgets/vtkImplicitPlaneWidget.h rename to Interaction/Widgets/vtkImplicitPlaneWidget.h diff --git a/Widgets/vtkImplicitPlaneWidget2.cxx b/Interaction/Widgets/vtkImplicitPlaneWidget2.cxx similarity index 100% rename from Widgets/vtkImplicitPlaneWidget2.cxx rename to Interaction/Widgets/vtkImplicitPlaneWidget2.cxx diff --git a/Widgets/vtkImplicitPlaneWidget2.h b/Interaction/Widgets/vtkImplicitPlaneWidget2.h similarity index 100% rename from Widgets/vtkImplicitPlaneWidget2.h rename to Interaction/Widgets/vtkImplicitPlaneWidget2.h diff --git a/Widgets/vtkLineRepresentation.cxx b/Interaction/Widgets/vtkLineRepresentation.cxx similarity index 100% rename from Widgets/vtkLineRepresentation.cxx rename to Interaction/Widgets/vtkLineRepresentation.cxx diff --git a/Widgets/vtkLineRepresentation.h b/Interaction/Widgets/vtkLineRepresentation.h similarity index 100% rename from Widgets/vtkLineRepresentation.h rename to Interaction/Widgets/vtkLineRepresentation.h diff --git a/Widgets/vtkLineWidget.cxx b/Interaction/Widgets/vtkLineWidget.cxx similarity index 100% rename from Widgets/vtkLineWidget.cxx rename to Interaction/Widgets/vtkLineWidget.cxx diff --git a/Widgets/vtkLineWidget.h b/Interaction/Widgets/vtkLineWidget.h similarity index 100% rename from Widgets/vtkLineWidget.h rename to Interaction/Widgets/vtkLineWidget.h diff --git a/Widgets/vtkLineWidget2.cxx b/Interaction/Widgets/vtkLineWidget2.cxx similarity index 100% rename from Widgets/vtkLineWidget2.cxx rename to Interaction/Widgets/vtkLineWidget2.cxx diff --git a/Widgets/vtkLineWidget2.h b/Interaction/Widgets/vtkLineWidget2.h similarity index 100% rename from Widgets/vtkLineWidget2.h rename to Interaction/Widgets/vtkLineWidget2.h diff --git a/Widgets/vtkLinearContourLineInterpolator.cxx b/Interaction/Widgets/vtkLinearContourLineInterpolator.cxx similarity index 100% rename from Widgets/vtkLinearContourLineInterpolator.cxx rename to Interaction/Widgets/vtkLinearContourLineInterpolator.cxx diff --git a/Widgets/vtkLinearContourLineInterpolator.h b/Interaction/Widgets/vtkLinearContourLineInterpolator.h similarity index 100% rename from Widgets/vtkLinearContourLineInterpolator.h rename to Interaction/Widgets/vtkLinearContourLineInterpolator.h diff --git a/Widgets/vtkLogoRepresentation.cxx b/Interaction/Widgets/vtkLogoRepresentation.cxx similarity index 100% rename from Widgets/vtkLogoRepresentation.cxx rename to Interaction/Widgets/vtkLogoRepresentation.cxx diff --git a/Widgets/vtkLogoRepresentation.h b/Interaction/Widgets/vtkLogoRepresentation.h similarity index 100% rename from Widgets/vtkLogoRepresentation.h rename to Interaction/Widgets/vtkLogoRepresentation.h diff --git a/Widgets/vtkLogoWidget.cxx b/Interaction/Widgets/vtkLogoWidget.cxx similarity index 100% rename from Widgets/vtkLogoWidget.cxx rename to Interaction/Widgets/vtkLogoWidget.cxx diff --git a/Widgets/vtkLogoWidget.h b/Interaction/Widgets/vtkLogoWidget.h similarity index 100% rename from Widgets/vtkLogoWidget.h rename to Interaction/Widgets/vtkLogoWidget.h diff --git a/Widgets/vtkOrientationMarkerWidget.cxx b/Interaction/Widgets/vtkOrientationMarkerWidget.cxx similarity index 100% rename from Widgets/vtkOrientationMarkerWidget.cxx rename to Interaction/Widgets/vtkOrientationMarkerWidget.cxx diff --git a/Widgets/vtkOrientationMarkerWidget.h b/Interaction/Widgets/vtkOrientationMarkerWidget.h similarity index 100% rename from Widgets/vtkOrientationMarkerWidget.h rename to Interaction/Widgets/vtkOrientationMarkerWidget.h diff --git a/Widgets/vtkOrientedGlyphContourRepresentation.cxx b/Interaction/Widgets/vtkOrientedGlyphContourRepresentation.cxx similarity index 100% rename from Widgets/vtkOrientedGlyphContourRepresentation.cxx rename to Interaction/Widgets/vtkOrientedGlyphContourRepresentation.cxx diff --git a/Widgets/vtkOrientedGlyphContourRepresentation.h b/Interaction/Widgets/vtkOrientedGlyphContourRepresentation.h similarity index 100% rename from Widgets/vtkOrientedGlyphContourRepresentation.h rename to Interaction/Widgets/vtkOrientedGlyphContourRepresentation.h diff --git a/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.cxx b/Interaction/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.cxx similarity index 100% rename from Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.cxx rename to Interaction/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.cxx diff --git a/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h b/Interaction/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h similarity index 100% rename from Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h rename to Interaction/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h diff --git a/Widgets/vtkOrientedPolygonalHandleRepresentation3D.cxx b/Interaction/Widgets/vtkOrientedPolygonalHandleRepresentation3D.cxx similarity index 100% rename from Widgets/vtkOrientedPolygonalHandleRepresentation3D.cxx rename to Interaction/Widgets/vtkOrientedPolygonalHandleRepresentation3D.cxx diff --git a/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h b/Interaction/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h similarity index 100% rename from Widgets/vtkOrientedPolygonalHandleRepresentation3D.h rename to Interaction/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h diff --git a/Widgets/vtkParallelopipedRepresentation.cxx b/Interaction/Widgets/vtkParallelopipedRepresentation.cxx similarity index 100% rename from Widgets/vtkParallelopipedRepresentation.cxx rename to Interaction/Widgets/vtkParallelopipedRepresentation.cxx diff --git a/Widgets/vtkParallelopipedRepresentation.h b/Interaction/Widgets/vtkParallelopipedRepresentation.h similarity index 100% rename from Widgets/vtkParallelopipedRepresentation.h rename to Interaction/Widgets/vtkParallelopipedRepresentation.h diff --git a/Widgets/vtkParallelopipedWidget.cxx b/Interaction/Widgets/vtkParallelopipedWidget.cxx similarity index 100% rename from Widgets/vtkParallelopipedWidget.cxx rename to Interaction/Widgets/vtkParallelopipedWidget.cxx diff --git a/Widgets/vtkParallelopipedWidget.h b/Interaction/Widgets/vtkParallelopipedWidget.h similarity index 100% rename from Widgets/vtkParallelopipedWidget.h rename to Interaction/Widgets/vtkParallelopipedWidget.h diff --git a/Widgets/vtkPlaneWidget.cxx b/Interaction/Widgets/vtkPlaneWidget.cxx similarity index 100% rename from Widgets/vtkPlaneWidget.cxx rename to Interaction/Widgets/vtkPlaneWidget.cxx diff --git a/Widgets/vtkPlaneWidget.h b/Interaction/Widgets/vtkPlaneWidget.h similarity index 100% rename from Widgets/vtkPlaneWidget.h rename to Interaction/Widgets/vtkPlaneWidget.h diff --git a/Widgets/vtkPlaybackRepresentation.cxx b/Interaction/Widgets/vtkPlaybackRepresentation.cxx similarity index 100% rename from Widgets/vtkPlaybackRepresentation.cxx rename to Interaction/Widgets/vtkPlaybackRepresentation.cxx diff --git a/Widgets/vtkPlaybackRepresentation.h b/Interaction/Widgets/vtkPlaybackRepresentation.h similarity index 100% rename from Widgets/vtkPlaybackRepresentation.h rename to Interaction/Widgets/vtkPlaybackRepresentation.h diff --git a/Widgets/vtkPlaybackWidget.cxx b/Interaction/Widgets/vtkPlaybackWidget.cxx similarity index 100% rename from Widgets/vtkPlaybackWidget.cxx rename to Interaction/Widgets/vtkPlaybackWidget.cxx diff --git a/Widgets/vtkPlaybackWidget.h b/Interaction/Widgets/vtkPlaybackWidget.h similarity index 100% rename from Widgets/vtkPlaybackWidget.h rename to Interaction/Widgets/vtkPlaybackWidget.h diff --git a/Widgets/vtkPointHandleRepresentation2D.cxx b/Interaction/Widgets/vtkPointHandleRepresentation2D.cxx similarity index 100% rename from Widgets/vtkPointHandleRepresentation2D.cxx rename to Interaction/Widgets/vtkPointHandleRepresentation2D.cxx diff --git a/Widgets/vtkPointHandleRepresentation2D.h b/Interaction/Widgets/vtkPointHandleRepresentation2D.h similarity index 100% rename from Widgets/vtkPointHandleRepresentation2D.h rename to Interaction/Widgets/vtkPointHandleRepresentation2D.h diff --git a/Widgets/vtkPointHandleRepresentation3D.cxx b/Interaction/Widgets/vtkPointHandleRepresentation3D.cxx similarity index 100% rename from Widgets/vtkPointHandleRepresentation3D.cxx rename to Interaction/Widgets/vtkPointHandleRepresentation3D.cxx diff --git a/Widgets/vtkPointHandleRepresentation3D.h b/Interaction/Widgets/vtkPointHandleRepresentation3D.h similarity index 100% rename from Widgets/vtkPointHandleRepresentation3D.h rename to Interaction/Widgets/vtkPointHandleRepresentation3D.h diff --git a/Widgets/vtkPointPlacer.cxx b/Interaction/Widgets/vtkPointPlacer.cxx similarity index 100% rename from Widgets/vtkPointPlacer.cxx rename to Interaction/Widgets/vtkPointPlacer.cxx diff --git a/Widgets/vtkPointPlacer.h b/Interaction/Widgets/vtkPointPlacer.h similarity index 100% rename from Widgets/vtkPointPlacer.h rename to Interaction/Widgets/vtkPointPlacer.h diff --git a/Widgets/vtkPointWidget.cxx b/Interaction/Widgets/vtkPointWidget.cxx similarity index 100% rename from Widgets/vtkPointWidget.cxx rename to Interaction/Widgets/vtkPointWidget.cxx diff --git a/Widgets/vtkPointWidget.h b/Interaction/Widgets/vtkPointWidget.h similarity index 100% rename from Widgets/vtkPointWidget.h rename to Interaction/Widgets/vtkPointWidget.h diff --git a/Widgets/vtkPolyDataContourLineInterpolator.cxx b/Interaction/Widgets/vtkPolyDataContourLineInterpolator.cxx similarity index 100% rename from Widgets/vtkPolyDataContourLineInterpolator.cxx rename to Interaction/Widgets/vtkPolyDataContourLineInterpolator.cxx diff --git a/Widgets/vtkPolyDataContourLineInterpolator.h b/Interaction/Widgets/vtkPolyDataContourLineInterpolator.h similarity index 100% rename from Widgets/vtkPolyDataContourLineInterpolator.h rename to Interaction/Widgets/vtkPolyDataContourLineInterpolator.h diff --git a/Widgets/vtkPolyDataPointPlacer.cxx b/Interaction/Widgets/vtkPolyDataPointPlacer.cxx similarity index 100% rename from Widgets/vtkPolyDataPointPlacer.cxx rename to Interaction/Widgets/vtkPolyDataPointPlacer.cxx diff --git a/Widgets/vtkPolyDataPointPlacer.h b/Interaction/Widgets/vtkPolyDataPointPlacer.h similarity index 100% rename from Widgets/vtkPolyDataPointPlacer.h rename to Interaction/Widgets/vtkPolyDataPointPlacer.h diff --git a/Widgets/vtkPolyDataSourceWidget.cxx b/Interaction/Widgets/vtkPolyDataSourceWidget.cxx similarity index 100% rename from Widgets/vtkPolyDataSourceWidget.cxx rename to Interaction/Widgets/vtkPolyDataSourceWidget.cxx diff --git a/Widgets/vtkPolyDataSourceWidget.h b/Interaction/Widgets/vtkPolyDataSourceWidget.h similarity index 100% rename from Widgets/vtkPolyDataSourceWidget.h rename to Interaction/Widgets/vtkPolyDataSourceWidget.h diff --git a/Widgets/vtkPolygonalHandleRepresentation3D.cxx b/Interaction/Widgets/vtkPolygonalHandleRepresentation3D.cxx similarity index 100% rename from Widgets/vtkPolygonalHandleRepresentation3D.cxx rename to Interaction/Widgets/vtkPolygonalHandleRepresentation3D.cxx diff --git a/Widgets/vtkPolygonalHandleRepresentation3D.h b/Interaction/Widgets/vtkPolygonalHandleRepresentation3D.h similarity index 100% rename from Widgets/vtkPolygonalHandleRepresentation3D.h rename to Interaction/Widgets/vtkPolygonalHandleRepresentation3D.h diff --git a/Widgets/vtkPolygonalSurfaceContourLineInterpolator.cxx b/Interaction/Widgets/vtkPolygonalSurfaceContourLineInterpolator.cxx similarity index 100% rename from Widgets/vtkPolygonalSurfaceContourLineInterpolator.cxx rename to Interaction/Widgets/vtkPolygonalSurfaceContourLineInterpolator.cxx diff --git a/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h b/Interaction/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h similarity index 100% rename from Widgets/vtkPolygonalSurfaceContourLineInterpolator.h rename to Interaction/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h diff --git a/Widgets/vtkPolygonalSurfacePointPlacer.cxx b/Interaction/Widgets/vtkPolygonalSurfacePointPlacer.cxx similarity index 100% rename from Widgets/vtkPolygonalSurfacePointPlacer.cxx rename to Interaction/Widgets/vtkPolygonalSurfacePointPlacer.cxx diff --git a/Widgets/vtkPolygonalSurfacePointPlacer.h b/Interaction/Widgets/vtkPolygonalSurfacePointPlacer.h similarity index 100% rename from Widgets/vtkPolygonalSurfacePointPlacer.h rename to Interaction/Widgets/vtkPolygonalSurfacePointPlacer.h diff --git a/Widgets/vtkProp3DButtonRepresentation.cxx b/Interaction/Widgets/vtkProp3DButtonRepresentation.cxx similarity index 100% rename from Widgets/vtkProp3DButtonRepresentation.cxx rename to Interaction/Widgets/vtkProp3DButtonRepresentation.cxx diff --git a/Widgets/vtkProp3DButtonRepresentation.h b/Interaction/Widgets/vtkProp3DButtonRepresentation.h similarity index 100% rename from Widgets/vtkProp3DButtonRepresentation.h rename to Interaction/Widgets/vtkProp3DButtonRepresentation.h diff --git a/Widgets/vtkRectilinearWipeRepresentation.cxx b/Interaction/Widgets/vtkRectilinearWipeRepresentation.cxx similarity index 100% rename from Widgets/vtkRectilinearWipeRepresentation.cxx rename to Interaction/Widgets/vtkRectilinearWipeRepresentation.cxx diff --git a/Widgets/vtkRectilinearWipeRepresentation.h b/Interaction/Widgets/vtkRectilinearWipeRepresentation.h similarity index 100% rename from Widgets/vtkRectilinearWipeRepresentation.h rename to Interaction/Widgets/vtkRectilinearWipeRepresentation.h diff --git a/Widgets/vtkRectilinearWipeWidget.cxx b/Interaction/Widgets/vtkRectilinearWipeWidget.cxx similarity index 100% rename from Widgets/vtkRectilinearWipeWidget.cxx rename to Interaction/Widgets/vtkRectilinearWipeWidget.cxx diff --git a/Widgets/vtkRectilinearWipeWidget.h b/Interaction/Widgets/vtkRectilinearWipeWidget.h similarity index 100% rename from Widgets/vtkRectilinearWipeWidget.h rename to Interaction/Widgets/vtkRectilinearWipeWidget.h diff --git a/Graphics/vtkResliceCursor.cxx b/Interaction/Widgets/vtkResliceCursor.cxx similarity index 100% rename from Graphics/vtkResliceCursor.cxx rename to Interaction/Widgets/vtkResliceCursor.cxx diff --git a/Graphics/vtkResliceCursor.h b/Interaction/Widgets/vtkResliceCursor.h similarity index 100% rename from Graphics/vtkResliceCursor.h rename to Interaction/Widgets/vtkResliceCursor.h diff --git a/Rendering/vtkResliceCursorActor.cxx b/Interaction/Widgets/vtkResliceCursorActor.cxx similarity index 100% rename from Rendering/vtkResliceCursorActor.cxx rename to Interaction/Widgets/vtkResliceCursorActor.cxx diff --git a/Rendering/vtkResliceCursorActor.h b/Interaction/Widgets/vtkResliceCursorActor.h similarity index 100% rename from Rendering/vtkResliceCursorActor.h rename to Interaction/Widgets/vtkResliceCursorActor.h diff --git a/Widgets/vtkResliceCursorLineRepresentation.cxx b/Interaction/Widgets/vtkResliceCursorLineRepresentation.cxx similarity index 100% rename from Widgets/vtkResliceCursorLineRepresentation.cxx rename to Interaction/Widgets/vtkResliceCursorLineRepresentation.cxx diff --git a/Widgets/vtkResliceCursorLineRepresentation.h b/Interaction/Widgets/vtkResliceCursorLineRepresentation.h similarity index 100% rename from Widgets/vtkResliceCursorLineRepresentation.h rename to Interaction/Widgets/vtkResliceCursorLineRepresentation.h diff --git a/Rendering/vtkResliceCursorPicker.cxx b/Interaction/Widgets/vtkResliceCursorPicker.cxx similarity index 100% rename from Rendering/vtkResliceCursorPicker.cxx rename to Interaction/Widgets/vtkResliceCursorPicker.cxx diff --git a/Rendering/vtkResliceCursorPicker.h b/Interaction/Widgets/vtkResliceCursorPicker.h similarity index 100% rename from Rendering/vtkResliceCursorPicker.h rename to Interaction/Widgets/vtkResliceCursorPicker.h diff --git a/Graphics/vtkResliceCursorPolyDataAlgorithm.cxx b/Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.cxx similarity index 100% rename from Graphics/vtkResliceCursorPolyDataAlgorithm.cxx rename to Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.cxx diff --git a/Graphics/vtkResliceCursorPolyDataAlgorithm.h b/Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.h similarity index 100% rename from Graphics/vtkResliceCursorPolyDataAlgorithm.h rename to Interaction/Widgets/vtkResliceCursorPolyDataAlgorithm.h diff --git a/Widgets/vtkResliceCursorRepresentation.cxx b/Interaction/Widgets/vtkResliceCursorRepresentation.cxx similarity index 100% rename from Widgets/vtkResliceCursorRepresentation.cxx rename to Interaction/Widgets/vtkResliceCursorRepresentation.cxx diff --git a/Widgets/vtkResliceCursorRepresentation.h b/Interaction/Widgets/vtkResliceCursorRepresentation.h similarity index 100% rename from Widgets/vtkResliceCursorRepresentation.h rename to Interaction/Widgets/vtkResliceCursorRepresentation.h diff --git a/Widgets/vtkResliceCursorThickLineRepresentation.cxx b/Interaction/Widgets/vtkResliceCursorThickLineRepresentation.cxx similarity index 100% rename from Widgets/vtkResliceCursorThickLineRepresentation.cxx rename to Interaction/Widgets/vtkResliceCursorThickLineRepresentation.cxx diff --git a/Widgets/vtkResliceCursorThickLineRepresentation.h b/Interaction/Widgets/vtkResliceCursorThickLineRepresentation.h similarity index 100% rename from Widgets/vtkResliceCursorThickLineRepresentation.h rename to Interaction/Widgets/vtkResliceCursorThickLineRepresentation.h diff --git a/Widgets/vtkResliceCursorWidget.cxx b/Interaction/Widgets/vtkResliceCursorWidget.cxx similarity index 100% rename from Widgets/vtkResliceCursorWidget.cxx rename to Interaction/Widgets/vtkResliceCursorWidget.cxx diff --git a/Widgets/vtkResliceCursorWidget.h b/Interaction/Widgets/vtkResliceCursorWidget.h similarity index 100% rename from Widgets/vtkResliceCursorWidget.h rename to Interaction/Widgets/vtkResliceCursorWidget.h diff --git a/Widgets/vtkScalarBarRepresentation.cxx b/Interaction/Widgets/vtkScalarBarRepresentation.cxx similarity index 100% rename from Widgets/vtkScalarBarRepresentation.cxx rename to Interaction/Widgets/vtkScalarBarRepresentation.cxx diff --git a/Widgets/vtkScalarBarRepresentation.h b/Interaction/Widgets/vtkScalarBarRepresentation.h similarity index 100% rename from Widgets/vtkScalarBarRepresentation.h rename to Interaction/Widgets/vtkScalarBarRepresentation.h diff --git a/Widgets/vtkScalarBarWidget.cxx b/Interaction/Widgets/vtkScalarBarWidget.cxx similarity index 100% rename from Widgets/vtkScalarBarWidget.cxx rename to Interaction/Widgets/vtkScalarBarWidget.cxx diff --git a/Widgets/vtkScalarBarWidget.h b/Interaction/Widgets/vtkScalarBarWidget.h similarity index 100% rename from Widgets/vtkScalarBarWidget.h rename to Interaction/Widgets/vtkScalarBarWidget.h diff --git a/Widgets/vtkSeedRepresentation.cxx b/Interaction/Widgets/vtkSeedRepresentation.cxx similarity index 100% rename from Widgets/vtkSeedRepresentation.cxx rename to Interaction/Widgets/vtkSeedRepresentation.cxx diff --git a/Widgets/vtkSeedRepresentation.h b/Interaction/Widgets/vtkSeedRepresentation.h similarity index 100% rename from Widgets/vtkSeedRepresentation.h rename to Interaction/Widgets/vtkSeedRepresentation.h diff --git a/Widgets/vtkSeedWidget.cxx b/Interaction/Widgets/vtkSeedWidget.cxx similarity index 100% rename from Widgets/vtkSeedWidget.cxx rename to Interaction/Widgets/vtkSeedWidget.cxx diff --git a/Widgets/vtkSeedWidget.h b/Interaction/Widgets/vtkSeedWidget.h similarity index 100% rename from Widgets/vtkSeedWidget.h rename to Interaction/Widgets/vtkSeedWidget.h diff --git a/Widgets/vtkSliderRepresentation.cxx b/Interaction/Widgets/vtkSliderRepresentation.cxx similarity index 100% rename from Widgets/vtkSliderRepresentation.cxx rename to Interaction/Widgets/vtkSliderRepresentation.cxx diff --git a/Widgets/vtkSliderRepresentation.h b/Interaction/Widgets/vtkSliderRepresentation.h similarity index 100% rename from Widgets/vtkSliderRepresentation.h rename to Interaction/Widgets/vtkSliderRepresentation.h diff --git a/Widgets/vtkSliderRepresentation2D.cxx b/Interaction/Widgets/vtkSliderRepresentation2D.cxx similarity index 100% rename from Widgets/vtkSliderRepresentation2D.cxx rename to Interaction/Widgets/vtkSliderRepresentation2D.cxx diff --git a/Widgets/vtkSliderRepresentation2D.h b/Interaction/Widgets/vtkSliderRepresentation2D.h similarity index 100% rename from Widgets/vtkSliderRepresentation2D.h rename to Interaction/Widgets/vtkSliderRepresentation2D.h diff --git a/Widgets/vtkSliderRepresentation3D.cxx b/Interaction/Widgets/vtkSliderRepresentation3D.cxx similarity index 100% rename from Widgets/vtkSliderRepresentation3D.cxx rename to Interaction/Widgets/vtkSliderRepresentation3D.cxx diff --git a/Widgets/vtkSliderRepresentation3D.h b/Interaction/Widgets/vtkSliderRepresentation3D.h similarity index 100% rename from Widgets/vtkSliderRepresentation3D.h rename to Interaction/Widgets/vtkSliderRepresentation3D.h diff --git a/Widgets/vtkSliderWidget.cxx b/Interaction/Widgets/vtkSliderWidget.cxx similarity index 100% rename from Widgets/vtkSliderWidget.cxx rename to Interaction/Widgets/vtkSliderWidget.cxx diff --git a/Widgets/vtkSliderWidget.h b/Interaction/Widgets/vtkSliderWidget.h similarity index 100% rename from Widgets/vtkSliderWidget.h rename to Interaction/Widgets/vtkSliderWidget.h diff --git a/Widgets/vtkSphereHandleRepresentation.cxx b/Interaction/Widgets/vtkSphereHandleRepresentation.cxx similarity index 100% rename from Widgets/vtkSphereHandleRepresentation.cxx rename to Interaction/Widgets/vtkSphereHandleRepresentation.cxx diff --git a/Widgets/vtkSphereHandleRepresentation.h b/Interaction/Widgets/vtkSphereHandleRepresentation.h similarity index 100% rename from Widgets/vtkSphereHandleRepresentation.h rename to Interaction/Widgets/vtkSphereHandleRepresentation.h diff --git a/Widgets/vtkSphereRepresentation.cxx b/Interaction/Widgets/vtkSphereRepresentation.cxx similarity index 100% rename from Widgets/vtkSphereRepresentation.cxx rename to Interaction/Widgets/vtkSphereRepresentation.cxx diff --git a/Widgets/vtkSphereRepresentation.h b/Interaction/Widgets/vtkSphereRepresentation.h similarity index 100% rename from Widgets/vtkSphereRepresentation.h rename to Interaction/Widgets/vtkSphereRepresentation.h diff --git a/Widgets/vtkSphereWidget.cxx b/Interaction/Widgets/vtkSphereWidget.cxx similarity index 100% rename from Widgets/vtkSphereWidget.cxx rename to Interaction/Widgets/vtkSphereWidget.cxx diff --git a/Widgets/vtkSphereWidget.h b/Interaction/Widgets/vtkSphereWidget.h similarity index 100% rename from Widgets/vtkSphereWidget.h rename to Interaction/Widgets/vtkSphereWidget.h diff --git a/Widgets/vtkSphereWidget2.cxx b/Interaction/Widgets/vtkSphereWidget2.cxx similarity index 100% rename from Widgets/vtkSphereWidget2.cxx rename to Interaction/Widgets/vtkSphereWidget2.cxx diff --git a/Widgets/vtkSphereWidget2.h b/Interaction/Widgets/vtkSphereWidget2.h similarity index 100% rename from Widgets/vtkSphereWidget2.h rename to Interaction/Widgets/vtkSphereWidget2.h diff --git a/Widgets/vtkSplineRepresentation.cxx b/Interaction/Widgets/vtkSplineRepresentation.cxx similarity index 100% rename from Widgets/vtkSplineRepresentation.cxx rename to Interaction/Widgets/vtkSplineRepresentation.cxx diff --git a/Widgets/vtkSplineRepresentation.h b/Interaction/Widgets/vtkSplineRepresentation.h similarity index 100% rename from Widgets/vtkSplineRepresentation.h rename to Interaction/Widgets/vtkSplineRepresentation.h diff --git a/Widgets/vtkSplineWidget.cxx b/Interaction/Widgets/vtkSplineWidget.cxx similarity index 100% rename from Widgets/vtkSplineWidget.cxx rename to Interaction/Widgets/vtkSplineWidget.cxx diff --git a/Widgets/vtkSplineWidget.h b/Interaction/Widgets/vtkSplineWidget.h similarity index 100% rename from Widgets/vtkSplineWidget.h rename to Interaction/Widgets/vtkSplineWidget.h diff --git a/Widgets/vtkSplineWidget2.cxx b/Interaction/Widgets/vtkSplineWidget2.cxx similarity index 100% rename from Widgets/vtkSplineWidget2.cxx rename to Interaction/Widgets/vtkSplineWidget2.cxx diff --git a/Widgets/vtkSplineWidget2.h b/Interaction/Widgets/vtkSplineWidget2.h similarity index 100% rename from Widgets/vtkSplineWidget2.h rename to Interaction/Widgets/vtkSplineWidget2.h diff --git a/Widgets/vtkTensorProbeRepresentation.cxx b/Interaction/Widgets/vtkTensorProbeRepresentation.cxx similarity index 100% rename from Widgets/vtkTensorProbeRepresentation.cxx rename to Interaction/Widgets/vtkTensorProbeRepresentation.cxx diff --git a/Widgets/vtkTensorProbeRepresentation.h b/Interaction/Widgets/vtkTensorProbeRepresentation.h similarity index 100% rename from Widgets/vtkTensorProbeRepresentation.h rename to Interaction/Widgets/vtkTensorProbeRepresentation.h diff --git a/Widgets/vtkTensorProbeWidget.cxx b/Interaction/Widgets/vtkTensorProbeWidget.cxx similarity index 100% rename from Widgets/vtkTensorProbeWidget.cxx rename to Interaction/Widgets/vtkTensorProbeWidget.cxx diff --git a/Widgets/vtkTensorProbeWidget.h b/Interaction/Widgets/vtkTensorProbeWidget.h similarity index 100% rename from Widgets/vtkTensorProbeWidget.h rename to Interaction/Widgets/vtkTensorProbeWidget.h diff --git a/Widgets/vtkTerrainContourLineInterpolator.cxx b/Interaction/Widgets/vtkTerrainContourLineInterpolator.cxx similarity index 100% rename from Widgets/vtkTerrainContourLineInterpolator.cxx rename to Interaction/Widgets/vtkTerrainContourLineInterpolator.cxx diff --git a/Widgets/vtkTerrainContourLineInterpolator.h b/Interaction/Widgets/vtkTerrainContourLineInterpolator.h similarity index 100% rename from Widgets/vtkTerrainContourLineInterpolator.h rename to Interaction/Widgets/vtkTerrainContourLineInterpolator.h diff --git a/Widgets/vtkTerrainDataPointPlacer.cxx b/Interaction/Widgets/vtkTerrainDataPointPlacer.cxx similarity index 100% rename from Widgets/vtkTerrainDataPointPlacer.cxx rename to Interaction/Widgets/vtkTerrainDataPointPlacer.cxx diff --git a/Widgets/vtkTerrainDataPointPlacer.h b/Interaction/Widgets/vtkTerrainDataPointPlacer.h similarity index 100% rename from Widgets/vtkTerrainDataPointPlacer.h rename to Interaction/Widgets/vtkTerrainDataPointPlacer.h diff --git a/Widgets/vtkTextRepresentation.cxx b/Interaction/Widgets/vtkTextRepresentation.cxx similarity index 100% rename from Widgets/vtkTextRepresentation.cxx rename to Interaction/Widgets/vtkTextRepresentation.cxx diff --git a/Widgets/vtkTextRepresentation.h b/Interaction/Widgets/vtkTextRepresentation.h similarity index 100% rename from Widgets/vtkTextRepresentation.h rename to Interaction/Widgets/vtkTextRepresentation.h diff --git a/Widgets/vtkTextWidget.cxx b/Interaction/Widgets/vtkTextWidget.cxx similarity index 100% rename from Widgets/vtkTextWidget.cxx rename to Interaction/Widgets/vtkTextWidget.cxx diff --git a/Widgets/vtkTextWidget.h b/Interaction/Widgets/vtkTextWidget.h similarity index 100% rename from Widgets/vtkTextWidget.h rename to Interaction/Widgets/vtkTextWidget.h diff --git a/Widgets/vtkTexturedButtonRepresentation.cxx b/Interaction/Widgets/vtkTexturedButtonRepresentation.cxx similarity index 100% rename from Widgets/vtkTexturedButtonRepresentation.cxx rename to Interaction/Widgets/vtkTexturedButtonRepresentation.cxx diff --git a/Widgets/vtkTexturedButtonRepresentation.h b/Interaction/Widgets/vtkTexturedButtonRepresentation.h similarity index 100% rename from Widgets/vtkTexturedButtonRepresentation.h rename to Interaction/Widgets/vtkTexturedButtonRepresentation.h diff --git a/Widgets/vtkTexturedButtonRepresentation2D.cxx b/Interaction/Widgets/vtkTexturedButtonRepresentation2D.cxx similarity index 100% rename from Widgets/vtkTexturedButtonRepresentation2D.cxx rename to Interaction/Widgets/vtkTexturedButtonRepresentation2D.cxx diff --git a/Widgets/vtkTexturedButtonRepresentation2D.h b/Interaction/Widgets/vtkTexturedButtonRepresentation2D.h similarity index 100% rename from Widgets/vtkTexturedButtonRepresentation2D.h rename to Interaction/Widgets/vtkTexturedButtonRepresentation2D.h diff --git a/Widgets/vtkWidgetCallbackMapper.cxx b/Interaction/Widgets/vtkWidgetCallbackMapper.cxx similarity index 100% rename from Widgets/vtkWidgetCallbackMapper.cxx rename to Interaction/Widgets/vtkWidgetCallbackMapper.cxx diff --git a/Widgets/vtkWidgetCallbackMapper.h b/Interaction/Widgets/vtkWidgetCallbackMapper.h similarity index 100% rename from Widgets/vtkWidgetCallbackMapper.h rename to Interaction/Widgets/vtkWidgetCallbackMapper.h diff --git a/Widgets/vtkWidgetEvent.cxx b/Interaction/Widgets/vtkWidgetEvent.cxx similarity index 100% rename from Widgets/vtkWidgetEvent.cxx rename to Interaction/Widgets/vtkWidgetEvent.cxx diff --git a/Widgets/vtkWidgetEvent.h b/Interaction/Widgets/vtkWidgetEvent.h similarity index 100% rename from Widgets/vtkWidgetEvent.h rename to Interaction/Widgets/vtkWidgetEvent.h diff --git a/Widgets/vtkWidgetEventTranslator.cxx b/Interaction/Widgets/vtkWidgetEventTranslator.cxx similarity index 100% rename from Widgets/vtkWidgetEventTranslator.cxx rename to Interaction/Widgets/vtkWidgetEventTranslator.cxx diff --git a/Widgets/vtkWidgetEventTranslator.h b/Interaction/Widgets/vtkWidgetEventTranslator.h similarity index 100% rename from Widgets/vtkWidgetEventTranslator.h rename to Interaction/Widgets/vtkWidgetEventTranslator.h diff --git a/Widgets/vtkWidgetRepresentation.cxx b/Interaction/Widgets/vtkWidgetRepresentation.cxx similarity index 100% rename from Widgets/vtkWidgetRepresentation.cxx rename to Interaction/Widgets/vtkWidgetRepresentation.cxx diff --git a/Widgets/vtkWidgetRepresentation.h b/Interaction/Widgets/vtkWidgetRepresentation.h similarity index 100% rename from Widgets/vtkWidgetRepresentation.h rename to Interaction/Widgets/vtkWidgetRepresentation.h diff --git a/Widgets/vtkWidgetSet.cxx b/Interaction/Widgets/vtkWidgetSet.cxx similarity index 100% rename from Widgets/vtkWidgetSet.cxx rename to Interaction/Widgets/vtkWidgetSet.cxx diff --git a/Widgets/vtkWidgetSet.h b/Interaction/Widgets/vtkWidgetSet.h similarity index 100% rename from Widgets/vtkWidgetSet.h rename to Interaction/Widgets/vtkWidgetSet.h diff --git a/Widgets/vtkXYPlotWidget.cxx b/Interaction/Widgets/vtkXYPlotWidget.cxx similarity index 100% rename from Widgets/vtkXYPlotWidget.cxx rename to Interaction/Widgets/vtkXYPlotWidget.cxx diff --git a/Widgets/vtkXYPlotWidget.h b/Interaction/Widgets/vtkXYPlotWidget.h similarity index 100% rename from Widgets/vtkXYPlotWidget.h rename to Interaction/Widgets/vtkXYPlotWidget.h diff --git a/Parallel/Testing/Cxx/DummyController.cxx b/Parallel/Core/Testing/Cxx/DummyController.cxx similarity index 100% rename from Parallel/Testing/Cxx/DummyController.cxx rename to Parallel/Core/Testing/Cxx/DummyController.cxx diff --git a/Parallel/Testing/Cxx/ExerciseMultiProcessController.cxx b/Parallel/Core/Testing/Cxx/ExerciseMultiProcessController.cxx similarity index 100% rename from Parallel/Testing/Cxx/ExerciseMultiProcessController.cxx rename to Parallel/Core/Testing/Cxx/ExerciseMultiProcessController.cxx diff --git a/Parallel/Testing/Cxx/ExerciseMultiProcessController.h b/Parallel/Core/Testing/Cxx/ExerciseMultiProcessController.h similarity index 100% rename from Parallel/Testing/Cxx/ExerciseMultiProcessController.h rename to Parallel/Core/Testing/Cxx/ExerciseMultiProcessController.h diff --git a/Parallel/Testing/Cxx/SocketClient.cxx b/Parallel/Core/Testing/Cxx/SocketClient.cxx similarity index 100% rename from Parallel/Testing/Cxx/SocketClient.cxx rename to Parallel/Core/Testing/Cxx/SocketClient.cxx diff --git a/Parallel/Testing/Cxx/SocketServer.cxx b/Parallel/Core/Testing/Cxx/SocketServer.cxx similarity index 100% rename from Parallel/Testing/Cxx/SocketServer.cxx rename to Parallel/Core/Testing/Cxx/SocketServer.cxx diff --git a/Parallel/Testing/Cxx/TestFieldDataSerialization.cxx b/Parallel/Core/Testing/Cxx/TestFieldDataSerialization.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestFieldDataSerialization.cxx rename to Parallel/Core/Testing/Cxx/TestFieldDataSerialization.cxx diff --git a/Parallel/Testing/Cxx/TestSockets.py b/Parallel/Core/Testing/Cxx/TestSockets.py similarity index 100% rename from Parallel/Testing/Cxx/TestSockets.py rename to Parallel/Core/Testing/Cxx/TestSockets.py diff --git a/Parallel/Testing/Tcl/TestPolyDataPieces.tcl b/Parallel/Core/Testing/Tcl/TestPolyDataPieces.tcl similarity index 100% rename from Parallel/Testing/Tcl/TestPolyDataPieces.tcl rename to Parallel/Core/Testing/Tcl/TestPolyDataPieces.tcl diff --git a/Parallel/Testing/Tcl/TestUnstructuredPieces.tcl b/Parallel/Core/Testing/Tcl/TestUnstructuredPieces.tcl similarity index 100% rename from Parallel/Testing/Tcl/TestUnstructuredPieces.tcl rename to Parallel/Core/Testing/Tcl/TestUnstructuredPieces.tcl diff --git a/Parallel/vtkCommunicator.cxx b/Parallel/Core/vtkCommunicator.cxx similarity index 100% rename from Parallel/vtkCommunicator.cxx rename to Parallel/Core/vtkCommunicator.cxx diff --git a/Parallel/vtkCommunicator.h b/Parallel/Core/vtkCommunicator.h similarity index 100% rename from Parallel/vtkCommunicator.h rename to Parallel/Core/vtkCommunicator.h diff --git a/Parallel/vtkDummyCommunicator.cxx b/Parallel/Core/vtkDummyCommunicator.cxx similarity index 100% rename from Parallel/vtkDummyCommunicator.cxx rename to Parallel/Core/vtkDummyCommunicator.cxx diff --git a/Parallel/vtkDummyCommunicator.h b/Parallel/Core/vtkDummyCommunicator.h similarity index 100% rename from Parallel/vtkDummyCommunicator.h rename to Parallel/Core/vtkDummyCommunicator.h diff --git a/Parallel/vtkDummyController.cxx b/Parallel/Core/vtkDummyController.cxx similarity index 100% rename from Parallel/vtkDummyController.cxx rename to Parallel/Core/vtkDummyController.cxx diff --git a/Parallel/vtkDummyController.h b/Parallel/Core/vtkDummyController.h similarity index 100% rename from Parallel/vtkDummyController.h rename to Parallel/Core/vtkDummyController.h diff --git a/Parallel/vtkFieldDataSerializer.cxx b/Parallel/Core/vtkFieldDataSerializer.cxx similarity index 100% rename from Parallel/vtkFieldDataSerializer.cxx rename to Parallel/Core/vtkFieldDataSerializer.cxx diff --git a/Parallel/vtkFieldDataSerializer.h b/Parallel/Core/vtkFieldDataSerializer.h similarity index 100% rename from Parallel/vtkFieldDataSerializer.h rename to Parallel/Core/vtkFieldDataSerializer.h diff --git a/Parallel/vtkMultiProcessController.cxx b/Parallel/Core/vtkMultiProcessController.cxx similarity index 100% rename from Parallel/vtkMultiProcessController.cxx rename to Parallel/Core/vtkMultiProcessController.cxx diff --git a/Parallel/vtkMultiProcessController.h b/Parallel/Core/vtkMultiProcessController.h similarity index 100% rename from Parallel/vtkMultiProcessController.h rename to Parallel/Core/vtkMultiProcessController.h diff --git a/Parallel/vtkMultiProcessStream.cxx b/Parallel/Core/vtkMultiProcessStream.cxx similarity index 100% rename from Parallel/vtkMultiProcessStream.cxx rename to Parallel/Core/vtkMultiProcessStream.cxx diff --git a/Parallel/vtkMultiProcessStream.h b/Parallel/Core/vtkMultiProcessStream.h similarity index 100% rename from Parallel/vtkMultiProcessStream.h rename to Parallel/Core/vtkMultiProcessStream.h diff --git a/Parallel/vtkProcess.cxx b/Parallel/Core/vtkProcess.cxx similarity index 100% rename from Parallel/vtkProcess.cxx rename to Parallel/Core/vtkProcess.cxx diff --git a/Parallel/vtkProcess.h b/Parallel/Core/vtkProcess.h similarity index 100% rename from Parallel/vtkProcess.h rename to Parallel/Core/vtkProcess.h diff --git a/Parallel/vtkProcessGroup.cxx b/Parallel/Core/vtkProcessGroup.cxx similarity index 100% rename from Parallel/vtkProcessGroup.cxx rename to Parallel/Core/vtkProcessGroup.cxx diff --git a/Parallel/vtkProcessGroup.h b/Parallel/Core/vtkProcessGroup.h similarity index 100% rename from Parallel/vtkProcessGroup.h rename to Parallel/Core/vtkProcessGroup.h diff --git a/Parallel/vtkSocketCommunicator.cxx b/Parallel/Core/vtkSocketCommunicator.cxx similarity index 100% rename from Parallel/vtkSocketCommunicator.cxx rename to Parallel/Core/vtkSocketCommunicator.cxx diff --git a/Parallel/vtkSocketCommunicator.h b/Parallel/Core/vtkSocketCommunicator.h similarity index 100% rename from Parallel/vtkSocketCommunicator.h rename to Parallel/Core/vtkSocketCommunicator.h diff --git a/Parallel/vtkSocketController.cxx b/Parallel/Core/vtkSocketController.cxx similarity index 100% rename from Parallel/vtkSocketController.cxx rename to Parallel/Core/vtkSocketController.cxx diff --git a/Parallel/vtkSocketController.h b/Parallel/Core/vtkSocketController.h similarity index 100% rename from Parallel/vtkSocketController.h rename to Parallel/Core/vtkSocketController.h diff --git a/Parallel/vtkSubCommunicator.cxx b/Parallel/Core/vtkSubCommunicator.cxx similarity index 100% rename from Parallel/vtkSubCommunicator.cxx rename to Parallel/Core/vtkSubCommunicator.cxx diff --git a/Parallel/vtkSubCommunicator.h b/Parallel/Core/vtkSubCommunicator.h similarity index 100% rename from Parallel/vtkSubCommunicator.h rename to Parallel/Core/vtkSubCommunicator.h diff --git a/Parallel/vtkSubGroup.cxx b/Parallel/Core/vtkSubGroup.cxx similarity index 100% rename from Parallel/vtkSubGroup.cxx rename to Parallel/Core/vtkSubGroup.cxx diff --git a/Parallel/vtkSubGroup.h b/Parallel/Core/vtkSubGroup.h similarity index 100% rename from Parallel/vtkSubGroup.h rename to Parallel/Core/vtkSubGroup.h diff --git a/Parallel/Testing/Cxx/GenericCommunicator.cxx b/Parallel/MPI/Testing/Cxx/GenericCommunicator.cxx similarity index 100% rename from Parallel/Testing/Cxx/GenericCommunicator.cxx rename to Parallel/MPI/Testing/Cxx/GenericCommunicator.cxx diff --git a/Parallel/Testing/Cxx/MPIController.cxx b/Parallel/MPI/Testing/Cxx/MPIController.cxx similarity index 100% rename from Parallel/Testing/Cxx/MPIController.cxx rename to Parallel/MPI/Testing/Cxx/MPIController.cxx diff --git a/Parallel/Testing/Cxx/TestDistributedDataShadowMapPass.cxx b/Parallel/MPI/Testing/Cxx/TestDistributedDataShadowMapPass.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestDistributedDataShadowMapPass.cxx rename to Parallel/MPI/Testing/Cxx/TestDistributedDataShadowMapPass.cxx diff --git a/Parallel/Testing/Cxx/TestNonBlockingCommunication.cxx b/Parallel/MPI/Testing/Cxx/TestNonBlockingCommunication.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestNonBlockingCommunication.cxx rename to Parallel/MPI/Testing/Cxx/TestNonBlockingCommunication.cxx diff --git a/Parallel/Testing/Cxx/TestProcess.cxx b/Parallel/MPI/Testing/Cxx/TestProcess.cxx similarity index 100% rename from Parallel/Testing/Cxx/TestProcess.cxx rename to Parallel/MPI/Testing/Cxx/TestProcess.cxx diff --git a/Parallel/vtkMPI.h b/Parallel/MPI/vtkMPI.h similarity index 100% rename from Parallel/vtkMPI.h rename to Parallel/MPI/vtkMPI.h diff --git a/Parallel/vtkMPICommunicator.cxx b/Parallel/MPI/vtkMPICommunicator.cxx similarity index 100% rename from Parallel/vtkMPICommunicator.cxx rename to Parallel/MPI/vtkMPICommunicator.cxx diff --git a/Parallel/vtkMPICommunicator.h b/Parallel/MPI/vtkMPICommunicator.h similarity index 100% rename from Parallel/vtkMPICommunicator.h rename to Parallel/MPI/vtkMPICommunicator.h diff --git a/Parallel/vtkMPIController.cxx b/Parallel/MPI/vtkMPIController.cxx similarity index 100% rename from Parallel/vtkMPIController.cxx rename to Parallel/MPI/vtkMPIController.cxx diff --git a/Parallel/vtkMPIController.h b/Parallel/MPI/vtkMPIController.h similarity index 100% rename from Parallel/vtkMPIController.h rename to Parallel/MPI/vtkMPIController.h diff --git a/Parallel/vtkMPIEventLog.cxx b/Parallel/MPI/vtkMPIEventLog.cxx similarity index 100% rename from Parallel/vtkMPIEventLog.cxx rename to Parallel/MPI/vtkMPIEventLog.cxx diff --git a/Parallel/vtkMPIEventLog.h b/Parallel/MPI/vtkMPIEventLog.h similarity index 100% rename from Parallel/vtkMPIEventLog.h rename to Parallel/MPI/vtkMPIEventLog.h diff --git a/Hybrid/Testing/Cxx/TestAxisActor3D.cxx b/Rendering/Annotation/Testing/Cxx/TestAxisActor3D.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestAxisActor3D.cxx rename to Rendering/Annotation/Testing/Cxx/TestAxisActor3D.cxx diff --git a/Hybrid/Testing/Cxx/TestBarChartActor.cxx b/Rendering/Annotation/Testing/Cxx/TestBarChartActor.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestBarChartActor.cxx rename to Rendering/Annotation/Testing/Cxx/TestBarChartActor.cxx diff --git a/Hybrid/Testing/Cxx/TestCubeAxes2DMode.cxx b/Rendering/Annotation/Testing/Cxx/TestCubeAxes2DMode.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestCubeAxes2DMode.cxx rename to Rendering/Annotation/Testing/Cxx/TestCubeAxes2DMode.cxx diff --git a/Hybrid/Testing/Cxx/TestCubeAxes3.cxx b/Rendering/Annotation/Testing/Cxx/TestCubeAxes3.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestCubeAxes3.cxx rename to Rendering/Annotation/Testing/Cxx/TestCubeAxes3.cxx diff --git a/Hybrid/Testing/Cxx/TestCubeAxesWithGridLines.cxx b/Rendering/Annotation/Testing/Cxx/TestCubeAxesWithGridLines.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestCubeAxesWithGridLines.cxx rename to Rendering/Annotation/Testing/Cxx/TestCubeAxesWithGridLines.cxx diff --git a/Hybrid/Testing/Cxx/TestCubeAxesWithXInnerGrids.cxx b/Rendering/Annotation/Testing/Cxx/TestCubeAxesWithXInnerGrids.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestCubeAxesWithXInnerGrids.cxx rename to Rendering/Annotation/Testing/Cxx/TestCubeAxesWithXInnerGrids.cxx diff --git a/Hybrid/Testing/Cxx/TestCubeAxesWithXInnerPolys.cxx b/Rendering/Annotation/Testing/Cxx/TestCubeAxesWithXInnerPolys.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestCubeAxesWithXInnerPolys.cxx rename to Rendering/Annotation/Testing/Cxx/TestCubeAxesWithXInnerPolys.cxx diff --git a/Hybrid/Testing/Cxx/TestCubeAxesWithXLines.cxx b/Rendering/Annotation/Testing/Cxx/TestCubeAxesWithXLines.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestCubeAxesWithXLines.cxx rename to Rendering/Annotation/Testing/Cxx/TestCubeAxesWithXLines.cxx diff --git a/Hybrid/Testing/Cxx/TestCubeAxesWithYInnerGrids.cxx b/Rendering/Annotation/Testing/Cxx/TestCubeAxesWithYInnerGrids.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestCubeAxesWithYInnerGrids.cxx rename to Rendering/Annotation/Testing/Cxx/TestCubeAxesWithYInnerGrids.cxx diff --git a/Hybrid/Testing/Cxx/TestCubeAxesWithYInnerPolys.cxx b/Rendering/Annotation/Testing/Cxx/TestCubeAxesWithYInnerPolys.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestCubeAxesWithYInnerPolys.cxx rename to Rendering/Annotation/Testing/Cxx/TestCubeAxesWithYInnerPolys.cxx diff --git a/Hybrid/Testing/Cxx/TestCubeAxesWithYLines.cxx b/Rendering/Annotation/Testing/Cxx/TestCubeAxesWithYLines.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestCubeAxesWithYLines.cxx rename to Rendering/Annotation/Testing/Cxx/TestCubeAxesWithYLines.cxx diff --git a/Hybrid/Testing/Cxx/TestCubeAxesWithZInnerGrids.cxx b/Rendering/Annotation/Testing/Cxx/TestCubeAxesWithZInnerGrids.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestCubeAxesWithZInnerGrids.cxx rename to Rendering/Annotation/Testing/Cxx/TestCubeAxesWithZInnerGrids.cxx diff --git a/Hybrid/Testing/Cxx/TestCubeAxesWithZInnerPolys.cxx b/Rendering/Annotation/Testing/Cxx/TestCubeAxesWithZInnerPolys.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestCubeAxesWithZInnerPolys.cxx rename to Rendering/Annotation/Testing/Cxx/TestCubeAxesWithZInnerPolys.cxx diff --git a/Hybrid/Testing/Cxx/TestCubeAxesWithZLines.cxx b/Rendering/Annotation/Testing/Cxx/TestCubeAxesWithZLines.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestCubeAxesWithZLines.cxx rename to Rendering/Annotation/Testing/Cxx/TestCubeAxesWithZLines.cxx diff --git a/Hybrid/Testing/Cxx/TestLegendBoxActor.cxx b/Rendering/Annotation/Testing/Cxx/TestLegendBoxActor.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestLegendBoxActor.cxx rename to Rendering/Annotation/Testing/Cxx/TestLegendBoxActor.cxx diff --git a/Hybrid/Testing/Cxx/TestLegendScaleActor.cxx b/Rendering/Annotation/Testing/Cxx/TestLegendScaleActor.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestLegendScaleActor.cxx rename to Rendering/Annotation/Testing/Cxx/TestLegendScaleActor.cxx diff --git a/Hybrid/Testing/Cxx/TestPieChartActor.cxx b/Rendering/Annotation/Testing/Cxx/TestPieChartActor.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestPieChartActor.cxx rename to Rendering/Annotation/Testing/Cxx/TestPieChartActor.cxx diff --git a/Hybrid/Testing/Cxx/TestPolarAxes.cxx b/Rendering/Annotation/Testing/Cxx/TestPolarAxes.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestPolarAxes.cxx rename to Rendering/Annotation/Testing/Cxx/TestPolarAxes.cxx diff --git a/Hybrid/Testing/Cxx/TestSpiderPlotActor.cxx b/Rendering/Annotation/Testing/Cxx/TestSpiderPlotActor.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestSpiderPlotActor.cxx rename to Rendering/Annotation/Testing/Cxx/TestSpiderPlotActor.cxx diff --git a/Hybrid/Testing/Tcl/TestCaptionActor.tcl b/Rendering/Annotation/Testing/Tcl/TestCaptionActor.tcl similarity index 100% rename from Hybrid/Testing/Tcl/TestCaptionActor.tcl rename to Rendering/Annotation/Testing/Tcl/TestCaptionActor.tcl diff --git a/Hybrid/Testing/Tcl/bore.tcl b/Rendering/Annotation/Testing/Tcl/bore.tcl similarity index 100% rename from Hybrid/Testing/Tcl/bore.tcl rename to Rendering/Annotation/Testing/Tcl/bore.tcl diff --git a/Hybrid/Testing/Tcl/cubeAxes.tcl b/Rendering/Annotation/Testing/Tcl/cubeAxes.tcl similarity index 100% rename from Hybrid/Testing/Tcl/cubeAxes.tcl rename to Rendering/Annotation/Testing/Tcl/cubeAxes.tcl diff --git a/Hybrid/Testing/Tcl/cubeAxes2.tcl b/Rendering/Annotation/Testing/Tcl/cubeAxes2.tcl similarity index 100% rename from Hybrid/Testing/Tcl/cubeAxes2.tcl rename to Rendering/Annotation/Testing/Tcl/cubeAxes2.tcl diff --git a/Hybrid/Testing/Tcl/cubeAxes3.tcl b/Rendering/Annotation/Testing/Tcl/cubeAxes3.tcl similarity index 100% rename from Hybrid/Testing/Tcl/cubeAxes3.tcl rename to Rendering/Annotation/Testing/Tcl/cubeAxes3.tcl diff --git a/Hybrid/Testing/Tcl/xyPlot.tcl b/Rendering/Annotation/Testing/Tcl/xyPlot.tcl similarity index 100% rename from Hybrid/Testing/Tcl/xyPlot.tcl rename to Rendering/Annotation/Testing/Tcl/xyPlot.tcl diff --git a/Hybrid/Testing/Tcl/xyPlot2.tcl b/Rendering/Annotation/Testing/Tcl/xyPlot2.tcl similarity index 100% rename from Hybrid/Testing/Tcl/xyPlot2.tcl rename to Rendering/Annotation/Testing/Tcl/xyPlot2.tcl diff --git a/Hybrid/Testing/Tcl/xyPlot3.tcl b/Rendering/Annotation/Testing/Tcl/xyPlot3.tcl similarity index 100% rename from Hybrid/Testing/Tcl/xyPlot3.tcl rename to Rendering/Annotation/Testing/Tcl/xyPlot3.tcl diff --git a/Hybrid/Testing/Tcl/xyPlot4.tcl b/Rendering/Annotation/Testing/Tcl/xyPlot4.tcl similarity index 100% rename from Hybrid/Testing/Tcl/xyPlot4.tcl rename to Rendering/Annotation/Testing/Tcl/xyPlot4.tcl diff --git a/Hybrid/vtkAnnotatedCubeActor.cxx b/Rendering/Annotation/vtkAnnotatedCubeActor.cxx similarity index 100% rename from Hybrid/vtkAnnotatedCubeActor.cxx rename to Rendering/Annotation/vtkAnnotatedCubeActor.cxx diff --git a/Hybrid/vtkAnnotatedCubeActor.h b/Rendering/Annotation/vtkAnnotatedCubeActor.h similarity index 100% rename from Hybrid/vtkAnnotatedCubeActor.h rename to Rendering/Annotation/vtkAnnotatedCubeActor.h diff --git a/Hybrid/vtkArcPlotter.cxx b/Rendering/Annotation/vtkArcPlotter.cxx similarity index 100% rename from Hybrid/vtkArcPlotter.cxx rename to Rendering/Annotation/vtkArcPlotter.cxx diff --git a/Hybrid/vtkArcPlotter.h b/Rendering/Annotation/vtkArcPlotter.h similarity index 100% rename from Hybrid/vtkArcPlotter.h rename to Rendering/Annotation/vtkArcPlotter.h diff --git a/Hybrid/vtkAxesActor.cxx b/Rendering/Annotation/vtkAxesActor.cxx similarity index 100% rename from Hybrid/vtkAxesActor.cxx rename to Rendering/Annotation/vtkAxesActor.cxx diff --git a/Hybrid/vtkAxesActor.h b/Rendering/Annotation/vtkAxesActor.h similarity index 100% rename from Hybrid/vtkAxesActor.h rename to Rendering/Annotation/vtkAxesActor.h diff --git a/Hybrid/vtkAxisActor.cxx b/Rendering/Annotation/vtkAxisActor.cxx similarity index 100% rename from Hybrid/vtkAxisActor.cxx rename to Rendering/Annotation/vtkAxisActor.cxx diff --git a/Hybrid/vtkAxisActor.h b/Rendering/Annotation/vtkAxisActor.h similarity index 100% rename from Hybrid/vtkAxisActor.h rename to Rendering/Annotation/vtkAxisActor.h diff --git a/Rendering/vtkAxisActor2D.cxx b/Rendering/Annotation/vtkAxisActor2D.cxx similarity index 100% rename from Rendering/vtkAxisActor2D.cxx rename to Rendering/Annotation/vtkAxisActor2D.cxx diff --git a/Rendering/vtkAxisActor2D.h b/Rendering/Annotation/vtkAxisActor2D.h similarity index 100% rename from Rendering/vtkAxisActor2D.h rename to Rendering/Annotation/vtkAxisActor2D.h diff --git a/Hybrid/vtkAxisFollower.cxx b/Rendering/Annotation/vtkAxisFollower.cxx similarity index 100% rename from Hybrid/vtkAxisFollower.cxx rename to Rendering/Annotation/vtkAxisFollower.cxx diff --git a/Hybrid/vtkAxisFollower.h b/Rendering/Annotation/vtkAxisFollower.h similarity index 100% rename from Hybrid/vtkAxisFollower.h rename to Rendering/Annotation/vtkAxisFollower.h diff --git a/Hybrid/vtkBarChartActor.cxx b/Rendering/Annotation/vtkBarChartActor.cxx similarity index 100% rename from Hybrid/vtkBarChartActor.cxx rename to Rendering/Annotation/vtkBarChartActor.cxx diff --git a/Hybrid/vtkBarChartActor.h b/Rendering/Annotation/vtkBarChartActor.h similarity index 100% rename from Hybrid/vtkBarChartActor.h rename to Rendering/Annotation/vtkBarChartActor.h diff --git a/Hybrid/vtkCaptionActor2D.cxx b/Rendering/Annotation/vtkCaptionActor2D.cxx similarity index 100% rename from Hybrid/vtkCaptionActor2D.cxx rename to Rendering/Annotation/vtkCaptionActor2D.cxx diff --git a/Hybrid/vtkCaptionActor2D.h b/Rendering/Annotation/vtkCaptionActor2D.h similarity index 100% rename from Hybrid/vtkCaptionActor2D.h rename to Rendering/Annotation/vtkCaptionActor2D.h diff --git a/Hybrid/vtkCornerAnnotation.cxx b/Rendering/Annotation/vtkCornerAnnotation.cxx similarity index 100% rename from Hybrid/vtkCornerAnnotation.cxx rename to Rendering/Annotation/vtkCornerAnnotation.cxx diff --git a/Hybrid/vtkCornerAnnotation.h b/Rendering/Annotation/vtkCornerAnnotation.h similarity index 100% rename from Hybrid/vtkCornerAnnotation.h rename to Rendering/Annotation/vtkCornerAnnotation.h diff --git a/Hybrid/vtkCubeAxesActor.cxx b/Rendering/Annotation/vtkCubeAxesActor.cxx similarity index 100% rename from Hybrid/vtkCubeAxesActor.cxx rename to Rendering/Annotation/vtkCubeAxesActor.cxx diff --git a/Hybrid/vtkCubeAxesActor.h b/Rendering/Annotation/vtkCubeAxesActor.h similarity index 100% rename from Hybrid/vtkCubeAxesActor.h rename to Rendering/Annotation/vtkCubeAxesActor.h diff --git a/Hybrid/vtkCubeAxesActor2D.cxx b/Rendering/Annotation/vtkCubeAxesActor2D.cxx similarity index 100% rename from Hybrid/vtkCubeAxesActor2D.cxx rename to Rendering/Annotation/vtkCubeAxesActor2D.cxx diff --git a/Hybrid/vtkCubeAxesActor2D.h b/Rendering/Annotation/vtkCubeAxesActor2D.h similarity index 100% rename from Hybrid/vtkCubeAxesActor2D.h rename to Rendering/Annotation/vtkCubeAxesActor2D.h diff --git a/Rendering/vtkLeaderActor2D.cxx b/Rendering/Annotation/vtkLeaderActor2D.cxx similarity index 100% rename from Rendering/vtkLeaderActor2D.cxx rename to Rendering/Annotation/vtkLeaderActor2D.cxx diff --git a/Rendering/vtkLeaderActor2D.h b/Rendering/Annotation/vtkLeaderActor2D.h similarity index 100% rename from Rendering/vtkLeaderActor2D.h rename to Rendering/Annotation/vtkLeaderActor2D.h diff --git a/Hybrid/vtkLegendBoxActor.cxx b/Rendering/Annotation/vtkLegendBoxActor.cxx similarity index 100% rename from Hybrid/vtkLegendBoxActor.cxx rename to Rendering/Annotation/vtkLegendBoxActor.cxx diff --git a/Hybrid/vtkLegendBoxActor.h b/Rendering/Annotation/vtkLegendBoxActor.h similarity index 100% rename from Hybrid/vtkLegendBoxActor.h rename to Rendering/Annotation/vtkLegendBoxActor.h diff --git a/Hybrid/vtkLegendScaleActor.cxx b/Rendering/Annotation/vtkLegendScaleActor.cxx similarity index 100% rename from Hybrid/vtkLegendScaleActor.cxx rename to Rendering/Annotation/vtkLegendScaleActor.cxx diff --git a/Hybrid/vtkLegendScaleActor.h b/Rendering/Annotation/vtkLegendScaleActor.h similarity index 100% rename from Hybrid/vtkLegendScaleActor.h rename to Rendering/Annotation/vtkLegendScaleActor.h diff --git a/Rendering/vtkParallelCoordinatesActor.cxx b/Rendering/Annotation/vtkParallelCoordinatesActor.cxx similarity index 100% rename from Rendering/vtkParallelCoordinatesActor.cxx rename to Rendering/Annotation/vtkParallelCoordinatesActor.cxx diff --git a/Rendering/vtkParallelCoordinatesActor.h b/Rendering/Annotation/vtkParallelCoordinatesActor.h similarity index 100% rename from Rendering/vtkParallelCoordinatesActor.h rename to Rendering/Annotation/vtkParallelCoordinatesActor.h diff --git a/Hybrid/vtkPieChartActor.cxx b/Rendering/Annotation/vtkPieChartActor.cxx similarity index 100% rename from Hybrid/vtkPieChartActor.cxx rename to Rendering/Annotation/vtkPieChartActor.cxx diff --git a/Hybrid/vtkPieChartActor.h b/Rendering/Annotation/vtkPieChartActor.h similarity index 100% rename from Hybrid/vtkPieChartActor.h rename to Rendering/Annotation/vtkPieChartActor.h diff --git a/Hybrid/vtkPolarAxesActor.cxx b/Rendering/Annotation/vtkPolarAxesActor.cxx similarity index 100% rename from Hybrid/vtkPolarAxesActor.cxx rename to Rendering/Annotation/vtkPolarAxesActor.cxx diff --git a/Hybrid/vtkPolarAxesActor.h b/Rendering/Annotation/vtkPolarAxesActor.h similarity index 100% rename from Hybrid/vtkPolarAxesActor.h rename to Rendering/Annotation/vtkPolarAxesActor.h diff --git a/Rendering/vtkScalarBarActor.cxx b/Rendering/Annotation/vtkScalarBarActor.cxx similarity index 100% rename from Rendering/vtkScalarBarActor.cxx rename to Rendering/Annotation/vtkScalarBarActor.cxx diff --git a/Rendering/vtkScalarBarActor.h b/Rendering/Annotation/vtkScalarBarActor.h similarity index 100% rename from Rendering/vtkScalarBarActor.h rename to Rendering/Annotation/vtkScalarBarActor.h diff --git a/Hybrid/vtkSpiderPlotActor.cxx b/Rendering/Annotation/vtkSpiderPlotActor.cxx similarity index 100% rename from Hybrid/vtkSpiderPlotActor.cxx rename to Rendering/Annotation/vtkSpiderPlotActor.cxx diff --git a/Hybrid/vtkSpiderPlotActor.h b/Rendering/Annotation/vtkSpiderPlotActor.h similarity index 100% rename from Hybrid/vtkSpiderPlotActor.h rename to Rendering/Annotation/vtkSpiderPlotActor.h diff --git a/Hybrid/vtkXYPlotActor.cxx b/Rendering/Annotation/vtkXYPlotActor.cxx similarity index 100% rename from Hybrid/vtkXYPlotActor.cxx rename to Rendering/Annotation/vtkXYPlotActor.cxx diff --git a/Hybrid/vtkXYPlotActor.h b/Rendering/Annotation/vtkXYPlotActor.h similarity index 100% rename from Hybrid/vtkXYPlotActor.h rename to Rendering/Annotation/vtkXYPlotActor.h diff --git a/Rendering/vtkCgShader.cxx b/Rendering/Cg/vtkCgShader.cxx similarity index 100% rename from Rendering/vtkCgShader.cxx rename to Rendering/Cg/vtkCgShader.cxx diff --git a/Rendering/vtkCgShader.h b/Rendering/Cg/vtkCgShader.h similarity index 100% rename from Rendering/vtkCgShader.h rename to Rendering/Cg/vtkCgShader.h diff --git a/Rendering/vtkCgShaderDeviceAdapter.cxx b/Rendering/Cg/vtkCgShaderDeviceAdapter.cxx similarity index 100% rename from Rendering/vtkCgShaderDeviceAdapter.cxx rename to Rendering/Cg/vtkCgShaderDeviceAdapter.cxx diff --git a/Rendering/vtkCgShaderDeviceAdapter.h b/Rendering/Cg/vtkCgShaderDeviceAdapter.h similarity index 100% rename from Rendering/vtkCgShaderDeviceAdapter.h rename to Rendering/Cg/vtkCgShaderDeviceAdapter.h diff --git a/Rendering/vtkCgShaderProgram.cxx b/Rendering/Cg/vtkCgShaderProgram.cxx similarity index 100% rename from Rendering/vtkCgShaderProgram.cxx rename to Rendering/Cg/vtkCgShaderProgram.cxx diff --git a/Rendering/vtkCgShaderProgram.h b/Rendering/Cg/vtkCgShaderProgram.h similarity index 100% rename from Rendering/vtkCgShaderProgram.h rename to Rendering/Cg/vtkCgShaderProgram.h diff --git a/Charts/vtkAbstractContextBufferId.cxx b/Rendering/Context2D/vtkAbstractContextBufferId.cxx similarity index 100% rename from Charts/vtkAbstractContextBufferId.cxx rename to Rendering/Context2D/vtkAbstractContextBufferId.cxx diff --git a/Charts/vtkAbstractContextBufferId.h b/Rendering/Context2D/vtkAbstractContextBufferId.h similarity index 100% rename from Charts/vtkAbstractContextBufferId.h rename to Rendering/Context2D/vtkAbstractContextBufferId.h diff --git a/Charts/vtkAbstractContextItem.cxx b/Rendering/Context2D/vtkAbstractContextItem.cxx similarity index 100% rename from Charts/vtkAbstractContextItem.cxx rename to Rendering/Context2D/vtkAbstractContextItem.cxx diff --git a/Charts/vtkAbstractContextItem.h b/Rendering/Context2D/vtkAbstractContextItem.h similarity index 100% rename from Charts/vtkAbstractContextItem.h rename to Rendering/Context2D/vtkAbstractContextItem.h diff --git a/Charts/vtkBlockItem.cxx b/Rendering/Context2D/vtkBlockItem.cxx similarity index 100% rename from Charts/vtkBlockItem.cxx rename to Rendering/Context2D/vtkBlockItem.cxx diff --git a/Charts/vtkBlockItem.h b/Rendering/Context2D/vtkBlockItem.h similarity index 100% rename from Charts/vtkBlockItem.h rename to Rendering/Context2D/vtkBlockItem.h diff --git a/Charts/vtkBrush.cxx b/Rendering/Context2D/vtkBrush.cxx similarity index 100% rename from Charts/vtkBrush.cxx rename to Rendering/Context2D/vtkBrush.cxx diff --git a/Charts/vtkBrush.h b/Rendering/Context2D/vtkBrush.h similarity index 100% rename from Charts/vtkBrush.h rename to Rendering/Context2D/vtkBrush.h diff --git a/Charts/vtkContext2D.cxx b/Rendering/Context2D/vtkContext2D.cxx similarity index 100% rename from Charts/vtkContext2D.cxx rename to Rendering/Context2D/vtkContext2D.cxx diff --git a/Charts/vtkContext2D.h b/Rendering/Context2D/vtkContext2D.h similarity index 100% rename from Charts/vtkContext2D.h rename to Rendering/Context2D/vtkContext2D.h diff --git a/Charts/vtkContext3D.cxx b/Rendering/Context2D/vtkContext3D.cxx similarity index 100% rename from Charts/vtkContext3D.cxx rename to Rendering/Context2D/vtkContext3D.cxx diff --git a/Charts/vtkContext3D.h b/Rendering/Context2D/vtkContext3D.h similarity index 100% rename from Charts/vtkContext3D.h rename to Rendering/Context2D/vtkContext3D.h diff --git a/Charts/vtkContextActor.cxx b/Rendering/Context2D/vtkContextActor.cxx similarity index 100% rename from Charts/vtkContextActor.cxx rename to Rendering/Context2D/vtkContextActor.cxx diff --git a/Charts/vtkContextActor.h b/Rendering/Context2D/vtkContextActor.h similarity index 100% rename from Charts/vtkContextActor.h rename to Rendering/Context2D/vtkContextActor.h diff --git a/Charts/vtkContextBufferId.cxx b/Rendering/Context2D/vtkContextBufferId.cxx similarity index 100% rename from Charts/vtkContextBufferId.cxx rename to Rendering/Context2D/vtkContextBufferId.cxx diff --git a/Charts/vtkContextBufferId.h b/Rendering/Context2D/vtkContextBufferId.h similarity index 100% rename from Charts/vtkContextBufferId.h rename to Rendering/Context2D/vtkContextBufferId.h diff --git a/Charts/vtkContextClip.cxx b/Rendering/Context2D/vtkContextClip.cxx similarity index 100% rename from Charts/vtkContextClip.cxx rename to Rendering/Context2D/vtkContextClip.cxx diff --git a/Charts/vtkContextClip.h b/Rendering/Context2D/vtkContextClip.h similarity index 100% rename from Charts/vtkContextClip.h rename to Rendering/Context2D/vtkContextClip.h diff --git a/Charts/vtkContextDevice2D.cxx b/Rendering/Context2D/vtkContextDevice2D.cxx similarity index 100% rename from Charts/vtkContextDevice2D.cxx rename to Rendering/Context2D/vtkContextDevice2D.cxx diff --git a/Charts/vtkContextDevice2D.h b/Rendering/Context2D/vtkContextDevice2D.h similarity index 100% rename from Charts/vtkContextDevice2D.h rename to Rendering/Context2D/vtkContextDevice2D.h diff --git a/Charts/vtkContextDevice3D.cxx b/Rendering/Context2D/vtkContextDevice3D.cxx similarity index 100% rename from Charts/vtkContextDevice3D.cxx rename to Rendering/Context2D/vtkContextDevice3D.cxx diff --git a/Charts/vtkContextDevice3D.h b/Rendering/Context2D/vtkContextDevice3D.h similarity index 100% rename from Charts/vtkContextDevice3D.h rename to Rendering/Context2D/vtkContextDevice3D.h diff --git a/Charts/vtkContextItem.cxx b/Rendering/Context2D/vtkContextItem.cxx similarity index 100% rename from Charts/vtkContextItem.cxx rename to Rendering/Context2D/vtkContextItem.cxx diff --git a/Charts/vtkContextItem.h b/Rendering/Context2D/vtkContextItem.h similarity index 100% rename from Charts/vtkContextItem.h rename to Rendering/Context2D/vtkContextItem.h diff --git a/Charts/vtkContextKeyEvent.cxx b/Rendering/Context2D/vtkContextKeyEvent.cxx similarity index 100% rename from Charts/vtkContextKeyEvent.cxx rename to Rendering/Context2D/vtkContextKeyEvent.cxx diff --git a/Charts/vtkContextKeyEvent.h b/Rendering/Context2D/vtkContextKeyEvent.h similarity index 100% rename from Charts/vtkContextKeyEvent.h rename to Rendering/Context2D/vtkContextKeyEvent.h diff --git a/Charts/vtkContextMapper2D.cxx b/Rendering/Context2D/vtkContextMapper2D.cxx similarity index 100% rename from Charts/vtkContextMapper2D.cxx rename to Rendering/Context2D/vtkContextMapper2D.cxx diff --git a/Charts/vtkContextMapper2D.h b/Rendering/Context2D/vtkContextMapper2D.h similarity index 100% rename from Charts/vtkContextMapper2D.h rename to Rendering/Context2D/vtkContextMapper2D.h diff --git a/Charts/vtkContextMouseEvent.cxx b/Rendering/Context2D/vtkContextMouseEvent.cxx similarity index 100% rename from Charts/vtkContextMouseEvent.cxx rename to Rendering/Context2D/vtkContextMouseEvent.cxx diff --git a/Charts/vtkContextMouseEvent.h b/Rendering/Context2D/vtkContextMouseEvent.h similarity index 100% rename from Charts/vtkContextMouseEvent.h rename to Rendering/Context2D/vtkContextMouseEvent.h diff --git a/Charts/vtkContextScene.cxx b/Rendering/Context2D/vtkContextScene.cxx similarity index 100% rename from Charts/vtkContextScene.cxx rename to Rendering/Context2D/vtkContextScene.cxx diff --git a/Charts/vtkContextScene.h b/Rendering/Context2D/vtkContextScene.h similarity index 100% rename from Charts/vtkContextScene.h rename to Rendering/Context2D/vtkContextScene.h diff --git a/Charts/vtkContextScenePrivate.h b/Rendering/Context2D/vtkContextScenePrivate.h similarity index 100% rename from Charts/vtkContextScenePrivate.h rename to Rendering/Context2D/vtkContextScenePrivate.h diff --git a/Charts/vtkContextTransform.cxx b/Rendering/Context2D/vtkContextTransform.cxx similarity index 100% rename from Charts/vtkContextTransform.cxx rename to Rendering/Context2D/vtkContextTransform.cxx diff --git a/Charts/vtkContextTransform.h b/Rendering/Context2D/vtkContextTransform.h similarity index 100% rename from Charts/vtkContextTransform.h rename to Rendering/Context2D/vtkContextTransform.h diff --git a/Charts/vtkImageItem.cxx b/Rendering/Context2D/vtkImageItem.cxx similarity index 100% rename from Charts/vtkImageItem.cxx rename to Rendering/Context2D/vtkImageItem.cxx diff --git a/Charts/vtkImageItem.h b/Rendering/Context2D/vtkImageItem.h similarity index 100% rename from Charts/vtkImageItem.h rename to Rendering/Context2D/vtkImageItem.h diff --git a/Charts/vtkOpenGL2ContextDevice2D.cxx b/Rendering/Context2D/vtkOpenGL2ContextDevice2D.cxx similarity index 100% rename from Charts/vtkOpenGL2ContextDevice2D.cxx rename to Rendering/Context2D/vtkOpenGL2ContextDevice2D.cxx diff --git a/Charts/vtkOpenGL2ContextDevice2D.h b/Rendering/Context2D/vtkOpenGL2ContextDevice2D.h similarity index 100% rename from Charts/vtkOpenGL2ContextDevice2D.h rename to Rendering/Context2D/vtkOpenGL2ContextDevice2D.h diff --git a/Charts/vtkOpenGLContextBufferId.cxx b/Rendering/Context2D/vtkOpenGLContextBufferId.cxx similarity index 100% rename from Charts/vtkOpenGLContextBufferId.cxx rename to Rendering/Context2D/vtkOpenGLContextBufferId.cxx diff --git a/Charts/vtkOpenGLContextBufferId.h b/Rendering/Context2D/vtkOpenGLContextBufferId.h similarity index 100% rename from Charts/vtkOpenGLContextBufferId.h rename to Rendering/Context2D/vtkOpenGLContextBufferId.h diff --git a/Charts/vtkOpenGLContextDevice2D.cxx b/Rendering/Context2D/vtkOpenGLContextDevice2D.cxx similarity index 100% rename from Charts/vtkOpenGLContextDevice2D.cxx rename to Rendering/Context2D/vtkOpenGLContextDevice2D.cxx diff --git a/Charts/vtkOpenGLContextDevice2D.h b/Rendering/Context2D/vtkOpenGLContextDevice2D.h similarity index 100% rename from Charts/vtkOpenGLContextDevice2D.h rename to Rendering/Context2D/vtkOpenGLContextDevice2D.h diff --git a/Charts/vtkOpenGLContextDevice2DPrivate.h b/Rendering/Context2D/vtkOpenGLContextDevice2DPrivate.h similarity index 100% rename from Charts/vtkOpenGLContextDevice2DPrivate.h rename to Rendering/Context2D/vtkOpenGLContextDevice2DPrivate.h diff --git a/Charts/vtkOpenGLContextDevice3D.cxx b/Rendering/Context2D/vtkOpenGLContextDevice3D.cxx similarity index 100% rename from Charts/vtkOpenGLContextDevice3D.cxx rename to Rendering/Context2D/vtkOpenGLContextDevice3D.cxx diff --git a/Charts/vtkOpenGLContextDevice3D.h b/Rendering/Context2D/vtkOpenGLContextDevice3D.h similarity index 100% rename from Charts/vtkOpenGLContextDevice3D.h rename to Rendering/Context2D/vtkOpenGLContextDevice3D.h diff --git a/Charts/vtkPen.cxx b/Rendering/Context2D/vtkPen.cxx similarity index 100% rename from Charts/vtkPen.cxx rename to Rendering/Context2D/vtkPen.cxx diff --git a/Charts/vtkPen.h b/Rendering/Context2D/vtkPen.h similarity index 100% rename from Charts/vtkPen.h rename to Rendering/Context2D/vtkPen.h diff --git a/Charts/vtkTooltipItem.cxx b/Rendering/Context2D/vtkTooltipItem.cxx similarity index 100% rename from Charts/vtkTooltipItem.cxx rename to Rendering/Context2D/vtkTooltipItem.cxx diff --git a/Charts/vtkTooltipItem.h b/Rendering/Context2D/vtkTooltipItem.h similarity index 100% rename from Charts/vtkTooltipItem.h rename to Rendering/Context2D/vtkTooltipItem.h diff --git a/Graphics/Testing/Cxx/FrustumClip.cxx b/Rendering/Core/Testing/Cxx/FrustumClip.cxx similarity index 100% rename from Graphics/Testing/Cxx/FrustumClip.cxx rename to Rendering/Core/Testing/Cxx/FrustumClip.cxx diff --git a/Graphics/Testing/Cxx/Mace.cxx b/Rendering/Core/Testing/Cxx/Mace.cxx similarity index 100% rename from Graphics/Testing/Cxx/Mace.cxx rename to Rendering/Core/Testing/Cxx/Mace.cxx diff --git a/Graphics/Testing/Cxx/RGrid.cxx b/Rendering/Core/Testing/Cxx/RGrid.cxx similarity index 100% rename from Graphics/Testing/Cxx/RGrid.cxx rename to Rendering/Core/Testing/Cxx/RGrid.cxx diff --git a/Graphics/Testing/Cxx/TestActor2DTextures.cxx b/Rendering/Core/Testing/Cxx/TestActor2DTextures.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestActor2DTextures.cxx rename to Rendering/Core/Testing/Cxx/TestActor2DTextures.cxx diff --git a/Graphics/Testing/Cxx/TestBareScalarsToColors.cxx b/Rendering/Core/Testing/Cxx/TestBareScalarsToColors.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestBareScalarsToColors.cxx rename to Rendering/Core/Testing/Cxx/TestBareScalarsToColors.cxx diff --git a/Graphics/Testing/Cxx/TestHierarchicalBoxPipeline.cxx b/Rendering/Core/Testing/Cxx/TestHierarchicalBoxPipeline.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestHierarchicalBoxPipeline.cxx rename to Rendering/Core/Testing/Cxx/TestHierarchicalBoxPipeline.cxx diff --git a/Graphics/Testing/Cxx/TestMapVectorsAsRGBColors.cxx b/Rendering/Core/Testing/Cxx/TestMapVectorsAsRGBColors.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestMapVectorsAsRGBColors.cxx rename to Rendering/Core/Testing/Cxx/TestMapVectorsAsRGBColors.cxx diff --git a/Graphics/Testing/Cxx/TestMapVectorsToColors.cxx b/Rendering/Core/Testing/Cxx/TestMapVectorsToColors.cxx similarity index 100% rename from Graphics/Testing/Cxx/TestMapVectorsToColors.cxx rename to Rendering/Core/Testing/Cxx/TestMapVectorsToColors.cxx diff --git a/Hybrid/Testing/Cxx/TestTDxGeo.cxx b/Rendering/Core/Testing/Cxx/TestTDxGeo.cxx similarity index 100% rename from Hybrid/Testing/Cxx/TestTDxGeo.cxx rename to Rendering/Core/Testing/Cxx/TestTDxGeo.cxx diff --git a/GenericFiltering/Testing/Cxx/TestViewDependentErrorMetric.cxx b/Rendering/Core/Testing/Cxx/TestViewDependentErrorMetric.cxx similarity index 100% rename from GenericFiltering/Testing/Cxx/TestViewDependentErrorMetric.cxx rename to Rendering/Core/Testing/Cxx/TestViewDependentErrorMetric.cxx diff --git a/Common/Testing/Cxx/otherLookupTable.cxx b/Rendering/Core/Testing/Cxx/otherLookupTable.cxx similarity index 100% rename from Common/Testing/Cxx/otherLookupTable.cxx rename to Rendering/Core/Testing/Cxx/otherLookupTable.cxx diff --git a/Common/Testing/Cxx/otherLookupTableWithEnabling.cxx b/Rendering/Core/Testing/Cxx/otherLookupTableWithEnabling.cxx similarity index 100% rename from Common/Testing/Cxx/otherLookupTableWithEnabling.cxx rename to Rendering/Core/Testing/Cxx/otherLookupTableWithEnabling.cxx diff --git a/Rendering/Testing/Python/TestMapperLUT.py b/Rendering/Core/Testing/Python/TestMapperLUT.py similarity index 100% rename from Rendering/Testing/Python/TestMapperLUT.py rename to Rendering/Core/Testing/Python/TestMapperLUT.py diff --git a/Graphics/Testing/Python/cameraWarpedCone.py b/Rendering/Core/Testing/Python/cameraWarpedCone.py similarity index 100% rename from Graphics/Testing/Python/cameraWarpedCone.py rename to Rendering/Core/Testing/Python/cameraWarpedCone.py diff --git a/Rendering/Testing/Tcl/CamBlur.tcl b/Rendering/Core/Testing/Tcl/CamBlur.tcl similarity index 100% rename from Rendering/Testing/Tcl/CamBlur.tcl rename to Rendering/Core/Testing/Tcl/CamBlur.tcl diff --git a/Rendering/Testing/Tcl/ImageActor.tcl b/Rendering/Core/Testing/Tcl/ImageActor.tcl similarity index 100% rename from Rendering/Testing/Tcl/ImageActor.tcl rename to Rendering/Core/Testing/Tcl/ImageActor.tcl diff --git a/Rendering/Testing/Tcl/ImageActorStressed.tcl b/Rendering/Core/Testing/Tcl/ImageActorStressed.tcl similarity index 100% rename from Rendering/Testing/Tcl/ImageActorStressed.tcl rename to Rendering/Core/Testing/Tcl/ImageActorStressed.tcl diff --git a/Graphics/Testing/Tcl/NoLightGeneration.tcl b/Rendering/Core/Testing/Tcl/NoLightGeneration.tcl similarity index 100% rename from Graphics/Testing/Tcl/NoLightGeneration.tcl rename to Rendering/Core/Testing/Tcl/NoLightGeneration.tcl diff --git a/Rendering/Testing/Tcl/PickerWithLocator.tcl b/Rendering/Core/Testing/Tcl/PickerWithLocator.tcl similarity index 100% rename from Rendering/Testing/Tcl/PickerWithLocator.tcl rename to Rendering/Core/Testing/Tcl/PickerWithLocator.tcl diff --git a/Graphics/Testing/Tcl/PolyDataMapperAllPolygons.tcl b/Rendering/Core/Testing/Tcl/PolyDataMapperAllPolygons.tcl similarity index 100% rename from Graphics/Testing/Tcl/PolyDataMapperAllPolygons.tcl rename to Rendering/Core/Testing/Tcl/PolyDataMapperAllPolygons.tcl diff --git a/Graphics/Testing/Tcl/PolyDataMapperAllWireframe.tcl b/Rendering/Core/Testing/Tcl/PolyDataMapperAllWireframe.tcl similarity index 100% rename from Graphics/Testing/Tcl/PolyDataMapperAllWireframe.tcl rename to Rendering/Core/Testing/Tcl/PolyDataMapperAllWireframe.tcl diff --git a/Rendering/Testing/Tcl/ScalarBar.tcl b/Rendering/Core/Testing/Tcl/ScalarBar.tcl similarity index 100% rename from Rendering/Testing/Tcl/ScalarBar.tcl rename to Rendering/Core/Testing/Tcl/ScalarBar.tcl diff --git a/Rendering/Testing/Tcl/SurfacePickerWithTexture.tcl b/Rendering/Core/Testing/Tcl/SurfacePickerWithTexture.tcl similarity index 100% rename from Rendering/Testing/Tcl/SurfacePickerWithTexture.tcl rename to Rendering/Core/Testing/Tcl/SurfacePickerWithTexture.tcl diff --git a/Graphics/Testing/Tcl/TestCameraInterpolator.tcl b/Rendering/Core/Testing/Tcl/TestCameraInterpolator.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestCameraInterpolator.tcl rename to Rendering/Core/Testing/Tcl/TestCameraInterpolator.tcl diff --git a/Rendering/Testing/Tcl/TestCgShader.tcl b/Rendering/Core/Testing/Tcl/TestCgShader.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestCgShader.tcl rename to Rendering/Core/Testing/Tcl/TestCgShader.tcl diff --git a/Rendering/Testing/Tcl/TestGLSLShader.tcl b/Rendering/Core/Testing/Tcl/TestGLSLShader.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestGLSLShader.tcl rename to Rendering/Core/Testing/Tcl/TestGLSLShader.tcl diff --git a/Rendering/Testing/Tcl/TestGenericVertexAttributesCg.tcl b/Rendering/Core/Testing/Tcl/TestGenericVertexAttributesCg.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestGenericVertexAttributesCg.tcl rename to Rendering/Core/Testing/Tcl/TestGenericVertexAttributesCg.tcl diff --git a/Rendering/Testing/Tcl/TestGenericVertexAttributesGLSL.tcl b/Rendering/Core/Testing/Tcl/TestGenericVertexAttributesGLSL.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestGenericVertexAttributesGLSL.tcl rename to Rendering/Core/Testing/Tcl/TestGenericVertexAttributesGLSL.tcl diff --git a/Rendering/Testing/Tcl/TestLeaderActor2D.tcl b/Rendering/Core/Testing/Tcl/TestLeaderActor2D.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestLeaderActor2D.tcl rename to Rendering/Core/Testing/Tcl/TestLeaderActor2D.tcl diff --git a/Rendering/Testing/Tcl/TestOnePoint.tcl b/Rendering/Core/Testing/Tcl/TestOnePoint.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestOnePoint.tcl rename to Rendering/Core/Testing/Tcl/TestOnePoint.tcl diff --git a/Rendering/Testing/Tcl/TestOpacity2.tcl b/Rendering/Core/Testing/Tcl/TestOpacity2.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestOpacity2.tcl rename to Rendering/Core/Testing/Tcl/TestOpacity2.tcl diff --git a/Rendering/Testing/Tcl/TestParallelCoordinates.tcl b/Rendering/Core/Testing/Tcl/TestParallelCoordinates.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestParallelCoordinates.tcl rename to Rendering/Core/Testing/Tcl/TestParallelCoordinates.tcl diff --git a/Graphics/Testing/Tcl/TestRotate.tcl b/Rendering/Core/Testing/Tcl/TestRotate.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestRotate.tcl rename to Rendering/Core/Testing/Tcl/TestRotate.tcl diff --git a/Graphics/Testing/Tcl/TestTransformCoordinateSystems.tcl b/Rendering/Core/Testing/Tcl/TestTransformCoordinateSystems.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestTransformCoordinateSystems.tcl rename to Rendering/Core/Testing/Tcl/TestTransformCoordinateSystems.tcl diff --git a/Graphics/Testing/Tcl/TestTransformInterpolator.tcl b/Rendering/Core/Testing/Tcl/TestTransformInterpolator.tcl similarity index 100% rename from Graphics/Testing/Tcl/TestTransformInterpolator.tcl rename to Rendering/Core/Testing/Tcl/TestTransformInterpolator.tcl diff --git a/Rendering/Testing/Tcl/TestTriangleStripCellColor.tcl b/Rendering/Core/Testing/Tcl/TestTriangleStripCellColor.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestTriangleStripCellColor.tcl rename to Rendering/Core/Testing/Tcl/TestTriangleStripCellColor.tcl diff --git a/Rendering/Testing/Tcl/TestWindowToImageTransparency.tcl b/Rendering/Core/Testing/Tcl/TestWindowToImageTransparency.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestWindowToImageTransparency.tcl rename to Rendering/Core/Testing/Tcl/TestWindowToImageTransparency.tcl diff --git a/Rendering/Testing/Tcl/TexturedSphere.tcl b/Rendering/Core/Testing/Tcl/TexturedSphere.tcl similarity index 100% rename from Rendering/Testing/Tcl/TexturedSphere.tcl rename to Rendering/Core/Testing/Tcl/TexturedSphere.tcl diff --git a/Graphics/Testing/Tcl/TransformConcatenation.tcl b/Rendering/Core/Testing/Tcl/TransformConcatenation.tcl similarity index 100% rename from Graphics/Testing/Tcl/TransformConcatenation.tcl rename to Rendering/Core/Testing/Tcl/TransformConcatenation.tcl diff --git a/Graphics/Testing/Tcl/TransformCoverage.tcl b/Rendering/Core/Testing/Tcl/TransformCoverage.tcl similarity index 100% rename from Graphics/Testing/Tcl/TransformCoverage.tcl rename to Rendering/Core/Testing/Tcl/TransformCoverage.tcl diff --git a/Graphics/Testing/Tcl/TransformImageData.tcl b/Rendering/Core/Testing/Tcl/TransformImageData.tcl similarity index 100% rename from Graphics/Testing/Tcl/TransformImageData.tcl rename to Rendering/Core/Testing/Tcl/TransformImageData.tcl diff --git a/Graphics/Testing/Tcl/TransformPolyData.tcl b/Rendering/Core/Testing/Tcl/TransformPolyData.tcl similarity index 100% rename from Graphics/Testing/Tcl/TransformPolyData.tcl rename to Rendering/Core/Testing/Tcl/TransformPolyData.tcl diff --git a/Rendering/Testing/Tcl/assembly.tcl b/Rendering/Core/Testing/Tcl/assembly.tcl similarity index 100% rename from Rendering/Testing/Tcl/assembly.tcl rename to Rendering/Core/Testing/Tcl/assembly.tcl diff --git a/Rendering/Testing/Tcl/cells.tcl b/Rendering/Core/Testing/Tcl/cells.tcl similarity index 100% rename from Rendering/Testing/Tcl/cells.tcl rename to Rendering/Core/Testing/Tcl/cells.tcl diff --git a/Graphics/Testing/Tcl/cowHair.tcl b/Rendering/Core/Testing/Tcl/cowHair.tcl similarity index 100% rename from Graphics/Testing/Tcl/cowHair.tcl rename to Rendering/Core/Testing/Tcl/cowHair.tcl diff --git a/Graphics/Testing/Tcl/cowHair2.tcl b/Rendering/Core/Testing/Tcl/cowHair2.tcl similarity index 100% rename from Graphics/Testing/Tcl/cowHair2.tcl rename to Rendering/Core/Testing/Tcl/cowHair2.tcl diff --git a/Rendering/Testing/Tcl/pickCells.tcl b/Rendering/Core/Testing/Tcl/pickCells.tcl similarity index 100% rename from Rendering/Testing/Tcl/pickCells.tcl rename to Rendering/Core/Testing/Tcl/pickCells.tcl diff --git a/Rendering/Testing/Tcl/propAssembly.tcl b/Rendering/Core/Testing/Tcl/propAssembly.tcl similarity index 100% rename from Rendering/Testing/Tcl/propAssembly.tcl rename to Rendering/Core/Testing/Tcl/propAssembly.tcl diff --git a/Rendering/Testing/Tcl/rendererSource.tcl b/Rendering/Core/Testing/Tcl/rendererSource.tcl similarity index 100% rename from Rendering/Testing/Tcl/rendererSource.tcl rename to Rendering/Core/Testing/Tcl/rendererSource.tcl diff --git a/Rendering/Testing/Tcl/rotations.tcl b/Rendering/Core/Testing/Tcl/rotations.tcl similarity index 100% rename from Rendering/Testing/Tcl/rotations.tcl rename to Rendering/Core/Testing/Tcl/rotations.tcl diff --git a/Graphics/Testing/Tcl/stereoDresdenMace.tcl b/Rendering/Core/Testing/Tcl/stereoDresdenMace.tcl similarity index 100% rename from Graphics/Testing/Tcl/stereoDresdenMace.tcl rename to Rendering/Core/Testing/Tcl/stereoDresdenMace.tcl diff --git a/Filtering/vtkAbstractMapper.cxx b/Rendering/Core/vtkAbstractMapper.cxx similarity index 100% rename from Filtering/vtkAbstractMapper.cxx rename to Rendering/Core/vtkAbstractMapper.cxx diff --git a/Filtering/vtkAbstractMapper.h b/Rendering/Core/vtkAbstractMapper.h similarity index 100% rename from Filtering/vtkAbstractMapper.h rename to Rendering/Core/vtkAbstractMapper.h diff --git a/Rendering/vtkAbstractMapper3D.cxx b/Rendering/Core/vtkAbstractMapper3D.cxx similarity index 100% rename from Rendering/vtkAbstractMapper3D.cxx rename to Rendering/Core/vtkAbstractMapper3D.cxx diff --git a/Rendering/vtkAbstractMapper3D.h b/Rendering/Core/vtkAbstractMapper3D.h similarity index 100% rename from Rendering/vtkAbstractMapper3D.h rename to Rendering/Core/vtkAbstractMapper3D.h diff --git a/Rendering/vtkAbstractPicker.cxx b/Rendering/Core/vtkAbstractPicker.cxx similarity index 100% rename from Rendering/vtkAbstractPicker.cxx rename to Rendering/Core/vtkAbstractPicker.cxx diff --git a/Rendering/vtkAbstractPicker.h b/Rendering/Core/vtkAbstractPicker.h similarity index 100% rename from Rendering/vtkAbstractPicker.h rename to Rendering/Core/vtkAbstractPicker.h diff --git a/Rendering/vtkAbstractPropPicker.cxx b/Rendering/Core/vtkAbstractPropPicker.cxx similarity index 100% rename from Rendering/vtkAbstractPropPicker.cxx rename to Rendering/Core/vtkAbstractPropPicker.cxx diff --git a/Rendering/vtkAbstractPropPicker.h b/Rendering/Core/vtkAbstractPropPicker.h similarity index 100% rename from Rendering/vtkAbstractPropPicker.h rename to Rendering/Core/vtkAbstractPropPicker.h diff --git a/Rendering/vtkAbstractVolumeMapper.cxx b/Rendering/Core/vtkAbstractVolumeMapper.cxx similarity index 100% rename from Rendering/vtkAbstractVolumeMapper.cxx rename to Rendering/Core/vtkAbstractVolumeMapper.cxx diff --git a/Rendering/vtkAbstractVolumeMapper.h b/Rendering/Core/vtkAbstractVolumeMapper.h similarity index 100% rename from Rendering/vtkAbstractVolumeMapper.h rename to Rendering/Core/vtkAbstractVolumeMapper.h diff --git a/Rendering/vtkActor.cxx b/Rendering/Core/vtkActor.cxx similarity index 100% rename from Rendering/vtkActor.cxx rename to Rendering/Core/vtkActor.cxx diff --git a/Rendering/vtkActor.h b/Rendering/Core/vtkActor.h similarity index 100% rename from Rendering/vtkActor.h rename to Rendering/Core/vtkActor.h diff --git a/Filtering/vtkActor2D.cxx b/Rendering/Core/vtkActor2D.cxx similarity index 100% rename from Filtering/vtkActor2D.cxx rename to Rendering/Core/vtkActor2D.cxx diff --git a/Filtering/vtkActor2D.h b/Rendering/Core/vtkActor2D.h similarity index 100% rename from Filtering/vtkActor2D.h rename to Rendering/Core/vtkActor2D.h diff --git a/Filtering/vtkActor2DCollection.cxx b/Rendering/Core/vtkActor2DCollection.cxx similarity index 100% rename from Filtering/vtkActor2DCollection.cxx rename to Rendering/Core/vtkActor2DCollection.cxx diff --git a/Filtering/vtkActor2DCollection.h b/Rendering/Core/vtkActor2DCollection.h similarity index 100% rename from Filtering/vtkActor2DCollection.h rename to Rendering/Core/vtkActor2DCollection.h diff --git a/Rendering/vtkActorCollection.cxx b/Rendering/Core/vtkActorCollection.cxx similarity index 100% rename from Rendering/vtkActorCollection.cxx rename to Rendering/Core/vtkActorCollection.cxx diff --git a/Rendering/vtkActorCollection.h b/Rendering/Core/vtkActorCollection.h similarity index 100% rename from Rendering/vtkActorCollection.h rename to Rendering/Core/vtkActorCollection.h diff --git a/Rendering/vtkAreaPicker.cxx b/Rendering/Core/vtkAreaPicker.cxx similarity index 100% rename from Rendering/vtkAreaPicker.cxx rename to Rendering/Core/vtkAreaPicker.cxx diff --git a/Rendering/vtkAreaPicker.h b/Rendering/Core/vtkAreaPicker.h similarity index 100% rename from Rendering/vtkAreaPicker.h rename to Rendering/Core/vtkAreaPicker.h diff --git a/Rendering/vtkAssembly.cxx b/Rendering/Core/vtkAssembly.cxx similarity index 100% rename from Rendering/vtkAssembly.cxx rename to Rendering/Core/vtkAssembly.cxx diff --git a/Rendering/vtkAssembly.h b/Rendering/Core/vtkAssembly.h similarity index 100% rename from Rendering/vtkAssembly.h rename to Rendering/Core/vtkAssembly.h diff --git a/Common/vtkAssemblyNode.cxx b/Rendering/Core/vtkAssemblyNode.cxx similarity index 100% rename from Common/vtkAssemblyNode.cxx rename to Rendering/Core/vtkAssemblyNode.cxx diff --git a/Common/vtkAssemblyNode.h b/Rendering/Core/vtkAssemblyNode.h similarity index 100% rename from Common/vtkAssemblyNode.h rename to Rendering/Core/vtkAssemblyNode.h diff --git a/Common/vtkAssemblyPath.cxx b/Rendering/Core/vtkAssemblyPath.cxx similarity index 100% rename from Common/vtkAssemblyPath.cxx rename to Rendering/Core/vtkAssemblyPath.cxx diff --git a/Common/vtkAssemblyPath.h b/Rendering/Core/vtkAssemblyPath.h similarity index 100% rename from Common/vtkAssemblyPath.h rename to Rendering/Core/vtkAssemblyPath.h diff --git a/Common/vtkAssemblyPaths.cxx b/Rendering/Core/vtkAssemblyPaths.cxx similarity index 100% rename from Common/vtkAssemblyPaths.cxx rename to Rendering/Core/vtkAssemblyPaths.cxx diff --git a/Common/vtkAssemblyPaths.h b/Rendering/Core/vtkAssemblyPaths.h similarity index 100% rename from Common/vtkAssemblyPaths.h rename to Rendering/Core/vtkAssemblyPaths.h diff --git a/Rendering/vtkCamera.cxx b/Rendering/Core/vtkCamera.cxx similarity index 100% rename from Rendering/vtkCamera.cxx rename to Rendering/Core/vtkCamera.cxx diff --git a/Rendering/vtkCamera.h b/Rendering/Core/vtkCamera.h similarity index 100% rename from Rendering/vtkCamera.h rename to Rendering/Core/vtkCamera.h diff --git a/Rendering/vtkCameraActor.cxx b/Rendering/Core/vtkCameraActor.cxx similarity index 100% rename from Rendering/vtkCameraActor.cxx rename to Rendering/Core/vtkCameraActor.cxx diff --git a/Rendering/vtkCameraActor.h b/Rendering/Core/vtkCameraActor.h similarity index 100% rename from Rendering/vtkCameraActor.h rename to Rendering/Core/vtkCameraActor.h diff --git a/Rendering/vtkCameraInterpolator.cxx b/Rendering/Core/vtkCameraInterpolator.cxx similarity index 100% rename from Rendering/vtkCameraInterpolator.cxx rename to Rendering/Core/vtkCameraInterpolator.cxx diff --git a/Rendering/vtkCameraInterpolator.h b/Rendering/Core/vtkCameraInterpolator.h similarity index 100% rename from Rendering/vtkCameraInterpolator.h rename to Rendering/Core/vtkCameraInterpolator.h diff --git a/Rendering/vtkCellCenterDepthSort.cxx b/Rendering/Core/vtkCellCenterDepthSort.cxx similarity index 100% rename from Rendering/vtkCellCenterDepthSort.cxx rename to Rendering/Core/vtkCellCenterDepthSort.cxx diff --git a/Rendering/vtkCellCenterDepthSort.h b/Rendering/Core/vtkCellCenterDepthSort.h similarity index 100% rename from Rendering/vtkCellCenterDepthSort.h rename to Rendering/Core/vtkCellCenterDepthSort.h diff --git a/Rendering/vtkCellPicker.cxx b/Rendering/Core/vtkCellPicker.cxx similarity index 100% rename from Rendering/vtkCellPicker.cxx rename to Rendering/Core/vtkCellPicker.cxx diff --git a/Rendering/vtkCellPicker.h b/Rendering/Core/vtkCellPicker.h similarity index 100% rename from Rendering/vtkCellPicker.h rename to Rendering/Core/vtkCellPicker.h diff --git a/Rendering/vtkChooserPainter.cxx b/Rendering/Core/vtkChooserPainter.cxx similarity index 100% rename from Rendering/vtkChooserPainter.cxx rename to Rendering/Core/vtkChooserPainter.cxx diff --git a/Rendering/vtkChooserPainter.h b/Rendering/Core/vtkChooserPainter.h similarity index 100% rename from Rendering/vtkChooserPainter.h rename to Rendering/Core/vtkChooserPainter.h diff --git a/Rendering/vtkClipPlanesPainter.cxx b/Rendering/Core/vtkClipPlanesPainter.cxx similarity index 100% rename from Rendering/vtkClipPlanesPainter.cxx rename to Rendering/Core/vtkClipPlanesPainter.cxx diff --git a/Rendering/vtkClipPlanesPainter.h b/Rendering/Core/vtkClipPlanesPainter.h similarity index 100% rename from Rendering/vtkClipPlanesPainter.h rename to Rendering/Core/vtkClipPlanesPainter.h diff --git a/Rendering/vtkCoincidentTopologyResolutionPainter.cxx b/Rendering/Core/vtkCoincidentTopologyResolutionPainter.cxx similarity index 100% rename from Rendering/vtkCoincidentTopologyResolutionPainter.cxx rename to Rendering/Core/vtkCoincidentTopologyResolutionPainter.cxx diff --git a/Rendering/vtkCoincidentTopologyResolutionPainter.h b/Rendering/Core/vtkCoincidentTopologyResolutionPainter.h similarity index 100% rename from Rendering/vtkCoincidentTopologyResolutionPainter.h rename to Rendering/Core/vtkCoincidentTopologyResolutionPainter.h diff --git a/Filtering/vtkColorTransferFunction.cxx b/Rendering/Core/vtkColorTransferFunction.cxx similarity index 100% rename from Filtering/vtkColorTransferFunction.cxx rename to Rendering/Core/vtkColorTransferFunction.cxx diff --git a/Filtering/vtkColorTransferFunction.h b/Rendering/Core/vtkColorTransferFunction.h similarity index 100% rename from Filtering/vtkColorTransferFunction.h rename to Rendering/Core/vtkColorTransferFunction.h diff --git a/Rendering/vtkCompositePainter.cxx b/Rendering/Core/vtkCompositePainter.cxx similarity index 100% rename from Rendering/vtkCompositePainter.cxx rename to Rendering/Core/vtkCompositePainter.cxx diff --git a/Rendering/vtkCompositePainter.h b/Rendering/Core/vtkCompositePainter.h similarity index 100% rename from Rendering/vtkCompositePainter.h rename to Rendering/Core/vtkCompositePainter.h diff --git a/Rendering/vtkCompositePolyDataMapper.cxx b/Rendering/Core/vtkCompositePolyDataMapper.cxx similarity index 100% rename from Rendering/vtkCompositePolyDataMapper.cxx rename to Rendering/Core/vtkCompositePolyDataMapper.cxx diff --git a/Rendering/vtkCompositePolyDataMapper.h b/Rendering/Core/vtkCompositePolyDataMapper.h similarity index 100% rename from Rendering/vtkCompositePolyDataMapper.h rename to Rendering/Core/vtkCompositePolyDataMapper.h diff --git a/Rendering/vtkCompositePolyDataMapper2.cxx b/Rendering/Core/vtkCompositePolyDataMapper2.cxx similarity index 100% rename from Rendering/vtkCompositePolyDataMapper2.cxx rename to Rendering/Core/vtkCompositePolyDataMapper2.cxx diff --git a/Rendering/vtkCompositePolyDataMapper2.h b/Rendering/Core/vtkCompositePolyDataMapper2.h similarity index 100% rename from Rendering/vtkCompositePolyDataMapper2.h rename to Rendering/Core/vtkCompositePolyDataMapper2.h diff --git a/Filtering/vtkCoordinate.cxx b/Rendering/Core/vtkCoordinate.cxx similarity index 100% rename from Filtering/vtkCoordinate.cxx rename to Rendering/Core/vtkCoordinate.cxx diff --git a/Filtering/vtkCoordinate.h b/Rendering/Core/vtkCoordinate.h similarity index 100% rename from Filtering/vtkCoordinate.h rename to Rendering/Core/vtkCoordinate.h diff --git a/Rendering/vtkCuller.cxx b/Rendering/Core/vtkCuller.cxx similarity index 100% rename from Rendering/vtkCuller.cxx rename to Rendering/Core/vtkCuller.cxx diff --git a/Rendering/vtkCuller.h b/Rendering/Core/vtkCuller.h similarity index 100% rename from Rendering/vtkCuller.h rename to Rendering/Core/vtkCuller.h diff --git a/Rendering/vtkCullerCollection.cxx b/Rendering/Core/vtkCullerCollection.cxx similarity index 100% rename from Rendering/vtkCullerCollection.cxx rename to Rendering/Core/vtkCullerCollection.cxx diff --git a/Rendering/vtkCullerCollection.h b/Rendering/Core/vtkCullerCollection.h similarity index 100% rename from Rendering/vtkCullerCollection.h rename to Rendering/Core/vtkCullerCollection.h diff --git a/Rendering/vtkDataSetMapper.cxx b/Rendering/Core/vtkDataSetMapper.cxx similarity index 100% rename from Rendering/vtkDataSetMapper.cxx rename to Rendering/Core/vtkDataSetMapper.cxx diff --git a/Rendering/vtkDataSetMapper.h b/Rendering/Core/vtkDataSetMapper.h similarity index 100% rename from Rendering/vtkDataSetMapper.h rename to Rendering/Core/vtkDataSetMapper.h diff --git a/Rendering/vtkDefaultPainter.cxx b/Rendering/Core/vtkDefaultPainter.cxx similarity index 100% rename from Rendering/vtkDefaultPainter.cxx rename to Rendering/Core/vtkDefaultPainter.cxx diff --git a/Rendering/vtkDefaultPainter.h b/Rendering/Core/vtkDefaultPainter.h similarity index 100% rename from Rendering/vtkDefaultPainter.h rename to Rendering/Core/vtkDefaultPainter.h diff --git a/Filtering/vtkDiscretizableColorTransferFunction.cxx b/Rendering/Core/vtkDiscretizableColorTransferFunction.cxx similarity index 100% rename from Filtering/vtkDiscretizableColorTransferFunction.cxx rename to Rendering/Core/vtkDiscretizableColorTransferFunction.cxx diff --git a/Filtering/vtkDiscretizableColorTransferFunction.h b/Rendering/Core/vtkDiscretizableColorTransferFunction.h similarity index 100% rename from Filtering/vtkDiscretizableColorTransferFunction.h rename to Rendering/Core/vtkDiscretizableColorTransferFunction.h diff --git a/Rendering/vtkDisplayListPainter.cxx b/Rendering/Core/vtkDisplayListPainter.cxx similarity index 100% rename from Rendering/vtkDisplayListPainter.cxx rename to Rendering/Core/vtkDisplayListPainter.cxx diff --git a/Rendering/vtkDisplayListPainter.h b/Rendering/Core/vtkDisplayListPainter.h similarity index 100% rename from Rendering/vtkDisplayListPainter.h rename to Rendering/Core/vtkDisplayListPainter.h diff --git a/Rendering/vtkDistanceToCamera.cxx b/Rendering/Core/vtkDistanceToCamera.cxx similarity index 100% rename from Rendering/vtkDistanceToCamera.cxx rename to Rendering/Core/vtkDistanceToCamera.cxx diff --git a/Rendering/vtkDistanceToCamera.h b/Rendering/Core/vtkDistanceToCamera.h similarity index 100% rename from Rendering/vtkDistanceToCamera.h rename to Rendering/Core/vtkDistanceToCamera.h diff --git a/Rendering/vtkFollower.cxx b/Rendering/Core/vtkFollower.cxx similarity index 100% rename from Rendering/vtkFollower.cxx rename to Rendering/Core/vtkFollower.cxx diff --git a/Rendering/vtkFollower.h b/Rendering/Core/vtkFollower.h similarity index 100% rename from Rendering/vtkFollower.h rename to Rendering/Core/vtkFollower.h diff --git a/Rendering/vtkFrustumCoverageCuller.cxx b/Rendering/Core/vtkFrustumCoverageCuller.cxx similarity index 100% rename from Rendering/vtkFrustumCoverageCuller.cxx rename to Rendering/Core/vtkFrustumCoverageCuller.cxx diff --git a/Rendering/vtkFrustumCoverageCuller.h b/Rendering/Core/vtkFrustumCoverageCuller.h similarity index 100% rename from Rendering/vtkFrustumCoverageCuller.h rename to Rendering/Core/vtkFrustumCoverageCuller.h diff --git a/Rendering/vtkGPUInfo.cxx b/Rendering/Core/vtkGPUInfo.cxx similarity index 100% rename from Rendering/vtkGPUInfo.cxx rename to Rendering/Core/vtkGPUInfo.cxx diff --git a/Rendering/vtkGPUInfo.h b/Rendering/Core/vtkGPUInfo.h similarity index 100% rename from Rendering/vtkGPUInfo.h rename to Rendering/Core/vtkGPUInfo.h diff --git a/Rendering/vtkGPUInfoList.cxx b/Rendering/Core/vtkGPUInfoList.cxx similarity index 100% rename from Rendering/vtkGPUInfoList.cxx rename to Rendering/Core/vtkGPUInfoList.cxx diff --git a/Rendering/vtkGPUInfoList.h b/Rendering/Core/vtkGPUInfoList.h similarity index 100% rename from Rendering/vtkGPUInfoList.h rename to Rendering/Core/vtkGPUInfoList.h diff --git a/Rendering/vtkGPUInfoListArray.h b/Rendering/Core/vtkGPUInfoListArray.h similarity index 100% rename from Rendering/vtkGPUInfoListArray.h rename to Rendering/Core/vtkGPUInfoListArray.h diff --git a/Rendering/vtkGenericRenderWindowInteractor.cxx b/Rendering/Core/vtkGenericRenderWindowInteractor.cxx similarity index 100% rename from Rendering/vtkGenericRenderWindowInteractor.cxx rename to Rendering/Core/vtkGenericRenderWindowInteractor.cxx diff --git a/Rendering/vtkGenericRenderWindowInteractor.h b/Rendering/Core/vtkGenericRenderWindowInteractor.h similarity index 100% rename from Rendering/vtkGenericRenderWindowInteractor.h rename to Rendering/Core/vtkGenericRenderWindowInteractor.h diff --git a/Rendering/vtkGenericVertexAttributeMapping.cxx b/Rendering/Core/vtkGenericVertexAttributeMapping.cxx similarity index 100% rename from Rendering/vtkGenericVertexAttributeMapping.cxx rename to Rendering/Core/vtkGenericVertexAttributeMapping.cxx diff --git a/Rendering/vtkGenericVertexAttributeMapping.h b/Rendering/Core/vtkGenericVertexAttributeMapping.h similarity index 100% rename from Rendering/vtkGenericVertexAttributeMapping.h rename to Rendering/Core/vtkGenericVertexAttributeMapping.h diff --git a/Rendering/vtkGlyph3DMapper.cxx b/Rendering/Core/vtkGlyph3DMapper.cxx similarity index 100% rename from Rendering/vtkGlyph3DMapper.cxx rename to Rendering/Core/vtkGlyph3DMapper.cxx diff --git a/Rendering/vtkGlyph3DMapper.h b/Rendering/Core/vtkGlyph3DMapper.h similarity index 100% rename from Rendering/vtkGlyph3DMapper.h rename to Rendering/Core/vtkGlyph3DMapper.h diff --git a/Rendering/vtkGraphMapper.cxx b/Rendering/Core/vtkGraphMapper.cxx similarity index 100% rename from Rendering/vtkGraphMapper.cxx rename to Rendering/Core/vtkGraphMapper.cxx diff --git a/Rendering/vtkGraphMapper.h b/Rendering/Core/vtkGraphMapper.h similarity index 100% rename from Rendering/vtkGraphMapper.h rename to Rendering/Core/vtkGraphMapper.h diff --git a/Rendering/vtkGraphToGlyphs.cxx b/Rendering/Core/vtkGraphToGlyphs.cxx similarity index 100% rename from Rendering/vtkGraphToGlyphs.cxx rename to Rendering/Core/vtkGraphToGlyphs.cxx diff --git a/Rendering/vtkGraphToGlyphs.h b/Rendering/Core/vtkGraphToGlyphs.h similarity index 100% rename from Rendering/vtkGraphToGlyphs.h rename to Rendering/Core/vtkGraphToGlyphs.h diff --git a/Rendering/vtkGraphicsFactory.cxx b/Rendering/Core/vtkGraphicsFactory.cxx similarity index 100% rename from Rendering/vtkGraphicsFactory.cxx rename to Rendering/Core/vtkGraphicsFactory.cxx diff --git a/Rendering/vtkGraphicsFactory.h b/Rendering/Core/vtkGraphicsFactory.h similarity index 100% rename from Rendering/vtkGraphicsFactory.h rename to Rendering/Core/vtkGraphicsFactory.h diff --git a/Rendering/vtkHardwareSelectionPolyDataPainter.cxx b/Rendering/Core/vtkHardwareSelectionPolyDataPainter.cxx similarity index 100% rename from Rendering/vtkHardwareSelectionPolyDataPainter.cxx rename to Rendering/Core/vtkHardwareSelectionPolyDataPainter.cxx diff --git a/Rendering/vtkHardwareSelectionPolyDataPainter.h b/Rendering/Core/vtkHardwareSelectionPolyDataPainter.h similarity index 100% rename from Rendering/vtkHardwareSelectionPolyDataPainter.h rename to Rendering/Core/vtkHardwareSelectionPolyDataPainter.h diff --git a/Rendering/vtkHardwareSelector.cxx b/Rendering/Core/vtkHardwareSelector.cxx similarity index 100% rename from Rendering/vtkHardwareSelector.cxx rename to Rendering/Core/vtkHardwareSelector.cxx diff --git a/Rendering/vtkHardwareSelector.h b/Rendering/Core/vtkHardwareSelector.h similarity index 100% rename from Rendering/vtkHardwareSelector.h rename to Rendering/Core/vtkHardwareSelector.h diff --git a/Rendering/vtkHierarchicalPolyDataMapper.cxx b/Rendering/Core/vtkHierarchicalPolyDataMapper.cxx similarity index 100% rename from Rendering/vtkHierarchicalPolyDataMapper.cxx rename to Rendering/Core/vtkHierarchicalPolyDataMapper.cxx diff --git a/Rendering/vtkHierarchicalPolyDataMapper.h b/Rendering/Core/vtkHierarchicalPolyDataMapper.h similarity index 100% rename from Rendering/vtkHierarchicalPolyDataMapper.h rename to Rendering/Core/vtkHierarchicalPolyDataMapper.h diff --git a/Rendering/vtkImageActor.cxx b/Rendering/Core/vtkImageActor.cxx similarity index 100% rename from Rendering/vtkImageActor.cxx rename to Rendering/Core/vtkImageActor.cxx diff --git a/Rendering/vtkImageActor.h b/Rendering/Core/vtkImageActor.h similarity index 100% rename from Rendering/vtkImageActor.h rename to Rendering/Core/vtkImageActor.h diff --git a/Rendering/vtkImageMapper.cxx b/Rendering/Core/vtkImageMapper.cxx similarity index 100% rename from Rendering/vtkImageMapper.cxx rename to Rendering/Core/vtkImageMapper.cxx diff --git a/Rendering/vtkImageMapper.h b/Rendering/Core/vtkImageMapper.h similarity index 100% rename from Rendering/vtkImageMapper.h rename to Rendering/Core/vtkImageMapper.h diff --git a/Rendering/vtkImageMapper3D.cxx b/Rendering/Core/vtkImageMapper3D.cxx similarity index 100% rename from Rendering/vtkImageMapper3D.cxx rename to Rendering/Core/vtkImageMapper3D.cxx diff --git a/Rendering/vtkImageMapper3D.h b/Rendering/Core/vtkImageMapper3D.h similarity index 100% rename from Rendering/vtkImageMapper3D.h rename to Rendering/Core/vtkImageMapper3D.h diff --git a/Rendering/vtkImageProperty.cxx b/Rendering/Core/vtkImageProperty.cxx similarity index 100% rename from Rendering/vtkImageProperty.cxx rename to Rendering/Core/vtkImageProperty.cxx diff --git a/Rendering/vtkImageProperty.h b/Rendering/Core/vtkImageProperty.h similarity index 100% rename from Rendering/vtkImageProperty.h rename to Rendering/Core/vtkImageProperty.h diff --git a/Rendering/vtkImageSlice.cxx b/Rendering/Core/vtkImageSlice.cxx similarity index 100% rename from Rendering/vtkImageSlice.cxx rename to Rendering/Core/vtkImageSlice.cxx diff --git a/Rendering/vtkImageSlice.h b/Rendering/Core/vtkImageSlice.h similarity index 100% rename from Rendering/vtkImageSlice.h rename to Rendering/Core/vtkImageSlice.h diff --git a/Rendering/vtkImageSliceMapper.cxx b/Rendering/Core/vtkImageSliceMapper.cxx similarity index 100% rename from Rendering/vtkImageSliceMapper.cxx rename to Rendering/Core/vtkImageSliceMapper.cxx diff --git a/Rendering/vtkImageSliceMapper.h b/Rendering/Core/vtkImageSliceMapper.h similarity index 100% rename from Rendering/vtkImageSliceMapper.h rename to Rendering/Core/vtkImageSliceMapper.h diff --git a/Rendering/vtkImagingFactory.cxx b/Rendering/Core/vtkImagingFactory.cxx similarity index 100% rename from Rendering/vtkImagingFactory.cxx rename to Rendering/Core/vtkImagingFactory.cxx diff --git a/Rendering/vtkImagingFactory.h b/Rendering/Core/vtkImagingFactory.h similarity index 100% rename from Rendering/vtkImagingFactory.h rename to Rendering/Core/vtkImagingFactory.h diff --git a/Rendering/vtkInteractorEventRecorder.cxx b/Rendering/Core/vtkInteractorEventRecorder.cxx similarity index 100% rename from Rendering/vtkInteractorEventRecorder.cxx rename to Rendering/Core/vtkInteractorEventRecorder.cxx diff --git a/Rendering/vtkInteractorEventRecorder.h b/Rendering/Core/vtkInteractorEventRecorder.h similarity index 100% rename from Rendering/vtkInteractorEventRecorder.h rename to Rendering/Core/vtkInteractorEventRecorder.h diff --git a/Rendering/vtkInteractorObserver.cxx b/Rendering/Core/vtkInteractorObserver.cxx similarity index 100% rename from Rendering/vtkInteractorObserver.cxx rename to Rendering/Core/vtkInteractorObserver.cxx diff --git a/Rendering/vtkInteractorObserver.h b/Rendering/Core/vtkInteractorObserver.h similarity index 100% rename from Rendering/vtkInteractorObserver.h rename to Rendering/Core/vtkInteractorObserver.h diff --git a/Rendering/vtkInteractorStyle.cxx b/Rendering/Core/vtkInteractorStyle.cxx similarity index 100% rename from Rendering/vtkInteractorStyle.cxx rename to Rendering/Core/vtkInteractorStyle.cxx diff --git a/Rendering/vtkInteractorStyle.h b/Rendering/Core/vtkInteractorStyle.h similarity index 100% rename from Rendering/vtkInteractorStyle.h rename to Rendering/Core/vtkInteractorStyle.h diff --git a/Rendering/vtkInteractorStyleSwitchBase.cxx b/Rendering/Core/vtkInteractorStyleSwitchBase.cxx similarity index 100% rename from Rendering/vtkInteractorStyleSwitchBase.cxx rename to Rendering/Core/vtkInteractorStyleSwitchBase.cxx diff --git a/Rendering/vtkInteractorStyleSwitchBase.h b/Rendering/Core/vtkInteractorStyleSwitchBase.h similarity index 100% rename from Rendering/vtkInteractorStyleSwitchBase.h rename to Rendering/Core/vtkInteractorStyleSwitchBase.h diff --git a/Rendering/vtkLODProp3D.cxx b/Rendering/Core/vtkLODProp3D.cxx similarity index 100% rename from Rendering/vtkLODProp3D.cxx rename to Rendering/Core/vtkLODProp3D.cxx diff --git a/Rendering/vtkLODProp3D.h b/Rendering/Core/vtkLODProp3D.h similarity index 100% rename from Rendering/vtkLODProp3D.h rename to Rendering/Core/vtkLODProp3D.h diff --git a/Rendering/vtkLight.cxx b/Rendering/Core/vtkLight.cxx similarity index 100% rename from Rendering/vtkLight.cxx rename to Rendering/Core/vtkLight.cxx diff --git a/Rendering/vtkLight.h b/Rendering/Core/vtkLight.h similarity index 100% rename from Rendering/vtkLight.h rename to Rendering/Core/vtkLight.h diff --git a/Rendering/vtkLightActor.cxx b/Rendering/Core/vtkLightActor.cxx similarity index 100% rename from Rendering/vtkLightActor.cxx rename to Rendering/Core/vtkLightActor.cxx diff --git a/Rendering/vtkLightActor.h b/Rendering/Core/vtkLightActor.h similarity index 100% rename from Rendering/vtkLightActor.h rename to Rendering/Core/vtkLightActor.h diff --git a/Rendering/vtkLightCollection.cxx b/Rendering/Core/vtkLightCollection.cxx similarity index 100% rename from Rendering/vtkLightCollection.cxx rename to Rendering/Core/vtkLightCollection.cxx diff --git a/Rendering/vtkLightCollection.h b/Rendering/Core/vtkLightCollection.h similarity index 100% rename from Rendering/vtkLightCollection.h rename to Rendering/Core/vtkLightCollection.h diff --git a/Rendering/vtkLightKit.cxx b/Rendering/Core/vtkLightKit.cxx similarity index 100% rename from Rendering/vtkLightKit.cxx rename to Rendering/Core/vtkLightKit.cxx diff --git a/Rendering/vtkLightKit.h b/Rendering/Core/vtkLightKit.h similarity index 100% rename from Rendering/vtkLightKit.h rename to Rendering/Core/vtkLightKit.h diff --git a/Rendering/vtkLightingPainter.cxx b/Rendering/Core/vtkLightingPainter.cxx similarity index 100% rename from Rendering/vtkLightingPainter.cxx rename to Rendering/Core/vtkLightingPainter.cxx diff --git a/Rendering/vtkLightingPainter.h b/Rendering/Core/vtkLightingPainter.h similarity index 100% rename from Rendering/vtkLightingPainter.h rename to Rendering/Core/vtkLightingPainter.h diff --git a/Rendering/vtkLinesPainter.cxx b/Rendering/Core/vtkLinesPainter.cxx similarity index 100% rename from Rendering/vtkLinesPainter.cxx rename to Rendering/Core/vtkLinesPainter.cxx diff --git a/Rendering/vtkLinesPainter.h b/Rendering/Core/vtkLinesPainter.h similarity index 100% rename from Rendering/vtkLinesPainter.h rename to Rendering/Core/vtkLinesPainter.h diff --git a/Common/vtkLogLookupTable.cxx b/Rendering/Core/vtkLogLookupTable.cxx similarity index 100% rename from Common/vtkLogLookupTable.cxx rename to Rendering/Core/vtkLogLookupTable.cxx diff --git a/Common/vtkLogLookupTable.h b/Rendering/Core/vtkLogLookupTable.h similarity index 100% rename from Common/vtkLogLookupTable.h rename to Rendering/Core/vtkLogLookupTable.h diff --git a/Common/vtkLookupTableWithEnabling.cxx b/Rendering/Core/vtkLookupTableWithEnabling.cxx similarity index 100% rename from Common/vtkLookupTableWithEnabling.cxx rename to Rendering/Core/vtkLookupTableWithEnabling.cxx diff --git a/Common/vtkLookupTableWithEnabling.h b/Rendering/Core/vtkLookupTableWithEnabling.h similarity index 100% rename from Common/vtkLookupTableWithEnabling.h rename to Rendering/Core/vtkLookupTableWithEnabling.h diff --git a/Rendering/vtkMapArrayValues.cxx b/Rendering/Core/vtkMapArrayValues.cxx similarity index 100% rename from Rendering/vtkMapArrayValues.cxx rename to Rendering/Core/vtkMapArrayValues.cxx diff --git a/Rendering/vtkMapArrayValues.h b/Rendering/Core/vtkMapArrayValues.h similarity index 100% rename from Rendering/vtkMapArrayValues.h rename to Rendering/Core/vtkMapArrayValues.h diff --git a/Rendering/vtkMapper.cxx b/Rendering/Core/vtkMapper.cxx similarity index 100% rename from Rendering/vtkMapper.cxx rename to Rendering/Core/vtkMapper.cxx diff --git a/Rendering/vtkMapper.h b/Rendering/Core/vtkMapper.h similarity index 100% rename from Rendering/vtkMapper.h rename to Rendering/Core/vtkMapper.h diff --git a/Filtering/vtkMapper2D.cxx b/Rendering/Core/vtkMapper2D.cxx similarity index 100% rename from Filtering/vtkMapper2D.cxx rename to Rendering/Core/vtkMapper2D.cxx diff --git a/Filtering/vtkMapper2D.h b/Rendering/Core/vtkMapper2D.h similarity index 100% rename from Filtering/vtkMapper2D.h rename to Rendering/Core/vtkMapper2D.h diff --git a/Rendering/vtkMapperCollection.cxx b/Rendering/Core/vtkMapperCollection.cxx similarity index 100% rename from Rendering/vtkMapperCollection.cxx rename to Rendering/Core/vtkMapperCollection.cxx diff --git a/Rendering/vtkMapperCollection.h b/Rendering/Core/vtkMapperCollection.h similarity index 100% rename from Rendering/vtkMapperCollection.h rename to Rendering/Core/vtkMapperCollection.h diff --git a/Rendering/vtkNoise200x200.h b/Rendering/Core/vtkNoise200x200.h similarity index 100% rename from Rendering/vtkNoise200x200.h rename to Rendering/Core/vtkNoise200x200.h diff --git a/Rendering/vtkObserverMediator.cxx b/Rendering/Core/vtkObserverMediator.cxx similarity index 100% rename from Rendering/vtkObserverMediator.cxx rename to Rendering/Core/vtkObserverMediator.cxx diff --git a/Rendering/vtkObserverMediator.h b/Rendering/Core/vtkObserverMediator.h similarity index 100% rename from Rendering/vtkObserverMediator.h rename to Rendering/Core/vtkObserverMediator.h diff --git a/Rendering/vtkPainter.cxx b/Rendering/Core/vtkPainter.cxx similarity index 100% rename from Rendering/vtkPainter.cxx rename to Rendering/Core/vtkPainter.cxx diff --git a/Rendering/vtkPainter.h b/Rendering/Core/vtkPainter.h similarity index 100% rename from Rendering/vtkPainter.h rename to Rendering/Core/vtkPainter.h diff --git a/Rendering/vtkPainterDeviceAdapter.cxx b/Rendering/Core/vtkPainterDeviceAdapter.cxx similarity index 100% rename from Rendering/vtkPainterDeviceAdapter.cxx rename to Rendering/Core/vtkPainterDeviceAdapter.cxx diff --git a/Rendering/vtkPainterDeviceAdapter.h b/Rendering/Core/vtkPainterDeviceAdapter.h similarity index 100% rename from Rendering/vtkPainterDeviceAdapter.h rename to Rendering/Core/vtkPainterDeviceAdapter.h diff --git a/Rendering/vtkPainterPolyDataMapper.cxx b/Rendering/Core/vtkPainterPolyDataMapper.cxx similarity index 100% rename from Rendering/vtkPainterPolyDataMapper.cxx rename to Rendering/Core/vtkPainterPolyDataMapper.cxx diff --git a/Rendering/vtkPainterPolyDataMapper.h b/Rendering/Core/vtkPainterPolyDataMapper.h similarity index 100% rename from Rendering/vtkPainterPolyDataMapper.h rename to Rendering/Core/vtkPainterPolyDataMapper.h diff --git a/Rendering/vtkPicker.cxx b/Rendering/Core/vtkPicker.cxx similarity index 100% rename from Rendering/vtkPicker.cxx rename to Rendering/Core/vtkPicker.cxx diff --git a/Rendering/vtkPicker.h b/Rendering/Core/vtkPicker.h similarity index 100% rename from Rendering/vtkPicker.h rename to Rendering/Core/vtkPicker.h diff --git a/Rendering/vtkPointPicker.cxx b/Rendering/Core/vtkPointPicker.cxx similarity index 100% rename from Rendering/vtkPointPicker.cxx rename to Rendering/Core/vtkPointPicker.cxx diff --git a/Rendering/vtkPointPicker.h b/Rendering/Core/vtkPointPicker.h similarity index 100% rename from Rendering/vtkPointPicker.h rename to Rendering/Core/vtkPointPicker.h diff --git a/Rendering/vtkPointsPainter.cxx b/Rendering/Core/vtkPointsPainter.cxx similarity index 100% rename from Rendering/vtkPointsPainter.cxx rename to Rendering/Core/vtkPointsPainter.cxx diff --git a/Rendering/vtkPointsPainter.h b/Rendering/Core/vtkPointsPainter.h similarity index 100% rename from Rendering/vtkPointsPainter.h rename to Rendering/Core/vtkPointsPainter.h diff --git a/Rendering/vtkPolyDataMapper.cxx b/Rendering/Core/vtkPolyDataMapper.cxx similarity index 100% rename from Rendering/vtkPolyDataMapper.cxx rename to Rendering/Core/vtkPolyDataMapper.cxx diff --git a/Rendering/vtkPolyDataMapper.h b/Rendering/Core/vtkPolyDataMapper.h similarity index 100% rename from Rendering/vtkPolyDataMapper.h rename to Rendering/Core/vtkPolyDataMapper.h diff --git a/Rendering/vtkPolyDataMapper2D.cxx b/Rendering/Core/vtkPolyDataMapper2D.cxx similarity index 100% rename from Rendering/vtkPolyDataMapper2D.cxx rename to Rendering/Core/vtkPolyDataMapper2D.cxx diff --git a/Rendering/vtkPolyDataMapper2D.h b/Rendering/Core/vtkPolyDataMapper2D.h similarity index 100% rename from Rendering/vtkPolyDataMapper2D.h rename to Rendering/Core/vtkPolyDataMapper2D.h diff --git a/Rendering/vtkPolyDataPainter.cxx b/Rendering/Core/vtkPolyDataPainter.cxx similarity index 100% rename from Rendering/vtkPolyDataPainter.cxx rename to Rendering/Core/vtkPolyDataPainter.cxx diff --git a/Rendering/vtkPolyDataPainter.h b/Rendering/Core/vtkPolyDataPainter.h similarity index 100% rename from Rendering/vtkPolyDataPainter.h rename to Rendering/Core/vtkPolyDataPainter.h diff --git a/Rendering/vtkPolygonsPainter.cxx b/Rendering/Core/vtkPolygonsPainter.cxx similarity index 100% rename from Rendering/vtkPolygonsPainter.cxx rename to Rendering/Core/vtkPolygonsPainter.cxx diff --git a/Rendering/vtkPolygonsPainter.h b/Rendering/Core/vtkPolygonsPainter.h similarity index 100% rename from Rendering/vtkPolygonsPainter.h rename to Rendering/Core/vtkPolygonsPainter.h diff --git a/Rendering/vtkPrimitivePainter.cxx b/Rendering/Core/vtkPrimitivePainter.cxx similarity index 100% rename from Rendering/vtkPrimitivePainter.cxx rename to Rendering/Core/vtkPrimitivePainter.cxx diff --git a/Rendering/vtkPrimitivePainter.h b/Rendering/Core/vtkPrimitivePainter.h similarity index 100% rename from Rendering/vtkPrimitivePainter.h rename to Rendering/Core/vtkPrimitivePainter.h diff --git a/Common/vtkProp.cxx b/Rendering/Core/vtkProp.cxx similarity index 100% rename from Common/vtkProp.cxx rename to Rendering/Core/vtkProp.cxx diff --git a/Common/vtkProp.h b/Rendering/Core/vtkProp.h similarity index 100% rename from Common/vtkProp.h rename to Rendering/Core/vtkProp.h diff --git a/Rendering/vtkProp3D.cxx b/Rendering/Core/vtkProp3D.cxx similarity index 100% rename from Rendering/vtkProp3D.cxx rename to Rendering/Core/vtkProp3D.cxx diff --git a/Rendering/vtkProp3D.h b/Rendering/Core/vtkProp3D.h similarity index 100% rename from Rendering/vtkProp3D.h rename to Rendering/Core/vtkProp3D.h diff --git a/Rendering/vtkProp3DCollection.cxx b/Rendering/Core/vtkProp3DCollection.cxx similarity index 100% rename from Rendering/vtkProp3DCollection.cxx rename to Rendering/Core/vtkProp3DCollection.cxx diff --git a/Rendering/vtkProp3DCollection.h b/Rendering/Core/vtkProp3DCollection.h similarity index 100% rename from Rendering/vtkProp3DCollection.h rename to Rendering/Core/vtkProp3DCollection.h diff --git a/Rendering/vtkProp3DFollower.cxx b/Rendering/Core/vtkProp3DFollower.cxx similarity index 100% rename from Rendering/vtkProp3DFollower.cxx rename to Rendering/Core/vtkProp3DFollower.cxx diff --git a/Rendering/vtkProp3DFollower.h b/Rendering/Core/vtkProp3DFollower.h similarity index 100% rename from Rendering/vtkProp3DFollower.h rename to Rendering/Core/vtkProp3DFollower.h diff --git a/Filtering/vtkPropAssembly.cxx b/Rendering/Core/vtkPropAssembly.cxx similarity index 100% rename from Filtering/vtkPropAssembly.cxx rename to Rendering/Core/vtkPropAssembly.cxx diff --git a/Filtering/vtkPropAssembly.h b/Rendering/Core/vtkPropAssembly.h similarity index 100% rename from Filtering/vtkPropAssembly.h rename to Rendering/Core/vtkPropAssembly.h diff --git a/Common/vtkPropCollection.cxx b/Rendering/Core/vtkPropCollection.cxx similarity index 100% rename from Common/vtkPropCollection.cxx rename to Rendering/Core/vtkPropCollection.cxx diff --git a/Common/vtkPropCollection.h b/Rendering/Core/vtkPropCollection.h similarity index 100% rename from Common/vtkPropCollection.h rename to Rendering/Core/vtkPropCollection.h diff --git a/Rendering/vtkPropPicker.cxx b/Rendering/Core/vtkPropPicker.cxx similarity index 100% rename from Rendering/vtkPropPicker.cxx rename to Rendering/Core/vtkPropPicker.cxx diff --git a/Rendering/vtkPropPicker.h b/Rendering/Core/vtkPropPicker.h similarity index 100% rename from Rendering/vtkPropPicker.h rename to Rendering/Core/vtkPropPicker.h diff --git a/Rendering/vtkProperty.cxx b/Rendering/Core/vtkProperty.cxx similarity index 100% rename from Rendering/vtkProperty.cxx rename to Rendering/Core/vtkProperty.cxx diff --git a/Rendering/vtkProperty.h b/Rendering/Core/vtkProperty.h similarity index 100% rename from Rendering/vtkProperty.h rename to Rendering/Core/vtkProperty.h diff --git a/Common/vtkProperty2D.cxx b/Rendering/Core/vtkProperty2D.cxx similarity index 100% rename from Common/vtkProperty2D.cxx rename to Rendering/Core/vtkProperty2D.cxx diff --git a/Common/vtkProperty2D.h b/Rendering/Core/vtkProperty2D.h similarity index 100% rename from Common/vtkProperty2D.h rename to Rendering/Core/vtkProperty2D.h diff --git a/Rendering/vtkPythagoreanQuadruples.h b/Rendering/Core/vtkPythagoreanQuadruples.h similarity index 100% rename from Rendering/vtkPythagoreanQuadruples.h rename to Rendering/Core/vtkPythagoreanQuadruples.h diff --git a/Common/vtkRayCastStructures.h b/Rendering/Core/vtkRayCastStructures.h similarity index 100% rename from Common/vtkRayCastStructures.h rename to Rendering/Core/vtkRayCastStructures.h diff --git a/Rendering/vtkRenderWindow.cxx b/Rendering/Core/vtkRenderWindow.cxx similarity index 100% rename from Rendering/vtkRenderWindow.cxx rename to Rendering/Core/vtkRenderWindow.cxx diff --git a/Rendering/vtkRenderWindow.h b/Rendering/Core/vtkRenderWindow.h similarity index 100% rename from Rendering/vtkRenderWindow.h rename to Rendering/Core/vtkRenderWindow.h diff --git a/Rendering/vtkRenderWindowCollection.cxx b/Rendering/Core/vtkRenderWindowCollection.cxx similarity index 100% rename from Rendering/vtkRenderWindowCollection.cxx rename to Rendering/Core/vtkRenderWindowCollection.cxx diff --git a/Rendering/vtkRenderWindowCollection.h b/Rendering/Core/vtkRenderWindowCollection.h similarity index 100% rename from Rendering/vtkRenderWindowCollection.h rename to Rendering/Core/vtkRenderWindowCollection.h diff --git a/Rendering/vtkRenderWindowInteractor.cxx b/Rendering/Core/vtkRenderWindowInteractor.cxx similarity index 100% rename from Rendering/vtkRenderWindowInteractor.cxx rename to Rendering/Core/vtkRenderWindowInteractor.cxx diff --git a/Rendering/vtkRenderWindowInteractor.h b/Rendering/Core/vtkRenderWindowInteractor.h similarity index 100% rename from Rendering/vtkRenderWindowInteractor.h rename to Rendering/Core/vtkRenderWindowInteractor.h diff --git a/Rendering/vtkRenderedAreaPicker.cxx b/Rendering/Core/vtkRenderedAreaPicker.cxx similarity index 100% rename from Rendering/vtkRenderedAreaPicker.cxx rename to Rendering/Core/vtkRenderedAreaPicker.cxx diff --git a/Rendering/vtkRenderedAreaPicker.h b/Rendering/Core/vtkRenderedAreaPicker.h similarity index 100% rename from Rendering/vtkRenderedAreaPicker.h rename to Rendering/Core/vtkRenderedAreaPicker.h diff --git a/Rendering/vtkRenderer.cxx b/Rendering/Core/vtkRenderer.cxx similarity index 100% rename from Rendering/vtkRenderer.cxx rename to Rendering/Core/vtkRenderer.cxx diff --git a/Rendering/vtkRenderer.h b/Rendering/Core/vtkRenderer.h similarity index 100% rename from Rendering/vtkRenderer.h rename to Rendering/Core/vtkRenderer.h diff --git a/Rendering/vtkRendererCollection.cxx b/Rendering/Core/vtkRendererCollection.cxx similarity index 100% rename from Rendering/vtkRendererCollection.cxx rename to Rendering/Core/vtkRendererCollection.cxx diff --git a/Rendering/vtkRendererCollection.h b/Rendering/Core/vtkRendererCollection.h similarity index 100% rename from Rendering/vtkRendererCollection.h rename to Rendering/Core/vtkRendererCollection.h diff --git a/Rendering/vtkRendererDelegate.cxx b/Rendering/Core/vtkRendererDelegate.cxx similarity index 100% rename from Rendering/vtkRendererDelegate.cxx rename to Rendering/Core/vtkRendererDelegate.cxx diff --git a/Rendering/vtkRendererDelegate.h b/Rendering/Core/vtkRendererDelegate.h similarity index 100% rename from Rendering/vtkRendererDelegate.h rename to Rendering/Core/vtkRendererDelegate.h diff --git a/Rendering/vtkRendererSource.cxx b/Rendering/Core/vtkRendererSource.cxx similarity index 100% rename from Rendering/vtkRendererSource.cxx rename to Rendering/Core/vtkRendererSource.cxx diff --git a/Rendering/vtkRendererSource.h b/Rendering/Core/vtkRendererSource.h similarity index 100% rename from Rendering/vtkRendererSource.h rename to Rendering/Core/vtkRendererSource.h diff --git a/Rendering/vtkRepresentationPainter.cxx b/Rendering/Core/vtkRepresentationPainter.cxx similarity index 100% rename from Rendering/vtkRepresentationPainter.cxx rename to Rendering/Core/vtkRepresentationPainter.cxx diff --git a/Rendering/vtkRepresentationPainter.h b/Rendering/Core/vtkRepresentationPainter.h similarity index 100% rename from Rendering/vtkRepresentationPainter.h rename to Rendering/Core/vtkRepresentationPainter.h diff --git a/Rendering/vtkScalarsToColorsPainter.cxx b/Rendering/Core/vtkScalarsToColorsPainter.cxx similarity index 100% rename from Rendering/vtkScalarsToColorsPainter.cxx rename to Rendering/Core/vtkScalarsToColorsPainter.cxx diff --git a/Rendering/vtkScalarsToColorsPainter.h b/Rendering/Core/vtkScalarsToColorsPainter.h similarity index 100% rename from Rendering/vtkScalarsToColorsPainter.h rename to Rendering/Core/vtkScalarsToColorsPainter.h diff --git a/Rendering/vtkScenePicker.cxx b/Rendering/Core/vtkScenePicker.cxx similarity index 100% rename from Rendering/vtkScenePicker.cxx rename to Rendering/Core/vtkScenePicker.cxx diff --git a/Rendering/vtkScenePicker.h b/Rendering/Core/vtkScenePicker.h similarity index 100% rename from Rendering/vtkScenePicker.h rename to Rendering/Core/vtkScenePicker.h diff --git a/Rendering/vtkSelectVisiblePoints.cxx b/Rendering/Core/vtkSelectVisiblePoints.cxx similarity index 100% rename from Rendering/vtkSelectVisiblePoints.cxx rename to Rendering/Core/vtkSelectVisiblePoints.cxx diff --git a/Rendering/vtkSelectVisiblePoints.h b/Rendering/Core/vtkSelectVisiblePoints.h similarity index 100% rename from Rendering/vtkSelectVisiblePoints.h rename to Rendering/Core/vtkSelectVisiblePoints.h diff --git a/Rendering/vtkShader.cxx b/Rendering/Core/vtkShader.cxx similarity index 100% rename from Rendering/vtkShader.cxx rename to Rendering/Core/vtkShader.cxx diff --git a/Rendering/vtkShader.h b/Rendering/Core/vtkShader.h similarity index 100% rename from Rendering/vtkShader.h rename to Rendering/Core/vtkShader.h diff --git a/Rendering/vtkShaderDeviceAdapter.cxx b/Rendering/Core/vtkShaderDeviceAdapter.cxx similarity index 100% rename from Rendering/vtkShaderDeviceAdapter.cxx rename to Rendering/Core/vtkShaderDeviceAdapter.cxx diff --git a/Rendering/vtkShaderDeviceAdapter.h b/Rendering/Core/vtkShaderDeviceAdapter.h similarity index 100% rename from Rendering/vtkShaderDeviceAdapter.h rename to Rendering/Core/vtkShaderDeviceAdapter.h diff --git a/Rendering/vtkShaderDeviceAdapter2.cxx b/Rendering/Core/vtkShaderDeviceAdapter2.cxx similarity index 100% rename from Rendering/vtkShaderDeviceAdapter2.cxx rename to Rendering/Core/vtkShaderDeviceAdapter2.cxx diff --git a/Rendering/vtkShaderDeviceAdapter2.h b/Rendering/Core/vtkShaderDeviceAdapter2.h similarity index 100% rename from Rendering/vtkShaderDeviceAdapter2.h rename to Rendering/Core/vtkShaderDeviceAdapter2.h diff --git a/Rendering/vtkShaderProgram.cxx b/Rendering/Core/vtkShaderProgram.cxx similarity index 100% rename from Rendering/vtkShaderProgram.cxx rename to Rendering/Core/vtkShaderProgram.cxx diff --git a/Rendering/vtkShaderProgram.h b/Rendering/Core/vtkShaderProgram.h similarity index 100% rename from Rendering/vtkShaderProgram.h rename to Rendering/Core/vtkShaderProgram.h diff --git a/Rendering/vtkStandardPolyDataPainter.cxx b/Rendering/Core/vtkStandardPolyDataPainter.cxx similarity index 100% rename from Rendering/vtkStandardPolyDataPainter.cxx rename to Rendering/Core/vtkStandardPolyDataPainter.cxx diff --git a/Rendering/vtkStandardPolyDataPainter.h b/Rendering/Core/vtkStandardPolyDataPainter.h similarity index 100% rename from Rendering/vtkStandardPolyDataPainter.h rename to Rendering/Core/vtkStandardPolyDataPainter.h diff --git a/Rendering/vtkStringToImage.cxx b/Rendering/Core/vtkStringToImage.cxx similarity index 100% rename from Rendering/vtkStringToImage.cxx rename to Rendering/Core/vtkStringToImage.cxx diff --git a/Rendering/vtkStringToImage.h b/Rendering/Core/vtkStringToImage.h similarity index 100% rename from Rendering/vtkStringToImage.h rename to Rendering/Core/vtkStringToImage.h diff --git a/Rendering/vtkTDxInteractorStyle.cxx b/Rendering/Core/vtkTDxInteractorStyle.cxx similarity index 100% rename from Rendering/vtkTDxInteractorStyle.cxx rename to Rendering/Core/vtkTDxInteractorStyle.cxx diff --git a/Rendering/vtkTDxInteractorStyle.h b/Rendering/Core/vtkTDxInteractorStyle.h similarity index 100% rename from Rendering/vtkTDxInteractorStyle.h rename to Rendering/Core/vtkTDxInteractorStyle.h diff --git a/Rendering/vtkTDxInteractorStyleCamera.cxx b/Rendering/Core/vtkTDxInteractorStyleCamera.cxx similarity index 100% rename from Rendering/vtkTDxInteractorStyleCamera.cxx rename to Rendering/Core/vtkTDxInteractorStyleCamera.cxx diff --git a/Rendering/vtkTDxInteractorStyleCamera.h b/Rendering/Core/vtkTDxInteractorStyleCamera.h similarity index 100% rename from Rendering/vtkTDxInteractorStyleCamera.h rename to Rendering/Core/vtkTDxInteractorStyleCamera.h diff --git a/Rendering/vtkTDxInteractorStyleSettings.cxx b/Rendering/Core/vtkTDxInteractorStyleSettings.cxx similarity index 100% rename from Rendering/vtkTDxInteractorStyleSettings.cxx rename to Rendering/Core/vtkTDxInteractorStyleSettings.cxx diff --git a/Rendering/vtkTDxInteractorStyleSettings.h b/Rendering/Core/vtkTDxInteractorStyleSettings.h similarity index 100% rename from Rendering/vtkTDxInteractorStyleSettings.h rename to Rendering/Core/vtkTDxInteractorStyleSettings.h diff --git a/Rendering/vtkTDxMotionEventInfo.h b/Rendering/Core/vtkTDxMotionEventInfo.h similarity index 100% rename from Rendering/vtkTDxMotionEventInfo.h rename to Rendering/Core/vtkTDxMotionEventInfo.h diff --git a/Rendering/vtkTStripsPainter.cxx b/Rendering/Core/vtkTStripsPainter.cxx similarity index 100% rename from Rendering/vtkTStripsPainter.cxx rename to Rendering/Core/vtkTStripsPainter.cxx diff --git a/Rendering/vtkTStripsPainter.h b/Rendering/Core/vtkTStripsPainter.h similarity index 100% rename from Rendering/vtkTStripsPainter.h rename to Rendering/Core/vtkTStripsPainter.h diff --git a/Rendering/vtkTexture.cxx b/Rendering/Core/vtkTexture.cxx similarity index 100% rename from Rendering/vtkTexture.cxx rename to Rendering/Core/vtkTexture.cxx diff --git a/Rendering/vtkTexture.h b/Rendering/Core/vtkTexture.h similarity index 100% rename from Rendering/vtkTexture.h rename to Rendering/Core/vtkTexture.h diff --git a/Rendering/vtkTexturedActor2D.cxx b/Rendering/Core/vtkTexturedActor2D.cxx similarity index 100% rename from Rendering/vtkTexturedActor2D.cxx rename to Rendering/Core/vtkTexturedActor2D.cxx diff --git a/Rendering/vtkTexturedActor2D.h b/Rendering/Core/vtkTexturedActor2D.h similarity index 100% rename from Rendering/vtkTexturedActor2D.h rename to Rendering/Core/vtkTexturedActor2D.h diff --git a/Graphics/vtkTransformCoordinateSystems.cxx b/Rendering/Core/vtkTransformCoordinateSystems.cxx similarity index 100% rename from Graphics/vtkTransformCoordinateSystems.cxx rename to Rendering/Core/vtkTransformCoordinateSystems.cxx diff --git a/Graphics/vtkTransformCoordinateSystems.h b/Rendering/Core/vtkTransformCoordinateSystems.h similarity index 100% rename from Graphics/vtkTransformCoordinateSystems.h rename to Rendering/Core/vtkTransformCoordinateSystems.h diff --git a/Rendering/vtkTransformInterpolator.cxx b/Rendering/Core/vtkTransformInterpolator.cxx similarity index 100% rename from Rendering/vtkTransformInterpolator.cxx rename to Rendering/Core/vtkTransformInterpolator.cxx diff --git a/Rendering/vtkTransformInterpolator.h b/Rendering/Core/vtkTransformInterpolator.h similarity index 100% rename from Rendering/vtkTransformInterpolator.h rename to Rendering/Core/vtkTransformInterpolator.h diff --git a/Rendering/vtkTupleInterpolator.cxx b/Rendering/Core/vtkTupleInterpolator.cxx similarity index 100% rename from Rendering/vtkTupleInterpolator.cxx rename to Rendering/Core/vtkTupleInterpolator.cxx diff --git a/Rendering/vtkTupleInterpolator.h b/Rendering/Core/vtkTupleInterpolator.h similarity index 100% rename from Rendering/vtkTupleInterpolator.h rename to Rendering/Core/vtkTupleInterpolator.h diff --git a/Filtering/vtkViewDependentErrorMetric.cxx b/Rendering/Core/vtkViewDependentErrorMetric.cxx similarity index 100% rename from Filtering/vtkViewDependentErrorMetric.cxx rename to Rendering/Core/vtkViewDependentErrorMetric.cxx diff --git a/Filtering/vtkViewDependentErrorMetric.h b/Rendering/Core/vtkViewDependentErrorMetric.h similarity index 100% rename from Filtering/vtkViewDependentErrorMetric.h rename to Rendering/Core/vtkViewDependentErrorMetric.h diff --git a/Filtering/vtkViewport.cxx b/Rendering/Core/vtkViewport.cxx similarity index 100% rename from Filtering/vtkViewport.cxx rename to Rendering/Core/vtkViewport.cxx diff --git a/Filtering/vtkViewport.h b/Rendering/Core/vtkViewport.h similarity index 100% rename from Filtering/vtkViewport.h rename to Rendering/Core/vtkViewport.h diff --git a/Rendering/vtkVisibilitySort.cxx b/Rendering/Core/vtkVisibilitySort.cxx similarity index 100% rename from Rendering/vtkVisibilitySort.cxx rename to Rendering/Core/vtkVisibilitySort.cxx diff --git a/Rendering/vtkVisibilitySort.h b/Rendering/Core/vtkVisibilitySort.h similarity index 100% rename from Rendering/vtkVisibilitySort.h rename to Rendering/Core/vtkVisibilitySort.h diff --git a/Rendering/vtkVolume.cxx b/Rendering/Core/vtkVolume.cxx similarity index 100% rename from Rendering/vtkVolume.cxx rename to Rendering/Core/vtkVolume.cxx diff --git a/Rendering/vtkVolume.h b/Rendering/Core/vtkVolume.h similarity index 100% rename from Rendering/vtkVolume.h rename to Rendering/Core/vtkVolume.h diff --git a/Rendering/vtkVolumeCollection.cxx b/Rendering/Core/vtkVolumeCollection.cxx similarity index 100% rename from Rendering/vtkVolumeCollection.cxx rename to Rendering/Core/vtkVolumeCollection.cxx diff --git a/Rendering/vtkVolumeCollection.h b/Rendering/Core/vtkVolumeCollection.h similarity index 100% rename from Rendering/vtkVolumeCollection.h rename to Rendering/Core/vtkVolumeCollection.h diff --git a/Rendering/vtkVolumeProperty.cxx b/Rendering/Core/vtkVolumeProperty.cxx similarity index 100% rename from Rendering/vtkVolumeProperty.cxx rename to Rendering/Core/vtkVolumeProperty.cxx diff --git a/Rendering/vtkVolumeProperty.h b/Rendering/Core/vtkVolumeProperty.h similarity index 100% rename from Rendering/vtkVolumeProperty.h rename to Rendering/Core/vtkVolumeProperty.h diff --git a/Common/vtkWindowLevelLookupTable.cxx b/Rendering/Core/vtkWindowLevelLookupTable.cxx similarity index 100% rename from Common/vtkWindowLevelLookupTable.cxx rename to Rendering/Core/vtkWindowLevelLookupTable.cxx diff --git a/Common/vtkWindowLevelLookupTable.h b/Rendering/Core/vtkWindowLevelLookupTable.h similarity index 100% rename from Common/vtkWindowLevelLookupTable.h rename to Rendering/Core/vtkWindowLevelLookupTable.h diff --git a/Rendering/vtkWindowToImageFilter.cxx b/Rendering/Core/vtkWindowToImageFilter.cxx similarity index 100% rename from Rendering/vtkWindowToImageFilter.cxx rename to Rendering/Core/vtkWindowToImageFilter.cxx diff --git a/Rendering/vtkWindowToImageFilter.h b/Rendering/Core/vtkWindowToImageFilter.h similarity index 100% rename from Rendering/vtkWindowToImageFilter.h rename to Rendering/Core/vtkWindowToImageFilter.h diff --git a/Rendering/vtkWorldPointPicker.cxx b/Rendering/Core/vtkWorldPointPicker.cxx similarity index 100% rename from Rendering/vtkWorldPointPicker.cxx rename to Rendering/Core/vtkWorldPointPicker.cxx diff --git a/Rendering/vtkWorldPointPicker.h b/Rendering/Core/vtkWorldPointPicker.h similarity index 100% rename from Rendering/vtkWorldPointPicker.h rename to Rendering/Core/vtkWorldPointPicker.h diff --git a/Hybrid/Testing/Tcl/OverlayTextOnImage.tcl b/Rendering/FreeType/Testing/Tcl/OverlayTextOnImage.tcl similarity index 100% rename from Hybrid/Testing/Tcl/OverlayTextOnImage.tcl rename to Rendering/FreeType/Testing/Tcl/OverlayTextOnImage.tcl diff --git a/Rendering/Testing/Tcl/TestTextActor3D.tcl b/Rendering/FreeType/Testing/Tcl/TestTextActor3D.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestTextActor3D.tcl rename to Rendering/FreeType/Testing/Tcl/TestTextActor3D.tcl diff --git a/Rendering/Testing/Tcl/multiLineText.tcl b/Rendering/FreeType/Testing/Tcl/multiLineText.tcl similarity index 100% rename from Rendering/Testing/Tcl/multiLineText.tcl rename to Rendering/FreeType/Testing/Tcl/multiLineText.tcl diff --git a/Hybrid/Testing/Tcl/text.tcl b/Rendering/FreeType/Testing/Tcl/text.tcl similarity index 100% rename from Hybrid/Testing/Tcl/text.tcl rename to Rendering/FreeType/Testing/Tcl/text.tcl diff --git a/Rendering/fonts/bin2c.tcl b/Rendering/FreeType/fonts/bin2c.tcl similarity index 100% rename from Rendering/fonts/bin2c.tcl rename to Rendering/FreeType/fonts/bin2c.tcl diff --git a/Rendering/fonts/c0419bt_.pfb b/Rendering/FreeType/fonts/c0419bt_.pfb similarity index 100% rename from Rendering/fonts/c0419bt_.pfb rename to Rendering/FreeType/fonts/c0419bt_.pfb diff --git a/Rendering/fonts/c0582bt_.pfb b/Rendering/FreeType/fonts/c0582bt_.pfb similarity index 100% rename from Rendering/fonts/c0582bt_.pfb rename to Rendering/FreeType/fonts/c0582bt_.pfb diff --git a/Rendering/fonts/c0583bt_.pfb b/Rendering/FreeType/fonts/c0583bt_.pfb similarity index 100% rename from Rendering/fonts/c0583bt_.pfb rename to Rendering/FreeType/fonts/c0583bt_.pfb diff --git a/Rendering/fonts/c0611bt_.pfb b/Rendering/FreeType/fonts/c0611bt_.pfb similarity index 100% rename from Rendering/fonts/c0611bt_.pfb rename to Rendering/FreeType/fonts/c0611bt_.pfb diff --git a/Rendering/fonts/c0632bt_.pfb b/Rendering/FreeType/fonts/c0632bt_.pfb similarity index 100% rename from Rendering/fonts/c0632bt_.pfb rename to Rendering/FreeType/fonts/c0632bt_.pfb diff --git a/Rendering/fonts/c0633bt_.pfb b/Rendering/FreeType/fonts/c0633bt_.pfb similarity index 100% rename from Rendering/fonts/c0633bt_.pfb rename to Rendering/FreeType/fonts/c0633bt_.pfb diff --git a/Rendering/fonts/c0648bt_.pfb b/Rendering/FreeType/fonts/c0648bt_.pfb similarity index 100% rename from Rendering/fonts/c0648bt_.pfb rename to Rendering/FreeType/fonts/c0648bt_.pfb diff --git a/Rendering/fonts/c0649bt_.pfb b/Rendering/FreeType/fonts/c0649bt_.pfb similarity index 100% rename from Rendering/fonts/c0649bt_.pfb rename to Rendering/FreeType/fonts/c0649bt_.pfb diff --git a/Rendering/fonts/face_arial.cxx b/Rendering/FreeType/fonts/face_arial.cxx similarity index 100% rename from Rendering/fonts/face_arial.cxx rename to Rendering/FreeType/fonts/face_arial.cxx diff --git a/Rendering/fonts/face_arial_bold.cxx b/Rendering/FreeType/fonts/face_arial_bold.cxx similarity index 100% rename from Rendering/fonts/face_arial_bold.cxx rename to Rendering/FreeType/fonts/face_arial_bold.cxx diff --git a/Rendering/fonts/face_arial_bold_italic.cxx b/Rendering/FreeType/fonts/face_arial_bold_italic.cxx similarity index 100% rename from Rendering/fonts/face_arial_bold_italic.cxx rename to Rendering/FreeType/fonts/face_arial_bold_italic.cxx diff --git a/Rendering/fonts/face_arial_italic.cxx b/Rendering/FreeType/fonts/face_arial_italic.cxx similarity index 100% rename from Rendering/fonts/face_arial_italic.cxx rename to Rendering/FreeType/fonts/face_arial_italic.cxx diff --git a/Rendering/fonts/face_courier.cxx b/Rendering/FreeType/fonts/face_courier.cxx similarity index 100% rename from Rendering/fonts/face_courier.cxx rename to Rendering/FreeType/fonts/face_courier.cxx diff --git a/Rendering/fonts/face_courier_bold.cxx b/Rendering/FreeType/fonts/face_courier_bold.cxx similarity index 100% rename from Rendering/fonts/face_courier_bold.cxx rename to Rendering/FreeType/fonts/face_courier_bold.cxx diff --git a/Rendering/fonts/face_courier_bold_italic.cxx b/Rendering/FreeType/fonts/face_courier_bold_italic.cxx similarity index 100% rename from Rendering/fonts/face_courier_bold_italic.cxx rename to Rendering/FreeType/fonts/face_courier_bold_italic.cxx diff --git a/Rendering/fonts/face_courier_italic.cxx b/Rendering/FreeType/fonts/face_courier_italic.cxx similarity index 100% rename from Rendering/fonts/face_courier_italic.cxx rename to Rendering/FreeType/fonts/face_courier_italic.cxx diff --git a/Rendering/fonts/face_times.cxx b/Rendering/FreeType/fonts/face_times.cxx similarity index 100% rename from Rendering/fonts/face_times.cxx rename to Rendering/FreeType/fonts/face_times.cxx diff --git a/Rendering/fonts/face_times_bold.cxx b/Rendering/FreeType/fonts/face_times_bold.cxx similarity index 100% rename from Rendering/fonts/face_times_bold.cxx rename to Rendering/FreeType/fonts/face_times_bold.cxx diff --git a/Rendering/fonts/face_times_bold_italic.cxx b/Rendering/FreeType/fonts/face_times_bold_italic.cxx similarity index 100% rename from Rendering/fonts/face_times_bold_italic.cxx rename to Rendering/FreeType/fonts/face_times_bold_italic.cxx diff --git a/Rendering/fonts/face_times_italic.cxx b/Rendering/FreeType/fonts/face_times_italic.cxx similarity index 100% rename from Rendering/fonts/face_times_italic.cxx rename to Rendering/FreeType/fonts/face_times_italic.cxx diff --git a/Rendering/fonts/uagd8a.pfb b/Rendering/FreeType/fonts/uagd8a.pfb similarity index 100% rename from Rendering/fonts/uagd8a.pfb rename to Rendering/FreeType/fonts/uagd8a.pfb diff --git a/Rendering/fonts/uagdo8a.pfb b/Rendering/FreeType/fonts/uagdo8a.pfb similarity index 100% rename from Rendering/fonts/uagdo8a.pfb rename to Rendering/FreeType/fonts/uagdo8a.pfb diff --git a/Rendering/fonts/uagk8a.pfb b/Rendering/FreeType/fonts/uagk8a.pfb similarity index 100% rename from Rendering/fonts/uagk8a.pfb rename to Rendering/FreeType/fonts/uagk8a.pfb diff --git a/Rendering/fonts/uagko8a.pfb b/Rendering/FreeType/fonts/uagko8a.pfb similarity index 100% rename from Rendering/fonts/uagko8a.pfb rename to Rendering/FreeType/fonts/uagko8a.pfb diff --git a/Rendering/fonts/vtkEmbeddedFonts.h b/Rendering/FreeType/fonts/vtkEmbeddedFonts.h similarity index 100% rename from Rendering/fonts/vtkEmbeddedFonts.h rename to Rendering/FreeType/fonts/vtkEmbeddedFonts.h diff --git a/Rendering/vtkFreeTypeStringToImage.cxx b/Rendering/FreeType/vtkFreeTypeStringToImage.cxx similarity index 100% rename from Rendering/vtkFreeTypeStringToImage.cxx rename to Rendering/FreeType/vtkFreeTypeStringToImage.cxx diff --git a/Rendering/vtkFreeTypeStringToImage.h b/Rendering/FreeType/vtkFreeTypeStringToImage.h similarity index 100% rename from Rendering/vtkFreeTypeStringToImage.h rename to Rendering/FreeType/vtkFreeTypeStringToImage.h diff --git a/Rendering/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx similarity index 100% rename from Rendering/vtkFreeTypeTools.cxx rename to Rendering/FreeType/vtkFreeTypeTools.cxx diff --git a/Rendering/vtkFreeTypeTools.h b/Rendering/FreeType/vtkFreeTypeTools.h similarity index 100% rename from Rendering/vtkFreeTypeTools.h rename to Rendering/FreeType/vtkFreeTypeTools.h diff --git a/Rendering/vtkFreeTypeUtilities.cxx b/Rendering/FreeType/vtkFreeTypeUtilities.cxx similarity index 100% rename from Rendering/vtkFreeTypeUtilities.cxx rename to Rendering/FreeType/vtkFreeTypeUtilities.cxx diff --git a/Rendering/vtkFreeTypeUtilities.h b/Rendering/FreeType/vtkFreeTypeUtilities.h similarity index 100% rename from Rendering/vtkFreeTypeUtilities.h rename to Rendering/FreeType/vtkFreeTypeUtilities.h diff --git a/Rendering/vtkScaledTextActor.cxx b/Rendering/FreeType/vtkScaledTextActor.cxx similarity index 100% rename from Rendering/vtkScaledTextActor.cxx rename to Rendering/FreeType/vtkScaledTextActor.cxx diff --git a/Rendering/vtkScaledTextActor.h b/Rendering/FreeType/vtkScaledTextActor.h similarity index 100% rename from Rendering/vtkScaledTextActor.h rename to Rendering/FreeType/vtkScaledTextActor.h diff --git a/Rendering/vtkTextActor.cxx b/Rendering/FreeType/vtkTextActor.cxx similarity index 100% rename from Rendering/vtkTextActor.cxx rename to Rendering/FreeType/vtkTextActor.cxx diff --git a/Rendering/vtkTextActor.h b/Rendering/FreeType/vtkTextActor.h similarity index 100% rename from Rendering/vtkTextActor.h rename to Rendering/FreeType/vtkTextActor.h diff --git a/Rendering/vtkTextActor3D.cxx b/Rendering/FreeType/vtkTextActor3D.cxx similarity index 100% rename from Rendering/vtkTextActor3D.cxx rename to Rendering/FreeType/vtkTextActor3D.cxx diff --git a/Rendering/vtkTextActor3D.h b/Rendering/FreeType/vtkTextActor3D.h similarity index 100% rename from Rendering/vtkTextActor3D.h rename to Rendering/FreeType/vtkTextActor3D.h diff --git a/Rendering/vtkTextMapper.cxx b/Rendering/FreeType/vtkTextMapper.cxx similarity index 100% rename from Rendering/vtkTextMapper.cxx rename to Rendering/FreeType/vtkTextMapper.cxx diff --git a/Rendering/vtkTextMapper.h b/Rendering/FreeType/vtkTextMapper.h similarity index 100% rename from Rendering/vtkTextMapper.h rename to Rendering/FreeType/vtkTextMapper.h diff --git a/Rendering/vtkTextProperty.cxx b/Rendering/FreeType/vtkTextProperty.cxx similarity index 100% rename from Rendering/vtkTextProperty.cxx rename to Rendering/FreeType/vtkTextProperty.cxx diff --git a/Rendering/vtkTextProperty.h b/Rendering/FreeType/vtkTextProperty.h similarity index 100% rename from Rendering/vtkTextProperty.h rename to Rendering/FreeType/vtkTextProperty.h diff --git a/Hybrid/vtkVectorText.cxx b/Rendering/FreeType/vtkVectorText.cxx similarity index 100% rename from Hybrid/vtkVectorText.cxx rename to Rendering/FreeType/vtkVectorText.cxx diff --git a/Hybrid/vtkVectorText.h b/Rendering/FreeType/vtkVectorText.h similarity index 100% rename from Hybrid/vtkVectorText.h rename to Rendering/FreeType/vtkVectorText.h diff --git a/Rendering/vtkImageResliceMapper.cxx b/Rendering/Image/vtkImageResliceMapper.cxx similarity index 100% rename from Rendering/vtkImageResliceMapper.cxx rename to Rendering/Image/vtkImageResliceMapper.cxx diff --git a/Rendering/vtkImageResliceMapper.h b/Rendering/Image/vtkImageResliceMapper.h similarity index 100% rename from Rendering/vtkImageResliceMapper.h rename to Rendering/Image/vtkImageResliceMapper.h diff --git a/Rendering/vtkImageSliceCollection.cxx b/Rendering/Image/vtkImageSliceCollection.cxx similarity index 100% rename from Rendering/vtkImageSliceCollection.cxx rename to Rendering/Image/vtkImageSliceCollection.cxx diff --git a/Rendering/vtkImageSliceCollection.h b/Rendering/Image/vtkImageSliceCollection.h similarity index 100% rename from Rendering/vtkImageSliceCollection.h rename to Rendering/Image/vtkImageSliceCollection.h diff --git a/Rendering/vtkImageStack.cxx b/Rendering/Image/vtkImageStack.cxx similarity index 100% rename from Rendering/vtkImageStack.cxx rename to Rendering/Image/vtkImageStack.cxx diff --git a/Rendering/vtkImageStack.h b/Rendering/Image/vtkImageStack.h similarity index 100% rename from Rendering/vtkImageStack.h rename to Rendering/Image/vtkImageStack.h diff --git a/Rendering/vtkImageViewer.cxx b/Rendering/Image/vtkImageViewer.cxx similarity index 100% rename from Rendering/vtkImageViewer.cxx rename to Rendering/Image/vtkImageViewer.cxx diff --git a/Rendering/vtkImageViewer.h b/Rendering/Image/vtkImageViewer.h similarity index 100% rename from Rendering/vtkImageViewer.h rename to Rendering/Image/vtkImageViewer.h diff --git a/Rendering/vtkImageViewer2.cxx b/Rendering/Image/vtkImageViewer2.cxx similarity index 100% rename from Rendering/vtkImageViewer2.cxx rename to Rendering/Image/vtkImageViewer2.cxx diff --git a/Rendering/vtkImageViewer2.h b/Rendering/Image/vtkImageViewer2.h similarity index 100% rename from Rendering/vtkImageViewer2.h rename to Rendering/Image/vtkImageViewer2.h diff --git a/Widgets/vtkResliceImageViewer.cxx b/Rendering/Image/vtkResliceImageViewer.cxx similarity index 100% rename from Widgets/vtkResliceImageViewer.cxx rename to Rendering/Image/vtkResliceImageViewer.cxx diff --git a/Widgets/vtkResliceImageViewer.h b/Rendering/Image/vtkResliceImageViewer.h similarity index 100% rename from Widgets/vtkResliceImageViewer.h rename to Rendering/Image/vtkResliceImageViewer.h diff --git a/Widgets/vtkResliceImageViewerMeasurements.cxx b/Rendering/Image/vtkResliceImageViewerMeasurements.cxx similarity index 100% rename from Widgets/vtkResliceImageViewerMeasurements.cxx rename to Rendering/Image/vtkResliceImageViewerMeasurements.cxx diff --git a/Widgets/vtkResliceImageViewerMeasurements.h b/Rendering/Image/vtkResliceImageViewerMeasurements.h similarity index 100% rename from Widgets/vtkResliceImageViewerMeasurements.h rename to Rendering/Image/vtkResliceImageViewerMeasurements.h diff --git a/Rendering/Testing/Tcl/TestQuadricLODActor.tcl b/Rendering/LOD/Testing/Tcl/TestQuadricLODActor.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestQuadricLODActor.tcl rename to Rendering/LOD/Testing/Tcl/TestQuadricLODActor.tcl diff --git a/Rendering/vtkLODActor.cxx b/Rendering/LOD/vtkLODActor.cxx similarity index 100% rename from Rendering/vtkLODActor.cxx rename to Rendering/LOD/vtkLODActor.cxx diff --git a/Rendering/vtkLODActor.h b/Rendering/LOD/vtkLODActor.h similarity index 100% rename from Rendering/vtkLODActor.h rename to Rendering/LOD/vtkLODActor.h diff --git a/Rendering/vtkQuadricLODActor.cxx b/Rendering/LOD/vtkQuadricLODActor.cxx similarity index 100% rename from Rendering/vtkQuadricLODActor.cxx rename to Rendering/LOD/vtkQuadricLODActor.cxx diff --git a/Rendering/vtkQuadricLODActor.h b/Rendering/LOD/vtkQuadricLODActor.h similarity index 100% rename from Rendering/vtkQuadricLODActor.h rename to Rendering/LOD/vtkQuadricLODActor.h diff --git a/Rendering/Testing/Tcl/labeledContours.tcl b/Rendering/Label/Testing/Tcl/labeledContours.tcl similarity index 100% rename from Rendering/Testing/Tcl/labeledContours.tcl rename to Rendering/Label/Testing/Tcl/labeledContours.tcl diff --git a/Rendering/Testing/Tcl/labeledMesh.tcl b/Rendering/Label/Testing/Tcl/labeledMesh.tcl similarity index 100% rename from Rendering/Testing/Tcl/labeledMesh.tcl rename to Rendering/Label/Testing/Tcl/labeledMesh.tcl diff --git a/Rendering/vtkDynamic2DLabelMapper.cxx b/Rendering/Label/vtkDynamic2DLabelMapper.cxx similarity index 100% rename from Rendering/vtkDynamic2DLabelMapper.cxx rename to Rendering/Label/vtkDynamic2DLabelMapper.cxx diff --git a/Rendering/vtkDynamic2DLabelMapper.h b/Rendering/Label/vtkDynamic2DLabelMapper.h similarity index 100% rename from Rendering/vtkDynamic2DLabelMapper.h rename to Rendering/Label/vtkDynamic2DLabelMapper.h diff --git a/Rendering/vtkFreeTypeLabelRenderStrategy.cxx b/Rendering/Label/vtkFreeTypeLabelRenderStrategy.cxx similarity index 100% rename from Rendering/vtkFreeTypeLabelRenderStrategy.cxx rename to Rendering/Label/vtkFreeTypeLabelRenderStrategy.cxx diff --git a/Rendering/vtkFreeTypeLabelRenderStrategy.h b/Rendering/Label/vtkFreeTypeLabelRenderStrategy.h similarity index 100% rename from Rendering/vtkFreeTypeLabelRenderStrategy.h rename to Rendering/Label/vtkFreeTypeLabelRenderStrategy.h diff --git a/Rendering/vtkLabelHierarchy.cxx b/Rendering/Label/vtkLabelHierarchy.cxx similarity index 100% rename from Rendering/vtkLabelHierarchy.cxx rename to Rendering/Label/vtkLabelHierarchy.cxx diff --git a/Rendering/vtkLabelHierarchy.h b/Rendering/Label/vtkLabelHierarchy.h similarity index 100% rename from Rendering/vtkLabelHierarchy.h rename to Rendering/Label/vtkLabelHierarchy.h diff --git a/Rendering/vtkLabelHierarchyAlgorithm.cxx b/Rendering/Label/vtkLabelHierarchyAlgorithm.cxx similarity index 100% rename from Rendering/vtkLabelHierarchyAlgorithm.cxx rename to Rendering/Label/vtkLabelHierarchyAlgorithm.cxx diff --git a/Rendering/vtkLabelHierarchyAlgorithm.h b/Rendering/Label/vtkLabelHierarchyAlgorithm.h similarity index 100% rename from Rendering/vtkLabelHierarchyAlgorithm.h rename to Rendering/Label/vtkLabelHierarchyAlgorithm.h diff --git a/Rendering/vtkLabelHierarchyCompositeIterator.cxx b/Rendering/Label/vtkLabelHierarchyCompositeIterator.cxx similarity index 100% rename from Rendering/vtkLabelHierarchyCompositeIterator.cxx rename to Rendering/Label/vtkLabelHierarchyCompositeIterator.cxx diff --git a/Rendering/vtkLabelHierarchyCompositeIterator.h b/Rendering/Label/vtkLabelHierarchyCompositeIterator.h similarity index 100% rename from Rendering/vtkLabelHierarchyCompositeIterator.h rename to Rendering/Label/vtkLabelHierarchyCompositeIterator.h diff --git a/Rendering/vtkLabelHierarchyIterator.cxx b/Rendering/Label/vtkLabelHierarchyIterator.cxx similarity index 100% rename from Rendering/vtkLabelHierarchyIterator.cxx rename to Rendering/Label/vtkLabelHierarchyIterator.cxx diff --git a/Rendering/vtkLabelHierarchyIterator.h b/Rendering/Label/vtkLabelHierarchyIterator.h similarity index 100% rename from Rendering/vtkLabelHierarchyIterator.h rename to Rendering/Label/vtkLabelHierarchyIterator.h diff --git a/Rendering/vtkLabelHierarchyPrivate.h b/Rendering/Label/vtkLabelHierarchyPrivate.h similarity index 100% rename from Rendering/vtkLabelHierarchyPrivate.h rename to Rendering/Label/vtkLabelHierarchyPrivate.h diff --git a/Rendering/vtkLabelPlacementMapper.cxx b/Rendering/Label/vtkLabelPlacementMapper.cxx similarity index 100% rename from Rendering/vtkLabelPlacementMapper.cxx rename to Rendering/Label/vtkLabelPlacementMapper.cxx diff --git a/Rendering/vtkLabelPlacementMapper.h b/Rendering/Label/vtkLabelPlacementMapper.h similarity index 100% rename from Rendering/vtkLabelPlacementMapper.h rename to Rendering/Label/vtkLabelPlacementMapper.h diff --git a/Rendering/vtkLabelPlacer.cxx b/Rendering/Label/vtkLabelPlacer.cxx similarity index 100% rename from Rendering/vtkLabelPlacer.cxx rename to Rendering/Label/vtkLabelPlacer.cxx diff --git a/Rendering/vtkLabelPlacer.h b/Rendering/Label/vtkLabelPlacer.h similarity index 100% rename from Rendering/vtkLabelPlacer.h rename to Rendering/Label/vtkLabelPlacer.h diff --git a/Rendering/vtkLabelRenderStrategy.cxx b/Rendering/Label/vtkLabelRenderStrategy.cxx similarity index 100% rename from Rendering/vtkLabelRenderStrategy.cxx rename to Rendering/Label/vtkLabelRenderStrategy.cxx diff --git a/Rendering/vtkLabelRenderStrategy.h b/Rendering/Label/vtkLabelRenderStrategy.h similarity index 100% rename from Rendering/vtkLabelRenderStrategy.h rename to Rendering/Label/vtkLabelRenderStrategy.h diff --git a/Rendering/vtkLabelSizeCalculator.cxx b/Rendering/Label/vtkLabelSizeCalculator.cxx similarity index 100% rename from Rendering/vtkLabelSizeCalculator.cxx rename to Rendering/Label/vtkLabelSizeCalculator.cxx diff --git a/Rendering/vtkLabelSizeCalculator.h b/Rendering/Label/vtkLabelSizeCalculator.h similarity index 100% rename from Rendering/vtkLabelSizeCalculator.h rename to Rendering/Label/vtkLabelSizeCalculator.h diff --git a/Rendering/vtkLabeledDataMapper.cxx b/Rendering/Label/vtkLabeledDataMapper.cxx similarity index 100% rename from Rendering/vtkLabeledDataMapper.cxx rename to Rendering/Label/vtkLabeledDataMapper.cxx diff --git a/Rendering/vtkLabeledDataMapper.h b/Rendering/Label/vtkLabeledDataMapper.h similarity index 100% rename from Rendering/vtkLabeledDataMapper.h rename to Rendering/Label/vtkLabeledDataMapper.h diff --git a/Rendering/vtkLabeledTreeMapDataMapper.cxx b/Rendering/Label/vtkLabeledTreeMapDataMapper.cxx similarity index 100% rename from Rendering/vtkLabeledTreeMapDataMapper.cxx rename to Rendering/Label/vtkLabeledTreeMapDataMapper.cxx diff --git a/Rendering/vtkLabeledTreeMapDataMapper.h b/Rendering/Label/vtkLabeledTreeMapDataMapper.h similarity index 100% rename from Rendering/vtkLabeledTreeMapDataMapper.h rename to Rendering/Label/vtkLabeledTreeMapDataMapper.h diff --git a/Rendering/vtkPointSetToLabelHierarchy.cxx b/Rendering/Label/vtkPointSetToLabelHierarchy.cxx similarity index 100% rename from Rendering/vtkPointSetToLabelHierarchy.cxx rename to Rendering/Label/vtkPointSetToLabelHierarchy.cxx diff --git a/Rendering/vtkPointSetToLabelHierarchy.h b/Rendering/Label/vtkPointSetToLabelHierarchy.h similarity index 100% rename from Rendering/vtkPointSetToLabelHierarchy.h rename to Rendering/Label/vtkPointSetToLabelHierarchy.h diff --git a/Rendering/CheckglXGetProcAddressARB.cxx b/Rendering/OpenGL/CheckglXGetProcAddressARB.cxx similarity index 100% rename from Rendering/CheckglXGetProcAddressARB.cxx rename to Rendering/OpenGL/CheckglXGetProcAddressARB.cxx diff --git a/Rendering/Testing/Cxx/CMakeLists.txt b/Rendering/OpenGL/Testing/Cxx/CMakeLists.txt similarity index 100% rename from Rendering/Testing/Cxx/CMakeLists.txt rename to Rendering/OpenGL/Testing/Cxx/CMakeLists.txt diff --git a/Rendering/Testing/Cxx/LoadOpenGLExtension.cxx b/Rendering/OpenGL/Testing/Cxx/LoadOpenGLExtension.cxx similarity index 100% rename from Rendering/Testing/Cxx/LoadOpenGLExtension.cxx rename to Rendering/OpenGL/Testing/Cxx/LoadOpenGLExtension.cxx diff --git a/Rendering/Testing/Cxx/RenderNonFinite.cxx b/Rendering/OpenGL/Testing/Cxx/RenderNonFinite.cxx similarity index 100% rename from Rendering/Testing/Cxx/RenderNonFinite.cxx rename to Rendering/OpenGL/Testing/Cxx/RenderNonFinite.cxx diff --git a/Rendering/Testing/Cxx/SurfacePlusEdges.cxx b/Rendering/OpenGL/Testing/Cxx/SurfacePlusEdges.cxx similarity index 100% rename from Rendering/Testing/Cxx/SurfacePlusEdges.cxx rename to Rendering/OpenGL/Testing/Cxx/SurfacePlusEdges.cxx diff --git a/Rendering/Testing/Cxx/TestActorLightingFlag.cxx b/Rendering/OpenGL/Testing/Cxx/TestActorLightingFlag.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestActorLightingFlag.cxx rename to Rendering/OpenGL/Testing/Cxx/TestActorLightingFlag.cxx diff --git a/Rendering/Testing/Cxx/TestAnimationScene.cxx b/Rendering/OpenGL/Testing/Cxx/TestAnimationScene.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestAnimationScene.cxx rename to Rendering/OpenGL/Testing/Cxx/TestAnimationScene.cxx diff --git a/Rendering/Testing/Cxx/TestAreaSelections.cxx b/Rendering/OpenGL/Testing/Cxx/TestAreaSelections.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestAreaSelections.cxx rename to Rendering/OpenGL/Testing/Cxx/TestAreaSelections.cxx diff --git a/Rendering/Testing/Cxx/TestBackfaceCulling.cxx b/Rendering/OpenGL/Testing/Cxx/TestBackfaceCulling.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestBackfaceCulling.cxx rename to Rendering/OpenGL/Testing/Cxx/TestBackfaceCulling.cxx diff --git a/Rendering/Testing/Cxx/TestBlurAndSobelPasses.cxx b/Rendering/OpenGL/Testing/Cxx/TestBlurAndSobelPasses.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestBlurAndSobelPasses.cxx rename to Rendering/OpenGL/Testing/Cxx/TestBlurAndSobelPasses.cxx diff --git a/Rendering/Testing/Cxx/TestDynamic2DLabelMapper.cxx b/Rendering/OpenGL/Testing/Cxx/TestDynamic2DLabelMapper.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestDynamic2DLabelMapper.cxx rename to Rendering/OpenGL/Testing/Cxx/TestDynamic2DLabelMapper.cxx diff --git a/Rendering/Testing/Cxx/TestFBO.cxx b/Rendering/OpenGL/Testing/Cxx/TestFBO.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestFBO.cxx rename to Rendering/OpenGL/Testing/Cxx/TestFBO.cxx diff --git a/Rendering/Testing/Cxx/TestFBOImplementation.cxx b/Rendering/OpenGL/Testing/Cxx/TestFBOImplementation.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestFBOImplementation.cxx rename to Rendering/OpenGL/Testing/Cxx/TestFBOImplementation.cxx diff --git a/Rendering/Testing/Cxx/TestFBOInclude.h.in b/Rendering/OpenGL/Testing/Cxx/TestFBOInclude.h.in similarity index 100% rename from Rendering/Testing/Cxx/TestFBOInclude.h.in rename to Rendering/OpenGL/Testing/Cxx/TestFBOInclude.h.in diff --git a/Rendering/Testing/Cxx/TestFollowerPicking.cxx b/Rendering/OpenGL/Testing/Cxx/TestFollowerPicking.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestFollowerPicking.cxx rename to Rendering/OpenGL/Testing/Cxx/TestFollowerPicking.cxx diff --git a/Rendering/Testing/Cxx/TestGPUInfo.cxx b/Rendering/OpenGL/Testing/Cxx/TestGPUInfo.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestGPUInfo.cxx rename to Rendering/OpenGL/Testing/Cxx/TestGPUInfo.cxx diff --git a/Rendering/Testing/Cxx/TestGaussianBlurPass.cxx b/Rendering/OpenGL/Testing/Cxx/TestGaussianBlurPass.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestGaussianBlurPass.cxx rename to Rendering/OpenGL/Testing/Cxx/TestGaussianBlurPass.cxx diff --git a/Rendering/Testing/Cxx/TestGenericVertexAttributesGLSLAlphaBlending.cxx b/Rendering/OpenGL/Testing/Cxx/TestGenericVertexAttributesGLSLAlphaBlending.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestGenericVertexAttributesGLSLAlphaBlending.cxx rename to Rendering/OpenGL/Testing/Cxx/TestGenericVertexAttributesGLSLAlphaBlending.cxx diff --git a/Rendering/Testing/Cxx/TestGenericVertexAttributesGLSLCxx.cxx b/Rendering/OpenGL/Testing/Cxx/TestGenericVertexAttributesGLSLCxx.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestGenericVertexAttributesGLSLCxx.cxx rename to Rendering/OpenGL/Testing/Cxx/TestGenericVertexAttributesGLSLCxx.cxx diff --git a/Rendering/Testing/Cxx/TestGenericVertexAttributesGLSLDepthPeelingPass.cxx b/Rendering/OpenGL/Testing/Cxx/TestGenericVertexAttributesGLSLDepthPeelingPass.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestGenericVertexAttributesGLSLDepthPeelingPass.cxx rename to Rendering/OpenGL/Testing/Cxx/TestGenericVertexAttributesGLSLDepthPeelingPass.cxx diff --git a/Rendering/Testing/Cxx/TestGlyph3DMapper.cxx b/Rendering/OpenGL/Testing/Cxx/TestGlyph3DMapper.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestGlyph3DMapper.cxx rename to Rendering/OpenGL/Testing/Cxx/TestGlyph3DMapper.cxx diff --git a/Rendering/Testing/Cxx/TestGlyph3DMapperArrow.cxx b/Rendering/OpenGL/Testing/Cxx/TestGlyph3DMapperArrow.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestGlyph3DMapperArrow.cxx rename to Rendering/OpenGL/Testing/Cxx/TestGlyph3DMapperArrow.cxx diff --git a/Rendering/Testing/Cxx/TestGlyph3DMapperMasking.cxx b/Rendering/OpenGL/Testing/Cxx/TestGlyph3DMapperMasking.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestGlyph3DMapperMasking.cxx rename to Rendering/OpenGL/Testing/Cxx/TestGlyph3DMapperMasking.cxx diff --git a/Rendering/Testing/Cxx/TestGlyph3DMapperOrientationArray.cxx b/Rendering/OpenGL/Testing/Cxx/TestGlyph3DMapperOrientationArray.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestGlyph3DMapperOrientationArray.cxx rename to Rendering/OpenGL/Testing/Cxx/TestGlyph3DMapperOrientationArray.cxx diff --git a/Rendering/Testing/Cxx/TestGlyph3DMapperPicking.cxx b/Rendering/OpenGL/Testing/Cxx/TestGlyph3DMapperPicking.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestGlyph3DMapperPicking.cxx rename to Rendering/OpenGL/Testing/Cxx/TestGlyph3DMapperPicking.cxx diff --git a/Rendering/Testing/Cxx/TestGradientBackground.cxx b/Rendering/OpenGL/Testing/Cxx/TestGradientBackground.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestGradientBackground.cxx rename to Rendering/OpenGL/Testing/Cxx/TestGradientBackground.cxx diff --git a/Rendering/Testing/Cxx/TestHomogeneousTransformOfActor.cxx b/Rendering/OpenGL/Testing/Cxx/TestHomogeneousTransformOfActor.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestHomogeneousTransformOfActor.cxx rename to Rendering/OpenGL/Testing/Cxx/TestHomogeneousTransformOfActor.cxx diff --git a/Rendering/Testing/Cxx/TestImageResliceMapperAlpha.cxx b/Rendering/OpenGL/Testing/Cxx/TestImageResliceMapperAlpha.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestImageResliceMapperAlpha.cxx rename to Rendering/OpenGL/Testing/Cxx/TestImageResliceMapperAlpha.cxx diff --git a/Rendering/Testing/Cxx/TestImageResliceMapperBackground.cxx b/Rendering/OpenGL/Testing/Cxx/TestImageResliceMapperBackground.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestImageResliceMapperBackground.cxx rename to Rendering/OpenGL/Testing/Cxx/TestImageResliceMapperBackground.cxx diff --git a/Rendering/Testing/Cxx/TestImageResliceMapperBorder.cxx b/Rendering/OpenGL/Testing/Cxx/TestImageResliceMapperBorder.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestImageResliceMapperBorder.cxx rename to Rendering/OpenGL/Testing/Cxx/TestImageResliceMapperBorder.cxx diff --git a/Rendering/Testing/Cxx/TestImageResliceMapperInterpolation.cxx b/Rendering/OpenGL/Testing/Cxx/TestImageResliceMapperInterpolation.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestImageResliceMapperInterpolation.cxx rename to Rendering/OpenGL/Testing/Cxx/TestImageResliceMapperInterpolation.cxx diff --git a/Rendering/Testing/Cxx/TestImageResliceMapperOffAxis.cxx b/Rendering/OpenGL/Testing/Cxx/TestImageResliceMapperOffAxis.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestImageResliceMapperOffAxis.cxx rename to Rendering/OpenGL/Testing/Cxx/TestImageResliceMapperOffAxis.cxx diff --git a/Rendering/Testing/Cxx/TestImageResliceMapperOrient3D.cxx b/Rendering/OpenGL/Testing/Cxx/TestImageResliceMapperOrient3D.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestImageResliceMapperOrient3D.cxx rename to Rendering/OpenGL/Testing/Cxx/TestImageResliceMapperOrient3D.cxx diff --git a/Rendering/Testing/Cxx/TestImageResliceMapperSlab.cxx b/Rendering/OpenGL/Testing/Cxx/TestImageResliceMapperSlab.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestImageResliceMapperSlab.cxx rename to Rendering/OpenGL/Testing/Cxx/TestImageResliceMapperSlab.cxx diff --git a/Rendering/Testing/Cxx/TestImageSliceMapperAlpha.cxx b/Rendering/OpenGL/Testing/Cxx/TestImageSliceMapperAlpha.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestImageSliceMapperAlpha.cxx rename to Rendering/OpenGL/Testing/Cxx/TestImageSliceMapperAlpha.cxx diff --git a/Rendering/Testing/Cxx/TestImageSliceMapperBackground.cxx b/Rendering/OpenGL/Testing/Cxx/TestImageSliceMapperBackground.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestImageSliceMapperBackground.cxx rename to Rendering/OpenGL/Testing/Cxx/TestImageSliceMapperBackground.cxx diff --git a/Rendering/Testing/Cxx/TestImageSliceMapperBorder.cxx b/Rendering/OpenGL/Testing/Cxx/TestImageSliceMapperBorder.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestImageSliceMapperBorder.cxx rename to Rendering/OpenGL/Testing/Cxx/TestImageSliceMapperBorder.cxx diff --git a/Rendering/Testing/Cxx/TestImageSliceMapperInterpolation.cxx b/Rendering/OpenGL/Testing/Cxx/TestImageSliceMapperInterpolation.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestImageSliceMapperInterpolation.cxx rename to Rendering/OpenGL/Testing/Cxx/TestImageSliceMapperInterpolation.cxx diff --git a/Rendering/Testing/Cxx/TestImageSliceMapperOrient2D.cxx b/Rendering/OpenGL/Testing/Cxx/TestImageSliceMapperOrient2D.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestImageSliceMapperOrient2D.cxx rename to Rendering/OpenGL/Testing/Cxx/TestImageSliceMapperOrient2D.cxx diff --git a/Rendering/Testing/Cxx/TestImageSliceMapperOrient3D.cxx b/Rendering/OpenGL/Testing/Cxx/TestImageSliceMapperOrient3D.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestImageSliceMapperOrient3D.cxx rename to Rendering/OpenGL/Testing/Cxx/TestImageSliceMapperOrient3D.cxx diff --git a/Rendering/Testing/Cxx/TestImageStack.cxx b/Rendering/OpenGL/Testing/Cxx/TestImageStack.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestImageStack.cxx rename to Rendering/OpenGL/Testing/Cxx/TestImageStack.cxx diff --git a/Rendering/Testing/Cxx/TestInteractorTimers.cxx b/Rendering/OpenGL/Testing/Cxx/TestInteractorTimers.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestInteractorTimers.cxx rename to Rendering/OpenGL/Testing/Cxx/TestInteractorTimers.cxx diff --git a/Rendering/Testing/Cxx/TestLODActor.cxx b/Rendering/OpenGL/Testing/Cxx/TestLODActor.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestLODActor.cxx rename to Rendering/OpenGL/Testing/Cxx/TestLODActor.cxx diff --git a/Rendering/Testing/Cxx/TestLabelPlacementMapper.cxx b/Rendering/OpenGL/Testing/Cxx/TestLabelPlacementMapper.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestLabelPlacementMapper.cxx rename to Rendering/OpenGL/Testing/Cxx/TestLabelPlacementMapper.cxx diff --git a/Rendering/Testing/Cxx/TestLabelPlacementMapper2D.cxx b/Rendering/OpenGL/Testing/Cxx/TestLabelPlacementMapper2D.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestLabelPlacementMapper2D.cxx rename to Rendering/OpenGL/Testing/Cxx/TestLabelPlacementMapper2D.cxx diff --git a/Rendering/Testing/Cxx/TestLabelPlacementMapperCoincidentPoints.cxx b/Rendering/OpenGL/Testing/Cxx/TestLabelPlacementMapperCoincidentPoints.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestLabelPlacementMapperCoincidentPoints.cxx rename to Rendering/OpenGL/Testing/Cxx/TestLabelPlacementMapperCoincidentPoints.cxx diff --git a/Rendering/Testing/Cxx/TestLabelPlacer.cxx b/Rendering/OpenGL/Testing/Cxx/TestLabelPlacer.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestLabelPlacer.cxx rename to Rendering/OpenGL/Testing/Cxx/TestLabelPlacer.cxx diff --git a/Rendering/Testing/Cxx/TestLabelPlacer2D.cxx b/Rendering/OpenGL/Testing/Cxx/TestLabelPlacer2D.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestLabelPlacer2D.cxx rename to Rendering/OpenGL/Testing/Cxx/TestLabelPlacer2D.cxx diff --git a/Rendering/Testing/Cxx/TestLabelPlacerCoincidentPoints.cxx b/Rendering/OpenGL/Testing/Cxx/TestLabelPlacerCoincidentPoints.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestLabelPlacerCoincidentPoints.cxx rename to Rendering/OpenGL/Testing/Cxx/TestLabelPlacerCoincidentPoints.cxx diff --git a/Rendering/Testing/Cxx/TestLightActor.cxx b/Rendering/OpenGL/Testing/Cxx/TestLightActor.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestLightActor.cxx rename to Rendering/OpenGL/Testing/Cxx/TestLightActor.cxx diff --git a/Rendering/Testing/Cxx/TestManyActors.cxx b/Rendering/OpenGL/Testing/Cxx/TestManyActors.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestManyActors.cxx rename to Rendering/OpenGL/Testing/Cxx/TestManyActors.cxx diff --git a/Rendering/Testing/Cxx/TestMultiTexturing.cxx b/Rendering/OpenGL/Testing/Cxx/TestMultiTexturing.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestMultiTexturing.cxx rename to Rendering/OpenGL/Testing/Cxx/TestMultiTexturing.cxx diff --git a/Rendering/Testing/Cxx/TestMultiTexturingGLSL.cxx b/Rendering/OpenGL/Testing/Cxx/TestMultiTexturingGLSL.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestMultiTexturingGLSL.cxx rename to Rendering/OpenGL/Testing/Cxx/TestMultiTexturingGLSL.cxx diff --git a/Rendering/Testing/Cxx/TestMultiTexturingTransform.cxx b/Rendering/OpenGL/Testing/Cxx/TestMultiTexturingTransform.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestMultiTexturingTransform.cxx rename to Rendering/OpenGL/Testing/Cxx/TestMultiTexturingTransform.cxx diff --git a/Rendering/Testing/Cxx/TestOSConeCxx.cxx b/Rendering/OpenGL/Testing/Cxx/TestOSConeCxx.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestOSConeCxx.cxx rename to Rendering/OpenGL/Testing/Cxx/TestOSConeCxx.cxx diff --git a/Rendering/Testing/Cxx/TestOffAxisStereo.cxx b/Rendering/OpenGL/Testing/Cxx/TestOffAxisStereo.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestOffAxisStereo.cxx rename to Rendering/OpenGL/Testing/Cxx/TestOffAxisStereo.cxx diff --git a/Rendering/Testing/Cxx/TestOpacity.cxx b/Rendering/OpenGL/Testing/Cxx/TestOpacity.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestOpacity.cxx rename to Rendering/OpenGL/Testing/Cxx/TestOpacity.cxx diff --git a/Rendering/Testing/Cxx/TestOpenGLPolyDataMapper.cxx b/Rendering/OpenGL/Testing/Cxx/TestOpenGLPolyDataMapper.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestOpenGLPolyDataMapper.cxx rename to Rendering/OpenGL/Testing/Cxx/TestOpenGLPolyDataMapper.cxx diff --git a/Rendering/Testing/Cxx/TestOrderedTriangulator.cxx b/Rendering/OpenGL/Testing/Cxx/TestOrderedTriangulator.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestOrderedTriangulator.cxx rename to Rendering/OpenGL/Testing/Cxx/TestOrderedTriangulator.cxx diff --git a/Rendering/Testing/Cxx/TestPOVExporter.cxx b/Rendering/OpenGL/Testing/Cxx/TestPOVExporter.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestPOVExporter.cxx rename to Rendering/OpenGL/Testing/Cxx/TestPOVExporter.cxx diff --git a/Rendering/Testing/Cxx/TestPriorityStreaming.cxx b/Rendering/OpenGL/Testing/Cxx/TestPriorityStreaming.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestPriorityStreaming.cxx rename to Rendering/OpenGL/Testing/Cxx/TestPriorityStreaming.cxx diff --git a/Rendering/Testing/Cxx/TestQtImages.cxx b/Rendering/OpenGL/Testing/Cxx/TestQtImages.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestQtImages.cxx rename to Rendering/OpenGL/Testing/Cxx/TestQtImages.cxx diff --git a/Rendering/Testing/Cxx/TestQtLabelSizeCalculator.cxx b/Rendering/OpenGL/Testing/Cxx/TestQtLabelSizeCalculator.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestQtLabelSizeCalculator.cxx rename to Rendering/OpenGL/Testing/Cxx/TestQtLabelSizeCalculator.cxx diff --git a/Rendering/Testing/Cxx/TestQtLabeler.cxx b/Rendering/OpenGL/Testing/Cxx/TestQtLabeler.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestQtLabeler.cxx rename to Rendering/OpenGL/Testing/Cxx/TestQtLabeler.cxx diff --git a/Rendering/Testing/Cxx/TestResetCameraVerticalAspectRatio.cxx b/Rendering/OpenGL/Testing/Cxx/TestResetCameraVerticalAspectRatio.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestResetCameraVerticalAspectRatio.cxx rename to Rendering/OpenGL/Testing/Cxx/TestResetCameraVerticalAspectRatio.cxx diff --git a/Rendering/Testing/Cxx/TestResetCameraVerticalAspectRatioParallel.cxx b/Rendering/OpenGL/Testing/Cxx/TestResetCameraVerticalAspectRatioParallel.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestResetCameraVerticalAspectRatioParallel.cxx rename to Rendering/OpenGL/Testing/Cxx/TestResetCameraVerticalAspectRatioParallel.cxx diff --git a/Rendering/Testing/Cxx/TestScalarBar.cxx b/Rendering/OpenGL/Testing/Cxx/TestScalarBar.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestScalarBar.cxx rename to Rendering/OpenGL/Testing/Cxx/TestScalarBar.cxx diff --git a/Rendering/Testing/Cxx/TestScenePicker.cxx b/Rendering/OpenGL/Testing/Cxx/TestScenePicker.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestScenePicker.cxx rename to Rendering/OpenGL/Testing/Cxx/TestScenePicker.cxx diff --git a/Rendering/Testing/Cxx/TestSetImageOrientation.cxx b/Rendering/OpenGL/Testing/Cxx/TestSetImageOrientation.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestSetImageOrientation.cxx rename to Rendering/OpenGL/Testing/Cxx/TestSetImageOrientation.cxx diff --git a/Rendering/Testing/Cxx/TestShadowMapPass.cxx b/Rendering/OpenGL/Testing/Cxx/TestShadowMapPass.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestShadowMapPass.cxx rename to Rendering/OpenGL/Testing/Cxx/TestShadowMapPass.cxx diff --git a/Rendering/Testing/Cxx/TestSobelGradientMagnitudePass.cxx b/Rendering/OpenGL/Testing/Cxx/TestSobelGradientMagnitudePass.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestSobelGradientMagnitudePass.cxx rename to Rendering/OpenGL/Testing/Cxx/TestSobelGradientMagnitudePass.cxx diff --git a/Rendering/Testing/Cxx/TestSurfaceLIC.cxx b/Rendering/OpenGL/Testing/Cxx/TestSurfaceLIC.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestSurfaceLIC.cxx rename to Rendering/OpenGL/Testing/Cxx/TestSurfaceLIC.cxx diff --git a/Rendering/Testing/Cxx/TestSurfaceLIC.h b/Rendering/OpenGL/Testing/Cxx/TestSurfaceLIC.h similarity index 100% rename from Rendering/Testing/Cxx/TestSurfaceLIC.h rename to Rendering/OpenGL/Testing/Cxx/TestSurfaceLIC.h diff --git a/Rendering/Testing/Cxx/TestTDx.cxx b/Rendering/OpenGL/Testing/Cxx/TestTDx.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTDx.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTDx.cxx diff --git a/Rendering/Testing/Cxx/TestTStripsColorsTCoords.cxx b/Rendering/OpenGL/Testing/Cxx/TestTStripsColorsTCoords.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTStripsColorsTCoords.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTStripsColorsTCoords.cxx diff --git a/Rendering/Testing/Cxx/TestTStripsNormalsColorsTCoords.cxx b/Rendering/OpenGL/Testing/Cxx/TestTStripsNormalsColorsTCoords.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTStripsNormalsColorsTCoords.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTStripsNormalsColorsTCoords.cxx diff --git a/Rendering/Testing/Cxx/TestTStripsNormalsTCoords.cxx b/Rendering/OpenGL/Testing/Cxx/TestTStripsNormalsTCoords.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTStripsNormalsTCoords.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTStripsNormalsTCoords.cxx diff --git a/Rendering/Testing/Cxx/TestTStripsTCoords.cxx b/Rendering/OpenGL/Testing/Cxx/TestTStripsTCoords.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTStripsTCoords.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTStripsTCoords.cxx diff --git a/Rendering/Testing/Cxx/TestTextActor3DAlphaBlending.cxx b/Rendering/OpenGL/Testing/Cxx/TestTextActor3DAlphaBlending.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTextActor3DAlphaBlending.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTextActor3DAlphaBlending.cxx diff --git a/Rendering/Testing/Cxx/TestTextActor3DDepthPeeling.cxx b/Rendering/OpenGL/Testing/Cxx/TestTextActor3DDepthPeeling.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTextActor3DDepthPeeling.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTextActor3DDepthPeeling.cxx diff --git a/Rendering/Testing/Cxx/TestTextActorAlphaBlending.cxx b/Rendering/OpenGL/Testing/Cxx/TestTextActorAlphaBlending.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTextActorAlphaBlending.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTextActorAlphaBlending.cxx diff --git a/Rendering/Testing/Cxx/TestTextActorDepthPeeling.cxx b/Rendering/OpenGL/Testing/Cxx/TestTextActorDepthPeeling.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTextActorDepthPeeling.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTextActorDepthPeeling.cxx diff --git a/Rendering/Testing/Cxx/TestTextureRGBA.cxx b/Rendering/OpenGL/Testing/Cxx/TestTextureRGBA.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTextureRGBA.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTextureRGBA.cxx diff --git a/Rendering/Testing/Cxx/TestTextureRGBADepthPeeling.cxx b/Rendering/OpenGL/Testing/Cxx/TestTextureRGBADepthPeeling.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTextureRGBADepthPeeling.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTextureRGBADepthPeeling.cxx diff --git a/Rendering/Testing/Cxx/TestTextureSize.cxx b/Rendering/OpenGL/Testing/Cxx/TestTextureSize.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTextureSize.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTextureSize.cxx diff --git a/Rendering/Testing/Cxx/TestTexturedBackground.cxx b/Rendering/OpenGL/Testing/Cxx/TestTexturedBackground.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTexturedBackground.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTexturedBackground.cxx diff --git a/Rendering/Testing/Cxx/TestTilingCxx.cxx b/Rendering/OpenGL/Testing/Cxx/TestTilingCxx.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTilingCxx.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTilingCxx.cxx diff --git a/Rendering/Testing/Cxx/TestTransformCoordinateUseDouble.cxx b/Rendering/OpenGL/Testing/Cxx/TestTransformCoordinateUseDouble.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTransformCoordinateUseDouble.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTransformCoordinateUseDouble.cxx diff --git a/Rendering/Testing/Cxx/TestTranslucentImageActorAlphaBlending.cxx b/Rendering/OpenGL/Testing/Cxx/TestTranslucentImageActorAlphaBlending.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTranslucentImageActorAlphaBlending.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTranslucentImageActorAlphaBlending.cxx diff --git a/Rendering/Testing/Cxx/TestTranslucentImageActorDepthPeeling.cxx b/Rendering/OpenGL/Testing/Cxx/TestTranslucentImageActorDepthPeeling.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTranslucentImageActorDepthPeeling.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTranslucentImageActorDepthPeeling.cxx diff --git a/Rendering/Testing/Cxx/TestTranslucentLUTAlphaBlending.cxx b/Rendering/OpenGL/Testing/Cxx/TestTranslucentLUTAlphaBlending.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTranslucentLUTAlphaBlending.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTranslucentLUTAlphaBlending.cxx diff --git a/Rendering/Testing/Cxx/TestTranslucentLUTDepthPeeling.cxx b/Rendering/OpenGL/Testing/Cxx/TestTranslucentLUTDepthPeeling.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTranslucentLUTDepthPeeling.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTranslucentLUTDepthPeeling.cxx diff --git a/Rendering/Testing/Cxx/TestTranslucentLUTDepthPeelingPass.cxx b/Rendering/OpenGL/Testing/Cxx/TestTranslucentLUTDepthPeelingPass.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTranslucentLUTDepthPeelingPass.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTranslucentLUTDepthPeelingPass.cxx diff --git a/Rendering/Testing/Cxx/TestTranslucentLUTTextureAlphaBlending.cxx b/Rendering/OpenGL/Testing/Cxx/TestTranslucentLUTTextureAlphaBlending.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTranslucentLUTTextureAlphaBlending.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTranslucentLUTTextureAlphaBlending.cxx diff --git a/Rendering/Testing/Cxx/TestTranslucentLUTTextureDepthPeeling.cxx b/Rendering/OpenGL/Testing/Cxx/TestTranslucentLUTTextureDepthPeeling.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestTranslucentLUTTextureDepthPeeling.cxx rename to Rendering/OpenGL/Testing/Cxx/TestTranslucentLUTTextureDepthPeeling.cxx diff --git a/Rendering/Testing/Cxx/TestWin32OpenGLRenderWindow.cxx b/Rendering/OpenGL/Testing/Cxx/TestWin32OpenGLRenderWindow.cxx similarity index 100% rename from Rendering/Testing/Cxx/TestWin32OpenGLRenderWindow.cxx rename to Rendering/OpenGL/Testing/Cxx/TestWin32OpenGLRenderWindow.cxx diff --git a/Rendering/Testing/Cxx/TimeRenderer.cxx b/Rendering/OpenGL/Testing/Cxx/TimeRenderer.cxx similarity index 100% rename from Rendering/Testing/Cxx/TimeRenderer.cxx rename to Rendering/OpenGL/Testing/Cxx/TimeRenderer.cxx diff --git a/Rendering/Testing/Cxx/TimeRenderer2.cxx b/Rendering/OpenGL/Testing/Cxx/TimeRenderer2.cxx similarity index 100% rename from Rendering/Testing/Cxx/TimeRenderer2.cxx rename to Rendering/OpenGL/Testing/Cxx/TimeRenderer2.cxx diff --git a/Rendering/Testing/Cxx/VTKBenchMark.cxx b/Rendering/OpenGL/Testing/Cxx/VTKBenchMark.cxx similarity index 100% rename from Rendering/Testing/Cxx/VTKBenchMark.cxx rename to Rendering/OpenGL/Testing/Cxx/VTKBenchMark.cxx diff --git a/Rendering/Testing/Cxx/otherCoordinate.cxx b/Rendering/OpenGL/Testing/Cxx/otherCoordinate.cxx similarity index 100% rename from Rendering/Testing/Cxx/otherCoordinate.cxx rename to Rendering/OpenGL/Testing/Cxx/otherCoordinate.cxx diff --git a/Rendering/Testing/Tcl/TestFreetypeTextMapper.tcl b/Rendering/OpenGL/Testing/Tcl/TestFreetypeTextMapper.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestFreetypeTextMapper.tcl rename to Rendering/OpenGL/Testing/Tcl/TestFreetypeTextMapper.tcl diff --git a/Rendering/Testing/Tcl/TestFreetypeTextMapperBigger.tcl b/Rendering/OpenGL/Testing/Tcl/TestFreetypeTextMapperBigger.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestFreetypeTextMapperBigger.tcl rename to Rendering/OpenGL/Testing/Tcl/TestFreetypeTextMapperBigger.tcl diff --git a/Rendering/Testing/Tcl/TestFreetypeTextOverlay.tcl b/Rendering/OpenGL/Testing/Tcl/TestFreetypeTextOverlay.tcl similarity index 100% rename from Rendering/Testing/Tcl/TestFreetypeTextOverlay.tcl rename to Rendering/OpenGL/Testing/Tcl/TestFreetypeTextOverlay.tcl diff --git a/Rendering/vtkCameraPass.cxx b/Rendering/OpenGL/vtkCameraPass.cxx similarity index 100% rename from Rendering/vtkCameraPass.cxx rename to Rendering/OpenGL/vtkCameraPass.cxx diff --git a/Rendering/vtkCameraPass.h b/Rendering/OpenGL/vtkCameraPass.h similarity index 100% rename from Rendering/vtkCameraPass.h rename to Rendering/OpenGL/vtkCameraPass.h diff --git a/Rendering/vtkCarbonRenderWindow.cxx b/Rendering/OpenGL/vtkCarbonRenderWindow.cxx similarity index 100% rename from Rendering/vtkCarbonRenderWindow.cxx rename to Rendering/OpenGL/vtkCarbonRenderWindow.cxx diff --git a/Rendering/vtkCarbonRenderWindow.h b/Rendering/OpenGL/vtkCarbonRenderWindow.h similarity index 100% rename from Rendering/vtkCarbonRenderWindow.h rename to Rendering/OpenGL/vtkCarbonRenderWindow.h diff --git a/Rendering/vtkCarbonRenderWindowInteractor.cxx b/Rendering/OpenGL/vtkCarbonRenderWindowInteractor.cxx similarity index 100% rename from Rendering/vtkCarbonRenderWindowInteractor.cxx rename to Rendering/OpenGL/vtkCarbonRenderWindowInteractor.cxx diff --git a/Rendering/vtkCarbonRenderWindowInteractor.h b/Rendering/OpenGL/vtkCarbonRenderWindowInteractor.h similarity index 100% rename from Rendering/vtkCarbonRenderWindowInteractor.h rename to Rendering/OpenGL/vtkCarbonRenderWindowInteractor.h diff --git a/Rendering/vtkClearZPass.cxx b/Rendering/OpenGL/vtkClearZPass.cxx similarity index 100% rename from Rendering/vtkClearZPass.cxx rename to Rendering/OpenGL/vtkClearZPass.cxx diff --git a/Rendering/vtkClearZPass.h b/Rendering/OpenGL/vtkClearZPass.h similarity index 100% rename from Rendering/vtkClearZPass.h rename to Rendering/OpenGL/vtkClearZPass.h diff --git a/Rendering/vtkCocoaGLView.h b/Rendering/OpenGL/vtkCocoaGLView.h similarity index 100% rename from Rendering/vtkCocoaGLView.h rename to Rendering/OpenGL/vtkCocoaGLView.h diff --git a/Rendering/vtkCocoaGLView.mm b/Rendering/OpenGL/vtkCocoaGLView.mm similarity index 100% rename from Rendering/vtkCocoaGLView.mm rename to Rendering/OpenGL/vtkCocoaGLView.mm diff --git a/Rendering/vtkCocoaMacOSXSDKCompatibility.h b/Rendering/OpenGL/vtkCocoaMacOSXSDKCompatibility.h similarity index 100% rename from Rendering/vtkCocoaMacOSXSDKCompatibility.h rename to Rendering/OpenGL/vtkCocoaMacOSXSDKCompatibility.h diff --git a/Rendering/vtkCocoaRenderWindow.h b/Rendering/OpenGL/vtkCocoaRenderWindow.h similarity index 100% rename from Rendering/vtkCocoaRenderWindow.h rename to Rendering/OpenGL/vtkCocoaRenderWindow.h diff --git a/Rendering/vtkCocoaRenderWindow.mm b/Rendering/OpenGL/vtkCocoaRenderWindow.mm similarity index 100% rename from Rendering/vtkCocoaRenderWindow.mm rename to Rendering/OpenGL/vtkCocoaRenderWindow.mm diff --git a/Rendering/vtkCocoaRenderWindowInteractor.h b/Rendering/OpenGL/vtkCocoaRenderWindowInteractor.h similarity index 100% rename from Rendering/vtkCocoaRenderWindowInteractor.h rename to Rendering/OpenGL/vtkCocoaRenderWindowInteractor.h diff --git a/Rendering/vtkCocoaRenderWindowInteractor.mm b/Rendering/OpenGL/vtkCocoaRenderWindowInteractor.mm similarity index 100% rename from Rendering/vtkCocoaRenderWindowInteractor.mm rename to Rendering/OpenGL/vtkCocoaRenderWindowInteractor.mm diff --git a/Rendering/vtkCocoaTkUtilities.h b/Rendering/OpenGL/vtkCocoaTkUtilities.h similarity index 100% rename from Rendering/vtkCocoaTkUtilities.h rename to Rendering/OpenGL/vtkCocoaTkUtilities.h diff --git a/Rendering/vtkCocoaTkUtilities.mm b/Rendering/OpenGL/vtkCocoaTkUtilities.mm similarity index 100% rename from Rendering/vtkCocoaTkUtilities.mm rename to Rendering/OpenGL/vtkCocoaTkUtilities.mm diff --git a/Rendering/vtkColorMaterialHelper.cxx b/Rendering/OpenGL/vtkColorMaterialHelper.cxx similarity index 100% rename from Rendering/vtkColorMaterialHelper.cxx rename to Rendering/OpenGL/vtkColorMaterialHelper.cxx diff --git a/Rendering/vtkColorMaterialHelper.h b/Rendering/OpenGL/vtkColorMaterialHelper.h similarity index 100% rename from Rendering/vtkColorMaterialHelper.h rename to Rendering/OpenGL/vtkColorMaterialHelper.h diff --git a/Rendering/vtkColorMaterialHelper_vs.glsl b/Rendering/OpenGL/vtkColorMaterialHelper_vs.glsl similarity index 100% rename from Rendering/vtkColorMaterialHelper_vs.glsl rename to Rendering/OpenGL/vtkColorMaterialHelper_vs.glsl diff --git a/Rendering/vtkCoreGraphicsGPUInfoList.cxx b/Rendering/OpenGL/vtkCoreGraphicsGPUInfoList.cxx similarity index 100% rename from Rendering/vtkCoreGraphicsGPUInfoList.cxx rename to Rendering/OpenGL/vtkCoreGraphicsGPUInfoList.cxx diff --git a/Rendering/vtkCoreGraphicsGPUInfoList.h b/Rendering/OpenGL/vtkCoreGraphicsGPUInfoList.h similarity index 100% rename from Rendering/vtkCoreGraphicsGPUInfoList.h rename to Rendering/OpenGL/vtkCoreGraphicsGPUInfoList.h diff --git a/Rendering/vtkDataTransferHelper.cxx b/Rendering/OpenGL/vtkDataTransferHelper.cxx similarity index 100% rename from Rendering/vtkDataTransferHelper.cxx rename to Rendering/OpenGL/vtkDataTransferHelper.cxx diff --git a/Rendering/vtkDataTransferHelper.h b/Rendering/OpenGL/vtkDataTransferHelper.h similarity index 100% rename from Rendering/vtkDataTransferHelper.h rename to Rendering/OpenGL/vtkDataTransferHelper.h diff --git a/Rendering/vtkDefaultPass.cxx b/Rendering/OpenGL/vtkDefaultPass.cxx similarity index 100% rename from Rendering/vtkDefaultPass.cxx rename to Rendering/OpenGL/vtkDefaultPass.cxx diff --git a/Rendering/vtkDefaultPass.h b/Rendering/OpenGL/vtkDefaultPass.h similarity index 100% rename from Rendering/vtkDefaultPass.h rename to Rendering/OpenGL/vtkDefaultPass.h diff --git a/Rendering/vtkDepthPeelingPass.cxx b/Rendering/OpenGL/vtkDepthPeelingPass.cxx similarity index 100% rename from Rendering/vtkDepthPeelingPass.cxx rename to Rendering/OpenGL/vtkDepthPeelingPass.cxx diff --git a/Rendering/vtkDepthPeelingPass.h b/Rendering/OpenGL/vtkDepthPeelingPass.h similarity index 100% rename from Rendering/vtkDepthPeelingPass.h rename to Rendering/OpenGL/vtkDepthPeelingPass.h diff --git a/Rendering/vtkDepthPeeling_fs.glsl b/Rendering/OpenGL/vtkDepthPeeling_fs.glsl similarity index 100% rename from Rendering/vtkDepthPeeling_fs.glsl rename to Rendering/OpenGL/vtkDepthPeeling_fs.glsl diff --git a/Rendering/vtkDirectXGPUInfoList.cxx b/Rendering/OpenGL/vtkDirectXGPUInfoList.cxx similarity index 100% rename from Rendering/vtkDirectXGPUInfoList.cxx rename to Rendering/OpenGL/vtkDirectXGPUInfoList.cxx diff --git a/Rendering/vtkDirectXGPUInfoList.h b/Rendering/OpenGL/vtkDirectXGPUInfoList.h similarity index 100% rename from Rendering/vtkDirectXGPUInfoList.h rename to Rendering/OpenGL/vtkDirectXGPUInfoList.h diff --git a/Rendering/vtkDummyGPUInfoList.cxx b/Rendering/OpenGL/vtkDummyGPUInfoList.cxx similarity index 100% rename from Rendering/vtkDummyGPUInfoList.cxx rename to Rendering/OpenGL/vtkDummyGPUInfoList.cxx diff --git a/Rendering/vtkDummyGPUInfoList.h b/Rendering/OpenGL/vtkDummyGPUInfoList.h similarity index 100% rename from Rendering/vtkDummyGPUInfoList.h rename to Rendering/OpenGL/vtkDummyGPUInfoList.h diff --git a/Rendering/vtkFrameBufferObject.cxx b/Rendering/OpenGL/vtkFrameBufferObject.cxx similarity index 100% rename from Rendering/vtkFrameBufferObject.cxx rename to Rendering/OpenGL/vtkFrameBufferObject.cxx diff --git a/Rendering/vtkFrameBufferObject.h b/Rendering/OpenGL/vtkFrameBufferObject.h similarity index 100% rename from Rendering/vtkFrameBufferObject.h rename to Rendering/OpenGL/vtkFrameBufferObject.h diff --git a/Rendering/vtkGLSLShader.cxx b/Rendering/OpenGL/vtkGLSLShader.cxx similarity index 100% rename from Rendering/vtkGLSLShader.cxx rename to Rendering/OpenGL/vtkGLSLShader.cxx diff --git a/Rendering/vtkGLSLShader.h b/Rendering/OpenGL/vtkGLS