Continue major restructure of the project

Rinzii · Mar 17, 2024 · ba50c78 · ba50c78
1 parent 17997cf
commit ba50c78
Show file tree

Hide file tree

Showing 111 changed files with 346 additions and 306 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -22,8 +22,13 @@ cert-str34-c,
 google-default-arguments,
 google-explicit-constructor,
 google-runtime-operator,
+google-readability-casting,
+google-upgrade-googletest-case,
+llvm-include-order,
+llvm-namespace-comment,
 hicpp-exception-baseclass,
 hicpp-multiway-paths-covered,
+hicpp-no-assembler,
 misc-const-correctness,
 misc-definitions-in-headers,
 misc-header-include-cycle,

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,7 +65,7 @@ target_link_libraries(${PROJECT_NAME} INTERFACE
 configure_file(cmake/version.hpp.in "${CMAKE_CURRENT_BINARY_DIR}/include/${PROJECT_NAME}/version.hpp" @ONLY)
 
 if (CCMATH_BUILD_EXAMPLES OR CCMATH_BUILD_BENCHMARKS OR CCMATH_BUILD_TEST)
-  add_subdirectory(ext)
+  add_subdirectory(thirdparty)
 endif()
 
 if (CCMATH_BUILD_EXAMPLES)

diff --git a/benchmark/ccmath_benchmark_main.cpp b/benchmark/ccmath_benchmark_main.cpp
@@ -7,11 +7,13 @@
  */
 
 #include <benchmark/benchmark.h>
-#include <vector>
 #include <random>
+#include <vector>
 
-#include <cmath>
 #include "ccmath/ccmath.hpp"
+#include <cmath>
+
+// NOLINTBEGIN
 
 namespace bm = benchmark;
 
@@ -40,21 +42,16 @@ std::vector<double> generateRandomDoubles(size_t count, unsigned int seed) {
 	return randomDouble;
 }
 
-
-
-
-
-
 static void BM_std_fma(bm::State& state) {
-    for (auto _ : state) {
+    for ([[maybe_unused]] auto _ : state) {
         bm::DoNotOptimize(std::fma(state.range(0), state.range(1), state.range(2)));
     }
     state.SetComplexityN(state.range(0));
 }
 BENCHMARK(BM_std_fma)->Args({16, 16, 16})->Args({256, 256, 256})->Args({4096, 4096, 4096})->Args({65536, 65536, 65536})->Complexity();
 
 static void BM_ccm_fma(bm::State& state) {
-    for (auto _ : state) {
+    for ([[maybe_unused]] auto _ : state) {
         bm::DoNotOptimize(ccm::fma(state.range(0), state.range(1), state.range(2)));
     }
     state.SetComplexityN(state.range(0));
@@ -204,4 +201,34 @@ static void BM_std_log2(bm::State& state) {
 }
 BENCHMARK(BM_std_log2)->Arg(16)->Arg(256)->Arg(4096)->Arg(65536)->Complexity();
 
+static void BM_ccm_lerp(bm::State& state) {
+    for (auto _ : state) {
+        bm::DoNotOptimize(ccm::lerp(state.range(0), state.range(1), state.range(2)));
+    }
+    state.SetComplexityN(state.range(0));
+}
+BENCHMARK(BM_ccm_lerp)->Args({16, 16, 16})->Args({256, 256, 256})->Args({4096, 4096, 4096})->Args({65536, 65536, 65536})->Complexity();
+
+static void BM_ccm_lerp2(bm::State& state) {
+	for (auto _ : state) {
+		bm::DoNotOptimize(ccm::lerp2(state.range(0), state.range(1), state.range(2)));
+	}
+	state.SetComplexityN(state.range(0));
+}
+BENCHMARK(BM_ccm_lerp2)->Args({16, 16, 16})->Args({256, 256, 256})->Args({4096, 4096, 4096})->Args({65536, 65536, 65536})->Complexity();
+
+
+static void BM_std_lerp(bm::State& state) {
+    for (auto _ : state) {
+        bm::DoNotOptimize(ccm::lerp(state.range(0), state.range(1), state.range(2)));
+    }
+    state.SetComplexityN(state.range(0));
+}
+BENCHMARK(BM_std_lerp)->Args({16, 16, 16})->Args({256, 256, 256})->Args({4096, 4096, 4096})->Args({65536, 65536, 65536})->Complexity();
+
+
+
 BENCHMARK_MAIN();
+
+
+// NOLINTEND
diff --git a/ccmath_headers.cmake b/ccmath_headers.cmake
@@ -58,136 +58,136 @@ set(ccmath_internal_headers
 ##########################################
 
 set(ccmath_detail_basic_impl_headers
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/basic/impl/remquo_float_impl.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/basic/impl/remquo_double_impl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/basic/impl/remquo_float_impl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/basic/impl/remquo_double_impl.hpp
 )
 
 set(ccmath_detail_basic_headers
         ${ccmath_detail_basic_impl_headers}
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/basic/abs.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/basic/fdim.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/basic/fma.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/basic/fmod.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/basic/max.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/basic/min.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/basic/remainder.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/basic/remquo.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/basic/abs.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/basic/fdim.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/basic/fma.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/basic/fmod.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/basic/max.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/basic/min.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/basic/remainder.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/basic/remquo.hpp
 )
 
 set(ccmath_detail_compare_headers
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/compare/fpclassify.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/compare/isfinite.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/compare/isgreater.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/compare/isgreaterequal.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/compare/isinf.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/compare/isless.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/compare/islessequal.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/compare/islessgreater.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/compare/isnan.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/compare/isnormal.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/compare/isunordered.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/compare/signbit.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/compare/fpclassify.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/compare/isfinite.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/compare/isgreater.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/compare/isgreaterequal.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/compare/isinf.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/compare/isless.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/compare/islessequal.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/compare/islessgreater.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/compare/isnan.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/compare/isnormal.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/compare/isunordered.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/compare/signbit.hpp
 )
 
 set(ccmath_detail_exponential_impl_headers
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/impl/exp_float_impl.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/impl/exp_double_impl.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/impl/exp_data.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/impl/log_float_impl.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/impl/log_double_impl.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/impl/log_data.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/impl/log2_float_impl.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/impl/log2_double_impl.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/impl/log2_data.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/impl/exp_float_impl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/impl/exp_double_impl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/impl/exp_data.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/impl/log_float_impl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/impl/log_double_impl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/impl/log_data.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/impl/log2_float_impl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/impl/log2_double_impl.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/impl/log2_data.hpp
 )
 
 set(ccmath_detail_exponential_headers
         ${ccmath_detail_exponential_impl_headers}
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/exp.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/exp2.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/expm1.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/log.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/log1p.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/log2.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/exponential/log10.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/exp.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/exp2.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/expm1.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/log.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/log1p.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/log2.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/exponential/log10.hpp
 )
 
 set(ccmath_detail_fmanip_headers
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/fmanip/copysign.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/fmanip/frexp.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/fmanip/ilogb.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/fmanip/ldexp.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/fmanip/logb.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/fmanip/modf.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/fmanip/nextafter.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/fmanip/scalbn.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/fmanip/copysign.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/fmanip/frexp.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/fmanip/ilogb.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/fmanip/ldexp.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/fmanip/logb.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/fmanip/modf.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/fmanip/nextafter.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/fmanip/scalbn.hpp
 )
 
 set(ccmath_detail_hyperbolic_headers
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/hyperbolic/acosh.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/hyperbolic/asinh.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/hyperbolic/atanh.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/hyperbolic/cosh.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/hyperbolic/sinh.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/hyperbolic/tanh.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/hyperbolic/acosh.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/hyperbolic/asinh.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/hyperbolic/atanh.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/hyperbolic/cosh.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/hyperbolic/sinh.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/hyperbolic/tanh.hpp
 )
 
 set(ccmath_detail_nearest_headers
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/nearest/ceil.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/nearest/floor.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/nearest/nearbyint.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/nearest/rint.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/nearest/round.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/nearest/trunc.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/nearest/ceil.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/nearest/floor.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/nearest/nearbyint.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/nearest/rint.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/nearest/round.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/nearest/trunc.hpp
 )
 
 set(ccmath_detail_power_headers
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/power/cbrt.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/power/hypot.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/power/pow.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/power/sqrt.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/power/cbrt.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/power/hypot.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/power/pow.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/power/sqrt.hpp
 )
 
 set(ccmath_detail_special_headers
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/assoc_laguerre.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/assoc_legendre.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/beta.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/comp_ellint_1.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/comp_ellint_2.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/comp_ellint_3.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/cyl_bessel_i.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/cyl_bessel_j.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/cyl_bessel_k.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/cyl_neumann.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/ellint_1.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/ellint_2.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/ellint_3.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/expint.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/hermite.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/laguerre.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/legendre.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/riemann_zeta.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/sph_bessel.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/sph_legendre.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/special/sph_neumann.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/assoc_laguerre.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/assoc_legendre.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/beta.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/comp_ellint_1.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/comp_ellint_2.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/comp_ellint_3.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/cyl_bessel_i.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/cyl_bessel_j.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/cyl_bessel_k.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/cyl_neumann.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/ellint_1.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/ellint_2.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/ellint_3.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/expint.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/hermite.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/laguerre.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/legendre.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/riemann_zeta.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/sph_bessel.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/sph_legendre.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/special/sph_neumann.hpp
 )
 
 set(ccmath_detail_trig_headers
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/trig/acos.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/trig/asin.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/trig/atan.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/trig/atan2.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/trig/cos.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/trig/sin.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/trig/tan.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/trig/acos.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/trig/asin.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/trig/atan.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/trig/atan2.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/trig/cos.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/trig/sin.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/trig/tan.hpp
 )
 
 
 set(ccmath_detail_root_headers
         # Functions without a specified category
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/gamma.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/lerp.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/detail/lgamma.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/gamma.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/lerp.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/ccmath/math/lgamma.hpp
 )
 
 set(ccmath_detail_headers

diff --git a/include/ccmath/basic.hpp b/include/ccmath/basic.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "ccmath/detail/basic/abs.hpp"
-#include "ccmath/detail/basic/fdim.hpp"
-#include "ccmath/detail/basic/fma.hpp"
-#include "ccmath/detail/basic/fmod.hpp"
-#include "ccmath/detail/basic/max.hpp"
-#include "ccmath/detail/basic/min.hpp"
-#include "ccmath/detail/basic/remainder.hpp"
-#include "ccmath/detail/basic/remquo.hpp"
+#include "ccmath/math/basic/abs.hpp"
+#include "ccmath/math/basic/fdim.hpp"
+#include "ccmath/math/basic/fma.hpp"
+#include "ccmath/math/basic/fmod.hpp"
+#include "ccmath/math/basic/max.hpp"
+#include "ccmath/math/basic/min.hpp"
+#include "ccmath/math/basic/remainder.hpp"
+#include "ccmath/math/basic/remquo.hpp"
diff --git a/include/ccmath/ccmath.hpp b/include/ccmath/ccmath.hpp
@@ -50,6 +50,6 @@ CCMATH REQUIREMENTS:
 #include "ccmath/trig.hpp"
 
 /// Uncategorized functions
-#include "ccmath/detail/gamma.hpp"
-#include "ccmath/detail/lerp.hpp"
-#include "ccmath/detail/lgamma.hpp"
+#include "ccmath/math/gamma.hpp"
+#include "ccmath/math/lerp.hpp"
+#include "ccmath/math/lgamma.hpp"