diff --git a/Rendering/Annotation/CMakeLists.txt b/Rendering/Annotation/CMakeLists.txt
index 076a64562bb631f5af7816b386f46413c391bafa..ac3743412331d4167c551c00792dcd5a53e25aa1 100644
--- a/Rendering/Annotation/CMakeLists.txt
+++ b/Rendering/Annotation/CMakeLists.txt
@@ -23,10 +23,6 @@ set(classes
   vtkRadialGridActor2D
   vtkScalarBarActor
   vtkSpiderPlotActor
-  vtkGridAxesActor3D
-  vtkGridAxesActor2D
-  vtkGridAxesHelper
-  vtkGridAxesPlaneActor2D
   vtkXYPlotActor)
 
 set(private_classes
diff --git a/Rendering/Annotation/Testing/Cxx/CMakeLists.txt b/Rendering/Annotation/Testing/Cxx/CMakeLists.txt
index 661d446230c684ca59ec3ceed5660652052df382..1df1ab89064cca5cf936f61587b8bccaaa388831 100644
--- a/Rendering/Annotation/Testing/Cxx/CMakeLists.txt
+++ b/Rendering/Annotation/Testing/Cxx/CMakeLists.txt
@@ -28,7 +28,6 @@ vtk_add_test_cxx(vtkRenderingAnnotationCxxTests tests
   TestCubeAxesWithZInnerPolys.cxx
   TestCubeAxesWithZLines.cxx
   TestEmptyCornerAnnotation.cxx
-  TestGridAxesActor3D.cxx
   TestLegendBoxActor.cxx
   TestLegendBoxActor2.cxx
   TestLegendScaleActor.cxx
diff --git a/Rendering/Annotation/vtk.module b/Rendering/Annotation/vtk.module
index 7ff726bf1055a59af29a953a27644ad3b240eca1..a2593d9038926f1294191e7d0f12acc27ce07370 100644
--- a/Rendering/Annotation/vtk.module
+++ b/Rendering/Annotation/vtk.module
@@ -11,7 +11,6 @@ SPDX_LICENSE_IDENTIFIER
 SPDX_COPYRIGHT_TEXT
   Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
 DEPENDS
-  VTK::ChartsCore
   VTK::CommonCore
   VTK::CommonDataModel
   VTK::CommonExecutionModel
diff --git a/Rendering/GridAxes/CMakeLists.txt b/Rendering/GridAxes/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5884f4c5d725f97b2c473c053e3d5e0097776238
--- /dev/null
+++ b/Rendering/GridAxes/CMakeLists.txt
@@ -0,0 +1,9 @@
+set(classes
+  vtkGridAxesActor3D
+  vtkGridAxesActor2D
+  vtkGridAxesHelper
+  vtkGridAxesPlaneActor2D)
+
+vtk_module_add_module(VTK::RenderingGridAxes
+  CLASSES ${classes})
+vtk_add_test_mangling(VTK::RenderingGridAxes)
diff --git a/Rendering/GridAxes/Testing/CMakeLists.txt b/Rendering/GridAxes/Testing/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0906ed4ff2a0a266c9f7f8096c729ae83074cba4
--- /dev/null
+++ b/Rendering/GridAxes/Testing/CMakeLists.txt
@@ -0,0 +1,3 @@
+if (NOT vtk_testing_cxx_disabled)
+  add_subdirectory(Cxx)
+endif ()
diff --git a/Rendering/GridAxes/Testing/Cxx/CMakeLists.txt b/Rendering/GridAxes/Testing/Cxx/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e83fed34124e1593b3c1447756dfe41aa9c5f992
--- /dev/null
+++ b/Rendering/GridAxes/Testing/Cxx/CMakeLists.txt
@@ -0,0 +1,8 @@
+vtk_add_test_cxx(vtkRenderingGridAxesCxxTests tests
+  TestGridAxesActor3D.cxx
+  )
+
+vtk_test_cxx_executable(vtkRenderingGridAxesCxxTests tests
+  DISABLE_FLOATING_POINT_EXCEPTIONS
+  RENDERING_FACTORY
+  )
diff --git a/Rendering/Annotation/Testing/Cxx/TestGridAxesActor3D.cxx b/Rendering/GridAxes/Testing/Cxx/TestGridAxesActor3D.cxx
similarity index 100%
rename from Rendering/Annotation/Testing/Cxx/TestGridAxesActor3D.cxx
rename to Rendering/GridAxes/Testing/Cxx/TestGridAxesActor3D.cxx
diff --git a/Rendering/GridAxes/Testing/Data/Baseline/TestGridAxesActor3D.png.sha512 b/Rendering/GridAxes/Testing/Data/Baseline/TestGridAxesActor3D.png.sha512
new file mode 100644
index 0000000000000000000000000000000000000000..151bc88688be711d2ab5e54606027b716ca8003b
--- /dev/null
+++ b/Rendering/GridAxes/Testing/Data/Baseline/TestGridAxesActor3D.png.sha512
@@ -0,0 +1 @@
+70e9ad194620080a3f194edf08a8b726af2d39f019b61169a66a07a7ff71024bfefa9b0919dac0924e637169564ef0d11d50c31c0e318e72b3df9e2ca459d433
diff --git a/Rendering/GridAxes/vtk.module b/Rendering/GridAxes/vtk.module
new file mode 100644
index 0000000000000000000000000000000000000000..a94d5bfc5b84c7b37ae8d915c1f1df8cbd0ff59e
--- /dev/null
+++ b/Rendering/GridAxes/vtk.module
@@ -0,0 +1,33 @@
+NAME
+  VTK::RenderingGridAxes
+LIBRARY_NAME
+  vtkRenderingGridAxes
+GROUPS
+  Rendering
+SPDX_LICENSE_IDENTIFIER
+  BSD-3-Clause
+SPDX_COPYRIGHT_TEXT
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+DEPENDS
+  VTK::ChartsCore
+  VTK::CommonCore
+  VTK::CommonDataModel
+  VTK::CommonExecutionModel
+  VTK::RenderingCore
+  VTK::RenderingContext2D
+PRIVATE_DEPENDS
+  VTK::CommonMath
+  VTK::FiltersCore
+  VTK::FiltersGeneral
+  VTK::FiltersSources
+  VTK::ImagingColor
+TEST_DEPENDS
+  VTK::FiltersCore
+  VTK::FiltersModeling
+  VTK::IOGeometry
+  VTK::ImagingCore
+  VTK::InteractionStyle
+  VTK::RenderingLOD
+  VTK::RenderingOpenGL2
+  VTK::TestingRendering
+INCLUDE_MARSHAL
diff --git a/Rendering/Annotation/vtkGridAxesActor2D.cxx b/Rendering/GridAxes/vtkGridAxesActor2D.cxx
similarity index 99%
rename from Rendering/Annotation/vtkGridAxesActor2D.cxx
rename to Rendering/GridAxes/vtkGridAxesActor2D.cxx
index 3e8b63f7cbf4d1d6b6392c5e77b6fa85311ae832..2437c7cec8b6fb398513ff7821523d0289a3031a 100644
--- a/Rendering/Annotation/vtkGridAxesActor2D.cxx
+++ b/Rendering/GridAxes/vtkGridAxesActor2D.cxx
@@ -15,7 +15,6 @@
 #include "vtkRenderer.h"
 #include "vtkStringArray.h"
 #include "vtkTextProperty.h"
-#include "vtkVectorOperators.h"
 
 #include <algorithm>
 #include <vector>
diff --git a/Rendering/Annotation/vtkGridAxesActor2D.h b/Rendering/GridAxes/vtkGridAxesActor2D.h
similarity index 98%
rename from Rendering/Annotation/vtkGridAxesActor2D.h
rename to Rendering/GridAxes/vtkGridAxesActor2D.h
index fe12169a023500ac05d063a9aaf5304b4b386600..08ee8fa416bfdd42b27dd7835465017f50426568 100644
--- a/Rendering/Annotation/vtkGridAxesActor2D.h
+++ b/Rendering/GridAxes/vtkGridAxesActor2D.h
@@ -21,7 +21,7 @@
 #define vtkGridAxesActor2D_h
 
 #include "vtkProp3D.h"
-#include "vtkRenderingAnnotationModule.h" //needed for exports
+#include "vtkRenderingGridAxesModule.h" //needed for exports
 
 #include "vtkGridAxesHelper.h"       // needed of Helper
 #include "vtkGridAxesPlaneActor2D.h" // needed for inline methods
@@ -36,7 +36,7 @@ class vtkDoubleArray;
 class vtkProperty;
 class vtkTextProperty;
 
-class VTKRENDERINGANNOTATION_EXPORT vtkGridAxesActor2D : public vtkProp3D
+class VTKRENDERINGGRIDAXES_EXPORT vtkGridAxesActor2D : public vtkProp3D
 {
 public:
   static vtkGridAxesActor2D* New();
diff --git a/Rendering/Annotation/vtkGridAxesActor3D.cxx b/Rendering/GridAxes/vtkGridAxesActor3D.cxx
similarity index 99%
rename from Rendering/Annotation/vtkGridAxesActor3D.cxx
rename to Rendering/GridAxes/vtkGridAxesActor3D.cxx
index 5fbaf4ca6ff878fc1af1de4279e3d33824a0ad91..7c0970c901d45e41817482ed84387fcb4e12be58 100644
--- a/Rendering/Annotation/vtkGridAxesActor3D.cxx
+++ b/Rendering/GridAxes/vtkGridAxesActor3D.cxx
@@ -11,7 +11,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkRenderWindow.h"
 #include "vtkRenderer.h"
-#include "vtkVectorOperators.h"
 
 #include <algorithm>
 #include <map>
diff --git a/Rendering/Annotation/vtkGridAxesActor3D.h b/Rendering/GridAxes/vtkGridAxesActor3D.h
similarity index 98%
rename from Rendering/Annotation/vtkGridAxesActor3D.h
rename to Rendering/GridAxes/vtkGridAxesActor3D.h
index a1ae7579a71392eb68b5a2e03c1c0f9b3aa465c6..1bb8f79e26c6e3b9fd2577cb29e7137a5059a92c 100644
--- a/Rendering/Annotation/vtkGridAxesActor3D.h
+++ b/Rendering/GridAxes/vtkGridAxesActor3D.h
@@ -15,7 +15,7 @@
 #define vtkGridAxesActor3D_h
 
 #include "vtkProp3D.h"
-#include "vtkRenderingAnnotationModule.h" //needed for exports
+#include "vtkRenderingGridAxesModule.h" //needed for exports
 
 #include "vtkGridAxesHelper.h" //  needed for vtkGridAxesHelper.
 #include "vtkNew.h"            // needed for vtkNew.
@@ -27,7 +27,7 @@ class vtkGridAxesActor2D;
 class vtkProperty;
 class vtkTextProperty;
 
-class VTKRENDERINGANNOTATION_EXPORT vtkGridAxesActor3D : public vtkProp3D
+class VTKRENDERINGGRIDAXES_EXPORT vtkGridAxesActor3D : public vtkProp3D
 {
 public:
   static vtkGridAxesActor3D* New();
diff --git a/Rendering/Annotation/vtkGridAxesHelper.cxx b/Rendering/GridAxes/vtkGridAxesHelper.cxx
similarity index 99%
rename from Rendering/Annotation/vtkGridAxesHelper.cxx
rename to Rendering/GridAxes/vtkGridAxesHelper.cxx
index 67dc27fb0d8c210d12eab4553ca27b5b6154b65b..5f92c156fcf12ed4fc4d4ae7c37e3845b5ef835d 100644
--- a/Rendering/Annotation/vtkGridAxesHelper.cxx
+++ b/Rendering/GridAxes/vtkGridAxesHelper.cxx
@@ -11,7 +11,7 @@
 #include "vtkNew.h"
 #include "vtkObjectFactory.h"
 #include "vtkRenderer.h"
-#include "vtkVectorOperators.h"
+#include "vtkVector.h"
 
 #include <algorithm>
 
diff --git a/Rendering/Annotation/vtkGridAxesHelper.h b/Rendering/GridAxes/vtkGridAxesHelper.h
similarity index 96%
rename from Rendering/Annotation/vtkGridAxesHelper.h
rename to Rendering/GridAxes/vtkGridAxesHelper.h
index 9e89b84bea8d9006fdadd2c420750fbf650dcb1b..fcf2f0e78c3039a93f6a85d66a5dccfed0337555 100644
--- a/Rendering/Annotation/vtkGridAxesHelper.h
+++ b/Rendering/GridAxes/vtkGridAxesHelper.h
@@ -18,13 +18,13 @@
 
 #include "vtkObject.h"
 
-#include "vtkRenderingAnnotationModule.h" //needed for exports
-#include "vtkVector.h"                    // needed for vtkVector.
+#include "vtkRenderingGridAxesModule.h" //needed for exports
+#include "vtkVector.h"                  // needed for vtkVector.
 
 class vtkMatrix4x4;
 class vtkViewport;
 
-class VTKRENDERINGANNOTATION_EXPORT vtkGridAxesHelper : public vtkObject
+class VTKRENDERINGGRIDAXES_EXPORT vtkGridAxesHelper : public vtkObject
 {
 public:
   static vtkGridAxesHelper* New();
diff --git a/Rendering/Annotation/vtkGridAxesPlaneActor2D.cxx b/Rendering/GridAxes/vtkGridAxesPlaneActor2D.cxx
similarity index 99%
rename from Rendering/Annotation/vtkGridAxesPlaneActor2D.cxx
rename to Rendering/GridAxes/vtkGridAxesPlaneActor2D.cxx
index a7543d049d931488fe2eda9bf14294ef42e5a21b..9cabd90d782a7c2c1be619e0c0168dd20fea54d3 100644
--- a/Rendering/Annotation/vtkGridAxesPlaneActor2D.cxx
+++ b/Rendering/GridAxes/vtkGridAxesPlaneActor2D.cxx
@@ -15,7 +15,6 @@
 #include "vtkPolyDataMapper.h"
 #include "vtkProperty.h"
 #include "vtkRenderer.h"
-#include "vtkVectorOperators.h"
 #include "vtkWindow.h"
 
 #include <algorithm>
diff --git a/Rendering/Annotation/vtkGridAxesPlaneActor2D.h b/Rendering/GridAxes/vtkGridAxesPlaneActor2D.h
similarity index 97%
rename from Rendering/Annotation/vtkGridAxesPlaneActor2D.h
rename to Rendering/GridAxes/vtkGridAxesPlaneActor2D.h
index 00c07b568b8fe0187e63b534c5a8401fd479f647..f56e0b5744f46a891cc778bcc82ad7ac84ed564f 100644
--- a/Rendering/Annotation/vtkGridAxesPlaneActor2D.h
+++ b/Rendering/GridAxes/vtkGridAxesPlaneActor2D.h
@@ -14,7 +14,7 @@
 #define vtkGridAxesPlaneActor2D_h
 
 #include "vtkProp3D.h"
-#include "vtkRenderingAnnotationModule.h" //needed for exports
+#include "vtkRenderingGridAxesModule.h" //needed for exports
 
 #include "vtkGridAxesHelper.h" // For face enumeration
 #include "vtkNew.h"            // For member variables
@@ -29,7 +29,7 @@ class vtkPolyData;
 class vtkPolyDataMapper;
 class vtkProperty;
 
-class VTKRENDERINGANNOTATION_EXPORT vtkGridAxesPlaneActor2D : public vtkProp3D
+class VTKRENDERINGGRIDAXES_EXPORT vtkGridAxesPlaneActor2D : public vtkProp3D
 {
 public:
   static vtkGridAxesPlaneActor2D* New();