diff --git a/.clang-format-ignore b/.clang-format-ignore
index 0da982561..ab5d63912 100644
--- a/.clang-format-ignore
+++ b/.clang-format-ignore
@@ -9,13 +9,14 @@
 #   after the next
 # - No new files should be added to this list
 
-src/clib/c_wrappers/wrap_interpolators_g.c
+src/clib/api/calculate_cooling_time.cpp
+src/clib/api/calculate_dust_temperature.cpp
+src/clib/api/calculate_gamma.cpp
+src/clib/api/calculate_pressure.cpp
+src/clib/api/calculate_temperature.cpp
+src/clib/api/set_default_chemistry_parameters.cpp
+src/clib/api/solve_chemistry.cpp
 src/clib/calc_tdust_3d.cpp
-src/clib/calculate_cooling_time.cpp
-src/clib/calculate_dust_temperature.cpp
-src/clib/calculate_gamma.cpp
-src/clib/calculate_pressure.cpp
-src/clib/calculate_temperature.cpp
 src/clib/chemistry_solver_funcs.hpp
 src/clib/cie_thin_cooling_rate_tables.h
 src/clib/cool1d_multi_g-cpp.C
@@ -40,8 +41,6 @@ src/clib/interp_table_utils.h
 src/clib/interpolate.hpp
 src/clib/phys_constants.h
 src/clib/rate_functions.c
-src/clib/set_default_chemistry_parameters.cpp
-src/clib/solve_chemistry.cpp
 src/clib/solve_rate_cool_g-cpp.cpp
 src/clib/status_reporting.c
 src/clib/status_reporting.h
diff --git a/src/clib/CMakeLists.txt b/src/clib/CMakeLists.txt
index 06512f604..bf8576163 100644
--- a/src/clib/CMakeLists.txt
+++ b/src/clib/CMakeLists.txt
@@ -97,13 +97,15 @@ add_library(Grackle_Grackle
   auto_general.h
 
   # C++ Source (and Private Header Files)
+  api/calculate_cooling_time.cpp
+  api/calculate_dust_temperature.cpp
+  api/calculate_gamma.cpp
+  api/calculate_pressure.cpp
+  api/calculate_temperature.cpp
+  api/set_default_chemistry_parameters.cpp
+  api/solve_chemistry.cpp
   calc_tdust_3d.cpp calc_tdust_3d.h
   calc_temp_cloudy_g.cpp calc_temp_cloudy_g.h
-  calculate_cooling_time.cpp
-  calculate_dust_temperature.cpp
-  calculate_gamma.cpp
-  calculate_pressure.cpp
-  calculate_temperature.cpp
   ceiling_species.hpp
   collisional_rate_props.cpp collisional_rate_props.hpp
   cool1d_multi_g.cpp cool1d_multi_g.hpp
@@ -120,9 +122,7 @@ add_library(Grackle_Grackle
   make_consistent.cpp make_consistent.hpp
   opaque_storage.hpp
   rate_utils.cpp
-  solve_chemistry.cpp
   scale_fields.cpp scale_fields.hpp
-  set_default_chemistry_parameters.cpp
   solve_rate_cool_g-cpp.cpp solve_rate_cool_g-cpp.h
   step_rate_gauss_seidel.hpp
   step_rate_newton_raphson.hpp
diff --git a/src/clib/Make.config.objects b/src/clib/Make.config.objects
index 7a4bb87af..d51f8bc72 100644
--- a/src/clib/Make.config.objects
+++ b/src/clib/Make.config.objects
@@ -13,11 +13,13 @@
 
 OBJS_CONFIG_LIB = \
         $(AUTOGEN_DIR)/auto_general.lo \
-        calculate_cooling_time.lo \
-        calculate_dust_temperature.lo \
-        calculate_gamma.lo \
-        calculate_pressure.lo \
-        calculate_temperature.lo \
+        api/calculate_cooling_time.lo \
+        api/calculate_dust_temperature.lo \
+        api/calculate_gamma.lo \
+        api/calculate_pressure.lo \
+        api/calculate_temperature.lo \
+        api/set_default_chemistry_parameters.lo \
+        api/solve_chemistry.lo \
         calc_temp1d_cloudy_g.lo \
         calc_temp_cloudy_g.lo \
         collisional_rate_props.lo \
@@ -38,8 +40,6 @@ OBJS_CONFIG_LIB = \
         interpolators_g.lo \
         make_consistent.lo \
         scale_fields.lo \
-        set_default_chemistry_parameters.lo \
-        solve_chemistry.lo \
         solve_rate_cool_g.lo \
         solve_rate_cool_g-cpp.lo \
         status_reporting.lo \
diff --git a/src/clib/calculate_cooling_time.cpp b/src/clib/api/calculate_cooling_time.cpp
similarity index 100%
rename from src/clib/calculate_cooling_time.cpp
rename to src/clib/api/calculate_cooling_time.cpp
diff --git a/src/clib/calculate_dust_temperature.cpp b/src/clib/api/calculate_dust_temperature.cpp
similarity index 100%
rename from src/clib/calculate_dust_temperature.cpp
rename to src/clib/api/calculate_dust_temperature.cpp
diff --git a/src/clib/calculate_gamma.cpp b/src/clib/api/calculate_gamma.cpp
similarity index 100%
rename from src/clib/calculate_gamma.cpp
rename to src/clib/api/calculate_gamma.cpp
diff --git a/src/clib/calculate_pressure.cpp b/src/clib/api/calculate_pressure.cpp
similarity index 100%
rename from src/clib/calculate_pressure.cpp
rename to src/clib/api/calculate_pressure.cpp
diff --git a/src/clib/calculate_temperature.cpp b/src/clib/api/calculate_temperature.cpp
similarity index 100%
rename from src/clib/calculate_temperature.cpp
rename to src/clib/api/calculate_temperature.cpp
diff --git a/src/clib/set_default_chemistry_parameters.cpp b/src/clib/api/set_default_chemistry_parameters.cpp
similarity index 100%
rename from src/clib/set_default_chemistry_parameters.cpp
rename to src/clib/api/set_default_chemistry_parameters.cpp
diff --git a/src/clib/solve_chemistry.cpp b/src/clib/api/solve_chemistry.cpp
similarity index 100%
rename from src/clib/solve_chemistry.cpp
rename to src/clib/api/solve_chemistry.cpp