diff --git a/include/omath/3d_primitives/box.hpp b/include/omath/3d_primitives/box.hpp
index 3abb9a4..b039825 100644
--- a/include/omath/3d_primitives/box.hpp
+++ b/include/omath/3d_primitives/box.hpp
@@ -3,8 +3,8 @@
 //
 
 #pragma once
+#include "omath/linear_algebra/triangle.hpp"
 #include "omath/linear_algebra/vector3.hpp"
-#include "omath/triangle.hpp"
 #include <array>
 
 namespace omath::primitives
diff --git a/include/omath/3d_primitives/plane.hpp b/include/omath/3d_primitives/plane.hpp
index 39c0f2c..26f5871 100644
--- a/include/omath/3d_primitives/plane.hpp
+++ b/include/omath/3d_primitives/plane.hpp
@@ -3,8 +3,8 @@
 //
 
 #pragma once
+#include "omath/linear_algebra/triangle.hpp"
 #include "omath/linear_algebra/vector3.hpp"
-#include "omath/triangle.hpp"
 #include <array>
 
 namespace omath::primitives
diff --git a/include/omath/collision/line_tracer.hpp b/include/omath/collision/line_tracer.hpp
index f2c1627..fb40f24 100644
--- a/include/omath/collision/line_tracer.hpp
+++ b/include/omath/collision/line_tracer.hpp
@@ -3,8 +3,8 @@
 //
 #pragma once
 
+#include "omath/linear_algebra/triangle.hpp"
 #include "omath/linear_algebra/vector3.hpp"
