diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ff92ba3bb..f505e72bf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,8 +11,8 @@
 
 include_directories(
     "${CMAKE_CURRENT_SOURCE_DIR}/accessor"
-    "${CMAKE_CURRENT_SOURCE_DIR}/geo_iterator"
-    "${CMAKE_CURRENT_SOURCE_DIR}/geo_nearest"
+    "${CMAKE_CURRENT_SOURCE_DIR}/geo/iterator"
+    "${CMAKE_CURRENT_SOURCE_DIR}/geo/nearest"
     )
 
 list( APPEND eccodes_src_files
@@ -262,7 +262,7 @@ list( APPEND eccodes_src_files
     accessor/grib_accessor_class_sexagesimal2decimal.cc
     accessor/grib_accessor_class_vector.cc
     accessor/grib_accessor_class_long_vector.cc
-    grib_gaussian_reduced.cc
+    geo/grib_gaussian_reduced.cc
     accessor/grib_accessor_class_abstract_vector.cc
     accessor/grib_accessor_class_abstract_long_vector.cc
     grib_loader_from_handle.cc
@@ -293,7 +293,7 @@ list( APPEND eccodes_src_files
     grib_date.cc
     grib_fieldset.cc
     grib_filepool.cc
-    grib_geography.cc
+    geo/grib_geography.cc
     grib_handle.cc
     grib_hash_keys.cc
     grib_io.cc
@@ -331,32 +331,32 @@ list( APPEND eccodes_src_files
     expression/grib_expression_class_string.cc
     expression/grib_expression_class_sub_string.cc
 
-    geo_nearest/grib_nearest.cc
-    geo_nearest/grib_nearest_class_gen.cc
-    geo_nearest/grib_nearest_class_healpix.cc
-    geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
-    geo_nearest/grib_nearest_class_lambert_conformal.cc
-    geo_nearest/grib_nearest_class_latlon_reduced.cc
-    geo_nearest/grib_nearest_class_mercator.cc
-    geo_nearest/grib_nearest_class_polar_stereographic.cc
-    geo_nearest/grib_nearest_class_reduced.cc
-    geo_nearest/grib_nearest_class_regular.cc
-    geo_nearest/grib_nearest_class_space_view.cc
+    geo/nearest/grib_nearest.cc
+    geo/nearest/grib_nearest_class_gen.cc
+    geo/nearest/grib_nearest_class_healpix.cc
+    geo/nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
+    geo/nearest/grib_nearest_class_lambert_conformal.cc
+    geo/nearest/grib_nearest_class_latlon_reduced.cc
+    geo/nearest/grib_nearest_class_mercator.cc
+    geo/nearest/grib_nearest_class_polar_stereographic.cc
+    geo/nearest/grib_nearest_class_reduced.cc
+    geo/nearest/grib_nearest_class_regular.cc
+    geo/nearest/grib_nearest_class_space_view.cc
 
-    geo_iterator/grib_iterator.cc
-    geo_iterator/grib_iterator_class_gaussian.cc
-    geo_iterator/grib_iterator_class_gaussian_reduced.cc
-    geo_iterator/grib_iterator_class_gen.cc
-    geo_iterator/grib_iterator_class_healpix.cc
-    geo_iterator/grib_iterator_class_lambert_azimuthal_equal_area.cc
-    geo_iterator/grib_iterator_class_lambert_conformal.cc
-    geo_iterator/grib_iterator_class_latlon.cc
-    geo_iterator/grib_iterator_class_latlon_reduced.cc
-    geo_iterator/grib_iterator_class_mercator.cc
-    geo_iterator/grib_iterator_class_polar_stereographic.cc
-    geo_iterator/grib_iterator_class_regular.cc
-    geo_iterator/grib_iterator_class_space_view.cc
-    geo_iterator/grib_iterator_class_unstructured.cc
+    geo/iterator/grib_iterator.cc
+    geo/iterator/grib_iterator_class_gaussian.cc
+    geo/iterator/grib_iterator_class_gaussian_reduced.cc
+    geo/iterator/grib_iterator_class_gen.cc
+    geo/iterator/grib_iterator_class_healpix.cc
+    geo/iterator/grib_iterator_class_lambert_azimuthal_equal_area.cc
+    geo/iterator/grib_iterator_class_lambert_conformal.cc
+    geo/iterator/grib_iterator_class_latlon.cc
+    geo/iterator/grib_iterator_class_latlon_reduced.cc
+    geo/iterator/grib_iterator_class_mercator.cc
+    geo/iterator/grib_iterator_class_polar_stereographic.cc
+    geo/iterator/grib_iterator_class_regular.cc
+    geo/iterator/grib_iterator_class_space_view.cc
+    geo/iterator/grib_iterator_class_unstructured.cc
 
     codes_util.cc
     grib_util.cc
@@ -419,10 +419,10 @@ endif()
 
 if( eccodes_HAVE_GEOGRAPHY AND eccodes_HAVE_ECKIT_GEO )
     list( APPEND eccodes_src_files
-        eccodes/geo/GeoIterator.cc
-        eccodes/geo/GeoIterator.h
-        eccodes/geo/GribSpec.cc
-        eccodes/geo/GribSpec.h )
+        geo/GeoIterator.cc
+        geo/GeoIterator.h
+        geo/GribSpec.cc
+        geo/GribSpec.h )
     list( APPEND ECCODES_EXTRA_LIBRARIES eckit_geo )
 endif()
 
diff --git a/src/accessor/grib_accessor_class_iterator.h b/src/accessor/grib_accessor_class_iterator.h
index aa3a4017f..784902a0d 100644
--- a/src/accessor/grib_accessor_class_iterator.h
+++ b/src/accessor/grib_accessor_class_iterator.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "grib_accessor_class_gen.h"
-#include "geo_iterator/grib_iterator.h"
+#include "geo/iterator/grib_iterator.h"
 
 class grib_accessor_iterator_t : public grib_accessor_gen_t
 {
diff --git a/src/accessor/grib_accessor_class_nearest.h b/src/accessor/grib_accessor_class_nearest.h
index 15ed88e73..47ce6bf77 100644
--- a/src/accessor/grib_accessor_class_nearest.h
+++ b/src/accessor/grib_accessor_class_nearest.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "grib_accessor_class_gen.h"
-#include "geo_nearest/grib_nearest.h"
+#include "geo/nearest/grib_nearest.h"
 
 class grib_accessor_nearest_t : public grib_accessor_gen_t
 {
diff --git a/src/eccodes/geo/GeoIterator.cc b/src/geo/GeoIterator.cc
similarity index 96%
rename from src/eccodes/geo/GeoIterator.cc
rename to src/geo/GeoIterator.cc
index f20af7bab..89e465fa0 100644
--- a/src/eccodes/geo/GeoIterator.cc
+++ b/src/geo/GeoIterator.cc
@@ -9,11 +9,11 @@
  */
 
 
-#include "eccodes/geo/GeoIterator.h"
+#include "geo/GeoIterator.h"
 
 #include "eckit/exception/Exceptions.h"
 
-#include "eccodes/geo/GribSpec.h"
+#include "geo/GribSpec.h"
 
 
 namespace eccodes::geo
diff --git a/src/eccodes/geo/GeoIterator.h b/src/geo/GeoIterator.h
similarity index 96%
rename from src/eccodes/geo/GeoIterator.h
rename to src/geo/GeoIterator.h
index 312b0357c..fefc5aca5 100644
--- a/src/eccodes/geo/GeoIterator.h
+++ b/src/geo/GeoIterator.h
@@ -20,7 +20,7 @@
     #undef Assert
 #endif
 
-#include "geo_iterator/grib_iterator.h"
+#include "geo/iterator/grib_iterator.h"
 
 
 namespace eccodes::geo
diff --git a/src/eccodes/geo/GribSpec.cc b/src/geo/GribSpec.cc
similarity index 99%
rename from src/eccodes/geo/GribSpec.cc
rename to src/geo/GribSpec.cc
index f4ece0dd6..b1bfbfbab 100644
--- a/src/eccodes/geo/GribSpec.cc
+++ b/src/geo/GribSpec.cc
@@ -10,7 +10,7 @@
  */
 
 
-#include "eccodes/geo/GribSpec.h"
+#include "geo/GribSpec.h"
 
 #include <algorithm>
 #include <cstring>
diff --git a/src/eccodes/geo/GribSpec.h b/src/geo/GribSpec.h
similarity index 100%
rename from src/eccodes/geo/GribSpec.h
rename to src/geo/GribSpec.h
diff --git a/src/grib_gaussian_N1280.h b/src/geo/grib_gaussian_N1280.h
similarity index 100%
rename from src/grib_gaussian_N1280.h
rename to src/geo/grib_gaussian_N1280.h
diff --git a/src/grib_gaussian_N640.h b/src/geo/grib_gaussian_N640.h
similarity index 100%
rename from src/grib_gaussian_N640.h
rename to src/geo/grib_gaussian_N640.h
diff --git a/src/grib_gaussian_reduced.cc b/src/geo/grib_gaussian_reduced.cc
similarity index 100%
rename from src/grib_gaussian_reduced.cc
rename to src/geo/grib_gaussian_reduced.cc
diff --git a/src/grib_geography.cc b/src/geo/grib_geography.cc
similarity index 100%
rename from src/grib_geography.cc
rename to src/geo/grib_geography.cc
diff --git a/src/geo_iterator/grib_iterator.cc b/src/geo/iterator/grib_iterator.cc
similarity index 99%
rename from src/geo_iterator/grib_iterator.cc
rename to src/geo/iterator/grib_iterator.cc
index cc3187c75..711f840c3 100644
--- a/src/geo_iterator/grib_iterator.cc
+++ b/src/geo/iterator/grib_iterator.cc
@@ -17,7 +17,7 @@
 #if defined(HAVE_ECKIT_GEO)
     #include "eckit/runtime/Main.h"
 
-    #include "eccodes/geo/GeoIterator.h"
+    #include "geo/GeoIterator.h"
 
     // eccodes macros conflict with eckit
     #ifdef Assert
diff --git a/src/geo_iterator/grib_iterator.h b/src/geo/iterator/grib_iterator.h
similarity index 100%
rename from src/geo_iterator/grib_iterator.h
rename to src/geo/iterator/grib_iterator.h
diff --git a/src/geo_iterator/grib_iterator_class_gaussian.cc b/src/geo/iterator/grib_iterator_class_gaussian.cc
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_gaussian.cc
rename to src/geo/iterator/grib_iterator_class_gaussian.cc
diff --git a/src/geo_iterator/grib_iterator_class_gaussian.h b/src/geo/iterator/grib_iterator_class_gaussian.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_gaussian.h
rename to src/geo/iterator/grib_iterator_class_gaussian.h
diff --git a/src/geo_iterator/grib_iterator_class_gaussian_reduced.cc b/src/geo/iterator/grib_iterator_class_gaussian_reduced.cc
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_gaussian_reduced.cc
rename to src/geo/iterator/grib_iterator_class_gaussian_reduced.cc
diff --git a/src/geo_iterator/grib_iterator_class_gaussian_reduced.h b/src/geo/iterator/grib_iterator_class_gaussian_reduced.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_gaussian_reduced.h
rename to src/geo/iterator/grib_iterator_class_gaussian_reduced.h
diff --git a/src/geo_iterator/grib_iterator_class_gen.cc b/src/geo/iterator/grib_iterator_class_gen.cc
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_gen.cc
rename to src/geo/iterator/grib_iterator_class_gen.cc
diff --git a/src/geo_iterator/grib_iterator_class_gen.h b/src/geo/iterator/grib_iterator_class_gen.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_gen.h
rename to src/geo/iterator/grib_iterator_class_gen.h
diff --git a/src/geo_iterator/grib_iterator_class_healpix.cc b/src/geo/iterator/grib_iterator_class_healpix.cc
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_healpix.cc
rename to src/geo/iterator/grib_iterator_class_healpix.cc
diff --git a/src/geo_iterator/grib_iterator_class_healpix.h b/src/geo/iterator/grib_iterator_class_healpix.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_healpix.h
rename to src/geo/iterator/grib_iterator_class_healpix.h
diff --git a/src/geo_iterator/grib_iterator_class_lambert_azimuthal_equal_area.cc b/src/geo/iterator/grib_iterator_class_lambert_azimuthal_equal_area.cc
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_lambert_azimuthal_equal_area.cc
rename to src/geo/iterator/grib_iterator_class_lambert_azimuthal_equal_area.cc
diff --git a/src/geo_iterator/grib_iterator_class_lambert_azimuthal_equal_area.h b/src/geo/iterator/grib_iterator_class_lambert_azimuthal_equal_area.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_lambert_azimuthal_equal_area.h
rename to src/geo/iterator/grib_iterator_class_lambert_azimuthal_equal_area.h
diff --git a/src/geo_iterator/grib_iterator_class_lambert_conformal.cc b/src/geo/iterator/grib_iterator_class_lambert_conformal.cc
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_lambert_conformal.cc
rename to src/geo/iterator/grib_iterator_class_lambert_conformal.cc
diff --git a/src/geo_iterator/grib_iterator_class_lambert_conformal.h b/src/geo/iterator/grib_iterator_class_lambert_conformal.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_lambert_conformal.h
rename to src/geo/iterator/grib_iterator_class_lambert_conformal.h
diff --git a/src/geo_iterator/grib_iterator_class_latlon.cc b/src/geo/iterator/grib_iterator_class_latlon.cc
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_latlon.cc
rename to src/geo/iterator/grib_iterator_class_latlon.cc
diff --git a/src/geo_iterator/grib_iterator_class_latlon.h b/src/geo/iterator/grib_iterator_class_latlon.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_latlon.h
rename to src/geo/iterator/grib_iterator_class_latlon.h
diff --git a/src/geo_iterator/grib_iterator_class_latlon_reduced.cc b/src/geo/iterator/grib_iterator_class_latlon_reduced.cc
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_latlon_reduced.cc
rename to src/geo/iterator/grib_iterator_class_latlon_reduced.cc
diff --git a/src/geo_iterator/grib_iterator_class_latlon_reduced.h b/src/geo/iterator/grib_iterator_class_latlon_reduced.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_latlon_reduced.h
rename to src/geo/iterator/grib_iterator_class_latlon_reduced.h
diff --git a/src/geo_iterator/grib_iterator_class_mercator.cc b/src/geo/iterator/grib_iterator_class_mercator.cc
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_mercator.cc
rename to src/geo/iterator/grib_iterator_class_mercator.cc
diff --git a/src/geo_iterator/grib_iterator_class_mercator.h b/src/geo/iterator/grib_iterator_class_mercator.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_mercator.h
rename to src/geo/iterator/grib_iterator_class_mercator.h
diff --git a/src/geo_iterator/grib_iterator_class_polar_stereographic.cc b/src/geo/iterator/grib_iterator_class_polar_stereographic.cc
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_polar_stereographic.cc
rename to src/geo/iterator/grib_iterator_class_polar_stereographic.cc
diff --git a/src/geo_iterator/grib_iterator_class_polar_stereographic.h b/src/geo/iterator/grib_iterator_class_polar_stereographic.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_polar_stereographic.h
rename to src/geo/iterator/grib_iterator_class_polar_stereographic.h
diff --git a/src/geo_iterator/grib_iterator_class_regular.cc b/src/geo/iterator/grib_iterator_class_regular.cc
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_regular.cc
rename to src/geo/iterator/grib_iterator_class_regular.cc
diff --git a/src/geo_iterator/grib_iterator_class_regular.h b/src/geo/iterator/grib_iterator_class_regular.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_regular.h
rename to src/geo/iterator/grib_iterator_class_regular.h
diff --git a/src/geo_iterator/grib_iterator_class_space_view.cc b/src/geo/iterator/grib_iterator_class_space_view.cc
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_space_view.cc
rename to src/geo/iterator/grib_iterator_class_space_view.cc
diff --git a/src/geo_iterator/grib_iterator_class_space_view.h b/src/geo/iterator/grib_iterator_class_space_view.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_space_view.h
rename to src/geo/iterator/grib_iterator_class_space_view.h
diff --git a/src/geo_iterator/grib_iterator_class_unstructured.cc b/src/geo/iterator/grib_iterator_class_unstructured.cc
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_unstructured.cc
rename to src/geo/iterator/grib_iterator_class_unstructured.cc
diff --git a/src/geo_iterator/grib_iterator_class_unstructured.h b/src/geo/iterator/grib_iterator_class_unstructured.h
similarity index 100%
rename from src/geo_iterator/grib_iterator_class_unstructured.h
rename to src/geo/iterator/grib_iterator_class_unstructured.h
diff --git a/src/geo_nearest/grib_nearest.cc b/src/geo/nearest/grib_nearest.cc
similarity index 100%
rename from src/geo_nearest/grib_nearest.cc
rename to src/geo/nearest/grib_nearest.cc
diff --git a/src/geo_nearest/grib_nearest.h b/src/geo/nearest/grib_nearest.h
similarity index 100%
rename from src/geo_nearest/grib_nearest.h
rename to src/geo/nearest/grib_nearest.h
diff --git a/src/geo_nearest/grib_nearest_class_gen.cc b/src/geo/nearest/grib_nearest_class_gen.cc
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_gen.cc
rename to src/geo/nearest/grib_nearest_class_gen.cc
diff --git a/src/geo_nearest/grib_nearest_class_gen.h b/src/geo/nearest/grib_nearest_class_gen.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_gen.h
rename to src/geo/nearest/grib_nearest_class_gen.h
diff --git a/src/geo_nearest/grib_nearest_class_healpix.cc b/src/geo/nearest/grib_nearest_class_healpix.cc
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_healpix.cc
rename to src/geo/nearest/grib_nearest_class_healpix.cc
diff --git a/src/geo_nearest/grib_nearest_class_healpix.h b/src/geo/nearest/grib_nearest_class_healpix.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_healpix.h
rename to src/geo/nearest/grib_nearest_class_healpix.h
diff --git a/src/geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc b/src/geo/nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
rename to src/geo/nearest/grib_nearest_class_lambert_azimuthal_equal_area.cc
diff --git a/src/geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.h b/src/geo/nearest/grib_nearest_class_lambert_azimuthal_equal_area.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_lambert_azimuthal_equal_area.h
rename to src/geo/nearest/grib_nearest_class_lambert_azimuthal_equal_area.h
diff --git a/src/geo_nearest/grib_nearest_class_lambert_conformal.cc b/src/geo/nearest/grib_nearest_class_lambert_conformal.cc
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_lambert_conformal.cc
rename to src/geo/nearest/grib_nearest_class_lambert_conformal.cc
diff --git a/src/geo_nearest/grib_nearest_class_lambert_conformal.h b/src/geo/nearest/grib_nearest_class_lambert_conformal.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_lambert_conformal.h
rename to src/geo/nearest/grib_nearest_class_lambert_conformal.h
diff --git a/src/geo_nearest/grib_nearest_class_latlon_reduced.cc b/src/geo/nearest/grib_nearest_class_latlon_reduced.cc
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_latlon_reduced.cc
rename to src/geo/nearest/grib_nearest_class_latlon_reduced.cc
diff --git a/src/geo_nearest/grib_nearest_class_latlon_reduced.h b/src/geo/nearest/grib_nearest_class_latlon_reduced.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_latlon_reduced.h
rename to src/geo/nearest/grib_nearest_class_latlon_reduced.h
diff --git a/src/geo_nearest/grib_nearest_class_mercator.cc b/src/geo/nearest/grib_nearest_class_mercator.cc
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_mercator.cc
rename to src/geo/nearest/grib_nearest_class_mercator.cc
diff --git a/src/geo_nearest/grib_nearest_class_mercator.h b/src/geo/nearest/grib_nearest_class_mercator.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_mercator.h
rename to src/geo/nearest/grib_nearest_class_mercator.h
diff --git a/src/geo_nearest/grib_nearest_class_polar_stereographic.cc b/src/geo/nearest/grib_nearest_class_polar_stereographic.cc
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_polar_stereographic.cc
rename to src/geo/nearest/grib_nearest_class_polar_stereographic.cc
diff --git a/src/geo_nearest/grib_nearest_class_polar_stereographic.h b/src/geo/nearest/grib_nearest_class_polar_stereographic.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_polar_stereographic.h
rename to src/geo/nearest/grib_nearest_class_polar_stereographic.h
diff --git a/src/geo_nearest/grib_nearest_class_reduced.cc b/src/geo/nearest/grib_nearest_class_reduced.cc
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_reduced.cc
rename to src/geo/nearest/grib_nearest_class_reduced.cc
diff --git a/src/geo_nearest/grib_nearest_class_reduced.h b/src/geo/nearest/grib_nearest_class_reduced.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_reduced.h
rename to src/geo/nearest/grib_nearest_class_reduced.h
diff --git a/src/geo_nearest/grib_nearest_class_regular.cc b/src/geo/nearest/grib_nearest_class_regular.cc
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_regular.cc
rename to src/geo/nearest/grib_nearest_class_regular.cc
diff --git a/src/geo_nearest/grib_nearest_class_regular.h b/src/geo/nearest/grib_nearest_class_regular.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_regular.h
rename to src/geo/nearest/grib_nearest_class_regular.h
diff --git a/src/geo_nearest/grib_nearest_class_space_view.cc b/src/geo/nearest/grib_nearest_class_space_view.cc
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_space_view.cc
rename to src/geo/nearest/grib_nearest_class_space_view.cc
diff --git a/src/geo_nearest/grib_nearest_class_space_view.h b/src/geo/nearest/grib_nearest_class_space_view.h
similarity index 100%
rename from src/geo_nearest/grib_nearest_class_space_view.h
rename to src/geo/nearest/grib_nearest_class_space_view.h
diff --git a/src/grib_api_internal.h b/src/grib_api_internal.h
index 5f912a661..29aee16d8 100644
--- a/src/grib_api_internal.h
+++ b/src/grib_api_internal.h
@@ -1234,8 +1234,8 @@ typedef struct j2k_encode_helper
 }
     #include "accessor/grib_accessor.h"
     #include "accessor/grib_accessors_list.h"
-    #include "geo_iterator/grib_iterator.h"
-    #include "geo_nearest/grib_nearest.h"
+    #include "geo/iterator/grib_iterator.h"
+    #include "geo/nearest/grib_nearest.h"
     #include "expression/grib_expression.h"
     #include "expression/grib_arguments.h"
 #endif
diff --git a/src/grib_iterator_factory.h b/src/grib_iterator_factory.h
index b45f6cfe0..086734823 100644
--- a/src/grib_iterator_factory.h
+++ b/src/grib_iterator_factory.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "grib_api_internal.h"
-#include "geo_iterator/grib_iterator.h"
+#include "geo/iterator/grib_iterator.h"
 
 extern eccodes::geo_iterator::Iterator* grib_iterator_gaussian;
 extern eccodes::geo_iterator::Iterator* grib_iterator_gaussian_reduced;
diff --git a/src/grib_nearest_factory.h b/src/grib_nearest_factory.h
index 658abff30..f3831b437 100644
--- a/src/grib_nearest_factory.h
+++ b/src/grib_nearest_factory.h
@@ -11,7 +11,7 @@
 #pragma once
 
 #include "grib_api_internal.h"
-#include "geo_nearest/grib_nearest.h"
+#include "geo/nearest/grib_nearest.h"
 
 extern eccodes::geo_nearest::Nearest* grib_nearest_healpix;
 extern eccodes::geo_nearest::Nearest* grib_nearest_lambert_azimuthal_equal_area;