-#include "omath/triangle.hpp"
 
 namespace omath::collision
 {
diff --git a/include/omath/engines/iw_engine/constants.hpp b/include/omath/engines/iw_engine/constants.hpp
index 63d1177..a9183fc 100644
--- a/include/omath/engines/iw_engine/constants.hpp
+++ b/include/omath/engines/iw_engine/constants.hpp
@@ -5,8 +5,8 @@
 #pragma once
 #include "omath/linear_algebra/mat.hpp"
 #include "omath/linear_algebra/vector3.hpp"
-#include <omath/angle.hpp>
-#include <omath/view_angles.hpp>
+#include <omath/trigonometry/angle.hpp>
+#include <omath/trigonometry/view_angles.hpp>
 
 namespace omath::iw_engine
 {
diff --git a/include/omath/engines/opengl_engine/constants.hpp b/include/omath/engines/opengl_engine/constants.hpp
index 4f5a955..a4faa0d 100644
--- a/include/omath/engines/opengl_engine/constants.hpp
+++ b/include/omath/engines/opengl_engine/constants.hpp
@@ -5,8 +5,8 @@
 
 #include "omath/linear_algebra/mat.hpp"
 #include "omath/linear_algebra/vector3.hpp"
-#include <omath/angle.hpp>
-#include <omath/view_angles.hpp>
+#include <omath/trigonometry/angle.hpp>
+#include <omath/trigonometry/view_angles.hpp>
 
 namespace omath::opengl_engine
 {
diff --git a/include/omath/engines/source_engine/constants.hpp b/include/omath/engines/source_engine/constants.hpp
index 33df18b..743be74 100644
--- a/include/omath/engines/source_engine/constants.hpp
+++ b/include/omath/engines/source_engine/constants.hpp
@@ -5,8 +5,8 @@
 
 #include "omath/linear_algebra/mat.hpp"
 #include "omath/linear_algebra/vector3.hpp"
-#include <omath/angle.hpp>
-#include <omath/view_angles.hpp>
+#include <omath/trigonometry/angle.hpp>
+#include <omath/trigonometry/view_angles.hpp>
 
 namespace omath::source_engine
 {
diff --git a/include/omath/engines/unity_engine/constants.hpp b/include/omath/engines/unity_engine/constants.hpp
index 81151bc..a938c1c 100644
--- a/include/omath/engines/unity_engine/constants.hpp
+++ b/include/omath/engines/unity_engine/constants.hpp
@@ -6,8 +6,8 @@
 
 #include "omath/linear_algebra/mat.hpp"
 #include "omath/linear_algebra/vector3.hpp"
-#include <omath/angle.hpp>
-#include <omath/view_angles.hpp>
+#include <omath/trigonometry/angle.hpp>
+#include <omath/trigonometry/view_angles.hpp>
 
 namespace omath::unity_engine
 {
diff --git a/include/omath/engines/unreal_engine/constants.hpp b/include/omath/engines/unreal_engine/constants.hpp
index e2e0eb7..98ecf04 100644
--- a/include/omath/engines/unreal_engine/constants.hpp
+++ b/include/omath/engines/unreal_engine/constants.hpp
@@ -6,8 +6,8 @@
 
 #include "omath/linear_algebra/mat.hpp"
 #include "omath/linear_algebra/vector3.hpp"
-#include <omath/angle.hpp>
-#include <omath/view_angles.hpp>
+#include <omath/trigonometry/angle.hpp>
+#include <omath/trigonometry/view_angles.hpp>
 
 namespace omath::unreal_engine
 {
diff --git a/include/omath/triangle.hpp b/include/omath/linear_algebra/triangle.hpp
similarity index 98%
rename from include/omath/triangle.hpp
rename to include/omath/linear_algebra/triangle.hpp
index 519c48c..b8a877c 100644
--- a/include/omath/triangle.hpp
+++ b/include/omath/linear_algebra/triangle.hpp
@@ -2,7 +2,7 @@
 // Created by Orange on 11/13/2024.
 //
 #pragma once
-#include "linear_algebra/vector3.hpp"
+#include "vector3.hpp"
 
 namespace omath
 {
diff --git a/include/omath/linear_algebra/vector3.hpp b/include/omath/linear_algebra/vector3.hpp
index 63e731e..7228d81 100644
--- a/include/omath/linear_algebra/vector3.hpp
+++ b/include/omath/linear_algebra/vector3.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "omath/angle.hpp"
+#include "omath/trigonometry/angle.hpp"
 #include "omath/linear_algebra/vector2.hpp"
 #include <cstdint>
 #include <expected>
diff --git a/include/omath/omath.hpp b/include/omath/omath.hpp
index 474f927..b2e62c5 100644
--- a/include/omath/omath.hpp
+++ b/include/omath/omath.hpp
@@ -6,8 +6,8 @@
 #pragma once
 
 // Basic math utilities
-#include "omath/angles.hpp"
-#include "omath/angle.hpp"
+#include "omath/trigonometry/angles.hpp"
+#include "omath/trigonometry/angle.hpp"
 
 // Vector classes (in dependency order)
 #include "omath/linear_algebra/vector2.hpp"
@@ -18,11 +18,11 @@
 #include "omath/linear_algebra/mat.hpp"
 
 // Color functionality
-#include "omath/color.hpp"
+#include "omath/utility/color.hpp"
 
 // Geometric primitives
-#include "omath/triangle.hpp"
-#include "omath/view_angles.hpp"
+#include "omath/linear_algebra/triangle.hpp"
+#include "omath/trigonometry/view_angles.hpp"
 
 // 3D primitives
 #include "omath/3d_primitives/box.hpp"
diff --git a/include/omath/projection/camera.hpp b/include/omath/projection/camera.hpp
index 7d7feb1..2e835da 100644
--- a/include/omath/projection/camera.hpp
+++ b/include/omath/projection/camera.hpp
@@ -7,8 +7,8 @@
 #include "omath/linear_algebra/mat.hpp"
 #include "omath/linear_algebra/vector3.hpp"
 #include "omath/projection/error_codes.hpp"
+#include <omath/trigonometry/angle.hpp>
 #include <expected>
-#include <omath/angle.hpp>
 #include <type_traits>
 
 #ifdef OMATH_BUILD_TESTS
diff --git a/include/omath/angle.hpp b/include/omath/trigonometry/angle.hpp
similarity index 99%
rename from include/omath/angle.hpp
rename to include/omath/trigonometry/angle.hpp
index 993ddae..ba78596 100644
--- a/include/omath/angle.hpp
+++ b/include/omath/trigonometry/angle.hpp
@@ -3,7 +3,7 @@
 //
 
 #pragma once
-#include "omath/angles.hpp"
+#include "omath/trigonometry/angles.hpp"
 #include <algorithm>
 #include <format>
 #include <utility>
diff --git a/include/omath/angles.hpp b/include/omath/trigonometry/angles.hpp
similarity index 100%
rename from include/omath/angles.hpp
rename to include/omath/trigonometry/angles.hpp
diff --git a/include/omath/view_angles.hpp b/include/omath/trigonometry/view_angles.hpp
similarity index 100%
rename from include/omath/view_angles.hpp
rename to include/omath/trigonometry/view_angles.hpp
diff --git a/include/omath/color.hpp b/include/omath/utility/color.hpp
similarity index 99%
rename from include/omath/color.hpp
rename to include/omath/utility/color.hpp
index 7d72036..cfacee8 100644
--- a/include/omath/color.hpp
+++ b/include/omath/utility/color.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "linear_algebra/vector4.hpp"
+#include "omath/linear_algebra/vector4.hpp"
 #include <cstdint>
 
 namespace omath
diff --git a/tests/general/unit_test_angle.cpp b/tests/general/unit_test_angle.cpp
index 3fafd24..0e4c7ba 100644
--- a/tests/general/unit_test_angle.cpp
+++ b/tests/general/unit_test_angle.cpp
@@ -2,10 +2,10 @@
 // Created by Orange on 11/30/2024.
 //
 
+#include <omath/trigonometry/angle.hpp>
 #include <cmath>
 #include <gtest/gtest.h>
 #include <numbers>
-#include <omath/angle.hpp>
 
 using namespace omath;
 
diff --git a/tests/general/unit_test_angles.cpp b/tests/general/unit_test_angles.cpp
index 94ba0ef..42f8174 100644
--- a/tests/general/unit_test_angles.cpp
+++ b/tests/general/unit_test_angles.cpp
@@ -1,8 +1,8 @@
 //
 // Created by Orange on 11/30/2024.
 //
+#include <omath/trigonometry/angles.hpp>
 #include <gtest/gtest.h>
-#include <omath/angles.hpp>
 
 TEST(unit_test_angles, radians_to_deg)
 {
diff --git a/tests/general/unit_test_color.cpp b/tests/general/unit_test_color.cpp
index 0f0d332..0112fd1 100644
--- a/tests/general/unit_test_color.cpp
+++ b/tests/general/unit_test_color.cpp
@@ -1,9 +1,8 @@
 //
 // Created by Vlad on 01.09.2024.
 //
+#include <omath/utility/color.hpp>
 #include <gtest/gtest.h>
-#include <omath/color.hpp>
-
 
 using namespace omath;
 
diff --git a/tests/general/unit_test_line_trace.cpp b/tests/general/unit_test_line_trace.cpp
index 31cb6a7..8387c4c 100644
--- a/tests/general/unit_test_line_trace.cpp
+++ b/tests/general/unit_test_line_trace.cpp
@@ -2,9 +2,9 @@
 // Revised unit‑test suite for LineTracer (segment‑based Möller–Trumbore)
 // Pure ASCII: avoids non‑standard characters that MSVC rejects.
 //
-#include "omath/linear_algebra/vector3.hpp"
+#include "omath/linear_algebra/triangle.hpp"
 #include "omath/collision/line_tracer.hpp"
-#include "omath/triangle.hpp"
+#include "omath/linear_algebra/vector3.hpp"
 #include "gtest/gtest.h"
 #include <cmath>
 
diff --git a/tests/general/unit_test_triangle.cpp b/tests/general/unit_test_triangle.cpp
index 643ecdc..a4e4b91 100644
--- a/tests/general/unit_test_triangle.cpp
+++ b/tests/general/unit_test_triangle.cpp
@@ -1,7 +1,7 @@
 //
 // Created by Orange on 1/6/2025.
 //
-#include "omath/triangle.hpp"
+#include "omath/linear_algebra/triangle.hpp"
 #include "omath/linear_algebra/vector3.hpp"
 #include <cmath> // For std::sqrt, std::isinf, std::isnan
 #include <gtest/gtest.h>
diff --git a/tests/general/unit_test_view_angles.cpp b/tests/general/unit_test_view_angles.cpp
index 2860545..ed45c11 100644
--- a/tests/general/unit_test_view_angles.cpp
+++ b/tests/general/unit_test_view_angles.cpp
@@ -1,4 +1,4 @@
 //
 // Created by Orange on 11/30/2024.
 //
-#include <omath/view_angles.hpp>
\ No newline at end of file
+#include <omath/trigonometry/view_angles.hpp>
\ No newline at end of file