diff --git a/docs/ecs/threading-and-reductions.md b/docs/ecs/threading-and-reductions.md
index c9c395694..0f0d54595 100644
--- a/docs/ecs/threading-and-reductions.md
+++ b/docs/ecs/threading-and-reductions.md
@@ -229,9 +229,9 @@ struct KeyedSumScratch {
 Adapted from `tests/src/ecs/KeyedReductions.cpp` (the `fixed_point_t` worker-count-invariance case):
 
 ```cpp
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/ecs/EcsThreadPool.hpp"
 #include "openvic-simulation/ecs/Reductions.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 using namespace OpenVic::ecs;
 using OpenVic::fixed_point_t;
diff --git a/misc/scripts/exp_lut_generator.py b/misc/scripts/exp_lut_generator.py
index 3d8c13d0e..54bce5827 100755
--- a/misc/scripts/exp_lut_generator.py
+++ b/misc/scripts/exp_lut_generator.py
@@ -77,7 +77,7 @@ def generate_exp_lut(divisor_base: int, divisor_power: int, exp_base: decimal.De
     source += "}\n// clang-format on\n"
 
     fixed_point_lut_path: str = os.path.join(
-        os.path.dirname(__file__), f"../../src/openvic-simulation/types/fixed_point/FixedPointLUT_{lut_identifier}.hpp"
+        os.path.dirname(__file__), f"../../src/openvic-simulation/core/object/FixedPoint/LUT_{lut_identifier}.hpp"
     )
     with open(fixed_point_lut_path, "w", newline="\n") as file:
         file.write(source)
diff --git a/misc/scripts/sin_lut_generator.py b/misc/scripts/sin_lut_generator.py
index 7e40fb995..478d43657 100755
--- a/misc/scripts/sin_lut_generator.py
+++ b/misc/scripts/sin_lut_generator.py
@@ -120,7 +120,7 @@ def generate_sin_lut(precision: int, count_log2: int):
     source += "}\n// clang-format on\n"
 
     fixed_point_sin_path: str = os.path.join(
-        os.path.dirname(__file__), "../../src/openvic-simulation/types/fixed_point/FixedPointLUT_sin.hpp"
+        os.path.dirname(__file__), "../../src/openvic-simulation/core/object/FixedPoint/LUT_sin.hpp"
     )
     with open(fixed_point_sin_path, "w", newline="\n") as file:
         file.write(source)
diff --git a/src/openvic-simulation/core/Math.hpp b/src/openvic-simulation/core/Math.hpp
index a6a39e01f..45074d553 100644
--- a/src/openvic-simulation/core/Math.hpp
+++ b/src/openvic-simulation/core/Math.hpp
@@ -6,11 +6,12 @@
 #include <type_traits>
 
 #include "openvic-simulation/core/Typedefs.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 namespace OpenVic {
-    template<typename T>
-    [[nodiscard]] OV_SPEED_INLINE constexpr T abs(const T num);
+	class fixed_point_t;
+
+	template<typename T>
+	[[nodiscard]] constexpr T abs(const T num);
 
 	template<typename T>
 	requires std::integral<T> || std::floating_point<T>
@@ -22,13 +23,8 @@ namespace OpenVic {
 		}
 	}
 
-    template<>
-	[[nodiscard]] OV_SPEED_INLINE constexpr fixed_point_t abs(const fixed_point_t  num) {
-		return num.abs();
-	}
-
-    template<typename T>
-	requires (!(std::integral<T> || std::floating_point<T> || std::is_same_v<T, fixed_point_t>))
+	template<typename T>
+	requires(!(std::integral<T> || std::floating_point<T> || std::same_as<T, fixed_point_t>))
 	[[nodiscard]] OV_SPEED_INLINE constexpr T abs(T const& num);
 
 	template<std::floating_point T>
diff --git a/src/openvic-simulation/types/fixed_point/FixedPoint.cpp b/src/openvic-simulation/core/object/FixedPoint.cpp
similarity index 95%
rename from src/openvic-simulation/types/fixed_point/FixedPoint.cpp
rename to src/openvic-simulation/core/object/FixedPoint.cpp
index 1ae407b71..1020fac97 100644
--- a/src/openvic-simulation/types/fixed_point/FixedPoint.cpp
+++ b/src/openvic-simulation/core/object/FixedPoint.cpp
@@ -6,16 +6,15 @@
 #include <fmt/base.h>
 #include <fmt/format.h>
 
+#include "openvic-simulation/core/object/FixedPoint/String.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
 
-#include "String.hpp"
-
 /* Base e exponential lookup table */
-#include "openvic-simulation/types/fixed_point/FixedPointLUT_2_16_EXP_e.hpp"
+#include "openvic-simulation/core/object/FixedPoint/LUT_2_16_EXP_e.hpp"
 
 /* Base 2001 exponential lookup table */
-#include "openvic-simulation/types/fixed_point/FixedPointLUT_2_16_EXP_2001.hpp"
+#include "openvic-simulation/core/object/FixedPoint/LUT_2_16_EXP_2001.hpp"
 
 using namespace OpenVic;
 static_assert(_detail::LUT::_2_16_EXP_e_DIVISOR == 1 << fixed_point_t::PRECISION);
diff --git a/src/openvic-simulation/types/fixed_point/FixedPoint.hpp b/src/openvic-simulation/core/object/FixedPoint.hpp
similarity index 99%
rename from src/openvic-simulation/types/fixed_point/FixedPoint.hpp
rename to src/openvic-simulation/core/object/FixedPoint.hpp
index 0914cec68..424a15a17 100644
--- a/src/openvic-simulation/types/fixed_point/FixedPoint.hpp
+++ b/src/openvic-simulation/core/object/FixedPoint.hpp
@@ -13,11 +13,12 @@
 
 namespace OpenVic {
 	enum class midpoint_rounding { AWAY_ZERO, TO_ZERO };
-	
+
 	template<typename T>
 	concept integral_max_size_4 = std::integral<T> && sizeof(T) <= 4;
 
-	struct fixed_point_t {
+	class fixed_point_t {
+	public:
 		/* PROPERTY generated getter functions will return fixed points by value, rather than const reference. */
 		using ov_return_by_value = void;
 		using value_type = int64_t;
@@ -40,6 +41,7 @@ namespace OpenVic {
 
 	private:
 		value_type value;
+
 	public:
 		[[nodiscard]] constexpr value_type const& get_raw_value() const {
 			return value;
@@ -48,6 +50,7 @@ namespace OpenVic {
 		OV_ALWAYS_INLINE constexpr fixed_point_t get_frac() const {
 			return parse_raw(value & FRAC_MASK);
 		}
+
 	private:
 		struct raw_value_t {
 			explicit raw_value_t() = default;
@@ -267,7 +270,7 @@ namespace OpenVic {
 
 		static fixed_point_t parse_capped(const int64_t value);
 		static fixed_point_t parse_capped(const uint64_t value);
-		
+
 		template<std::integral T>
 		requires (sizeof(T) >= 4)
 		static fixed_point_t parse_capped(const T value) {
diff --git a/src/openvic-simulation/types/fixed_point/Atomic.hpp b/src/openvic-simulation/core/object/FixedPoint/Atomic.hpp
similarity index 99%
rename from src/openvic-simulation/types/fixed_point/Atomic.hpp
rename to src/openvic-simulation/core/object/FixedPoint/Atomic.hpp
index dd405795a..cbd98d35f 100644
--- a/src/openvic-simulation/types/fixed_point/Atomic.hpp
+++ b/src/openvic-simulation/core/object/FixedPoint/Atomic.hpp
@@ -2,7 +2,7 @@
 
 #include <atomic>
 
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 
 namespace std {
diff --git a/src/openvic-simulation/types/fixed_point/Fraction.hpp b/src/openvic-simulation/core/object/FixedPoint/Fraction.hpp
similarity index 81%
rename from src/openvic-simulation/types/fixed_point/Fraction.hpp
rename to src/openvic-simulation/core/object/FixedPoint/Fraction.hpp
index 613942f53..a291d82e1 100644
--- a/src/openvic-simulation/types/fixed_point/Fraction.hpp
+++ b/src/openvic-simulation/core/object/FixedPoint/Fraction.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/types/fixed_point/Math.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 
 namespace OpenVic {
@@ -17,4 +17,4 @@ namespace OpenVic {
 			return fp::mul_div(lhs, rhs.numerator, rhs.denominator);
 		}
 	};
-}
\ No newline at end of file
+}
diff --git a/src/openvic-simulation/types/fixed_point/FixedPointLUT_2_16_EXP_2001.hpp b/src/openvic-simulation/core/object/FixedPoint/LUT_2_16_EXP_2001.hpp
similarity index 100%
rename from src/openvic-simulation/types/fixed_point/FixedPointLUT_2_16_EXP_2001.hpp
rename to src/openvic-simulation/core/object/FixedPoint/LUT_2_16_EXP_2001.hpp
diff --git a/src/openvic-simulation/types/fixed_point/FixedPointLUT_2_16_EXP_e.hpp b/src/openvic-simulation/core/object/FixedPoint/LUT_2_16_EXP_e.hpp
similarity index 100%
rename from src/openvic-simulation/types/fixed_point/FixedPointLUT_2_16_EXP_e.hpp
rename to src/openvic-simulation/core/object/FixedPoint/LUT_2_16_EXP_e.hpp
diff --git a/src/openvic-simulation/types/fixed_point/FixedPointLUT_sin.hpp b/src/openvic-simulation/core/object/FixedPoint/LUT_sin.hpp
similarity index 100%
rename from src/openvic-simulation/types/fixed_point/FixedPointLUT_sin.hpp
rename to src/openvic-simulation/core/object/FixedPoint/LUT_sin.hpp
diff --git a/src/openvic-simulation/types/fixed_point/Math.hpp b/src/openvic-simulation/core/object/FixedPoint/Math.hpp
similarity index 70%
rename from src/openvic-simulation/types/fixed_point/Math.hpp
rename to src/openvic-simulation/core/object/FixedPoint/Math.hpp
index a2f7854b3..816fcd52d 100644
--- a/src/openvic-simulation/types/fixed_point/Math.hpp
+++ b/src/openvic-simulation/core/object/FixedPoint/Math.hpp
@@ -1,18 +1,25 @@
 #pragma once
 
-#include "FixedPoint.hpp"
-
 #include <cassert>
 
+#include "openvic-simulation/core/Math.hpp"
 #include "openvic-simulation/core/MathSqrt.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/template/Concepts.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 
 /* Sin lookup table */
-#include "openvic-simulation/types/fixed_point/FixedPointLUT_sin.hpp"
+#include "openvic-simulation/core/object/FixedPoint/LUT_sin.hpp"
+
+namespace OpenVic {
+	template<>
+	[[nodiscard]] OV_SPEED_INLINE constexpr fixed_point_t abs(const fixed_point_t num) {
+		return num.abs();
+	}
+}
 
 namespace OpenVic::fp {
-	static_assert(_detail::LUT::SIN_PRECISION == fixed_point_t::PRECISION);	
+	static_assert(_detail::LUT::SIN_PRECISION == fixed_point_t::PRECISION);
 
 	OV_SPEED_INLINE static constexpr fixed_point_t sin(fixed_point_t const& v) {
 		using namespace _detail::LUT;
@@ -30,9 +37,7 @@ namespace OpenVic::fp {
 
 		const fixed_point_t::value_type fraction = (num - (index << SIN_SHIFT)) << SIN_COUNT_LOG2;
 		const fixed_point_t::value_type result = a + (((b - a) * fraction) >> SIN_PRECISION);
-		return fixed_point_t::parse_raw(
-			!negative ? result : -result
-		);
+		return fixed_point_t::parse_raw(!negative ? result : -result);
 	}
 
 	OV_SPEED_INLINE static constexpr fixed_point_t cos(fixed_point_t const& v) {
@@ -41,29 +46,28 @@ namespace OpenVic::fp {
 
 	OV_SPEED_INLINE static constexpr fixed_point_t sqrt(fixed_point_t const& v) {
 		return !v.is_negative()
-			? fixed_point_t::parse_raw(
-				OpenVic::sqrt(
-					static_cast<uint64_t>(v.get_raw_value()) << fixed_point_t::PRECISION
-				)
-			)
+			? fixed_point_t::parse_raw(OpenVic::sqrt(static_cast<uint64_t>(v.get_raw_value()) << fixed_point_t::PRECISION))
 			: fixed_point_t::_0;
 	}
 
-	//Preserves accuracy. Performing a normal multiplication of small values results in 0.
+	// Preserves accuracy. Performing a normal multiplication of small values results in 0.
 	template<std::integral T>
-	OV_SPEED_INLINE static constexpr fixed_point_t mul_div(fixed_point_t const& multiplier, T const& numerator, T const& denominator) {
+	OV_SPEED_INLINE static constexpr fixed_point_t
+	mul_div(fixed_point_t const& multiplier, T const& numerator, T const& denominator) {
 		return fixed_point_t::parse_raw(multiplier.get_raw_value() * numerator / denominator);
 	}
 
-	OV_SPEED_INLINE static constexpr fixed_point_t mul_div(fixed_point_t const& multiplier, fixed_point_t const& numerator, fixed_point_t const& denominator) {
+	OV_SPEED_INLINE static constexpr fixed_point_t
+	mul_div(fixed_point_t const& multiplier, fixed_point_t const& numerator, fixed_point_t const& denominator) {
 		return mul_div(multiplier, numerator.get_raw_value(), denominator.get_raw_value());
 	}
 
 	template<is_strongly_typed StrongType>
-	OV_SPEED_INLINE static constexpr fixed_point_t mul_div(fixed_point_t const& multiplier, StrongType const& numerator, StrongType const& denominator) {
+	OV_SPEED_INLINE static constexpr fixed_point_t
+	mul_div(fixed_point_t const& multiplier, StrongType const& numerator, StrongType const& denominator) {
 		return mul_div(multiplier, type_safe::get(numerator), type_safe::get(denominator));
 	}
-	
+
 	template<std::integral T>
 	OV_SPEED_INLINE static constexpr T multiply_truncate(T const& integer, fixed_point_t const& v) {
 		return static_cast<T>(
@@ -73,28 +77,25 @@ namespace OpenVic::fp {
 
 	template<is_strongly_typed StrongType>
 	OV_SPEED_INLINE static constexpr StrongType multiply_truncate(StrongType const& integer, fixed_point_t const& v) {
-		return StrongType(multiply_truncate(
-			type_safe::get(integer),
-			v
-		));
+		return StrongType(multiply_truncate(type_safe::get(integer), v));
 	}
 
 	template<integral_max_size_4 TNumerator, integral_max_size_4 TDenominator>
 	OV_SPEED_INLINE static constexpr fixed_point_t from_fraction(const TNumerator numerator, const TDenominator denominator) {
 		return fixed_point_t::parse_raw(
-			(static_cast<fixed_point_t::value_type>(numerator) << fixed_point_t::PRECISION)
-			/ static_cast<fixed_point_t::value_type>(denominator)
+			(static_cast<fixed_point_t::value_type>(numerator) << fixed_point_t::PRECISION) /
+			static_cast<fixed_point_t::value_type>(denominator)
 		);
 	}
 
 	OV_SPEED_INLINE static constexpr fixed_point_t from_fraction(const int64_t numerator, const int64_t denominator) {
-		assert(numerator < 140737488355328LL); //2^47
+		assert(numerator < 140737488355328LL); // 2^47
 		assert(numerator >= -140737488355328LL); //- 2^47
 		return fixed_point_t::parse_raw((numerator << fixed_point_t::PRECISION) / denominator);
 	}
 
 	OV_SPEED_INLINE static constexpr fixed_point_t from_fraction(const uint64_t numerator, const uint64_t denominator) {
-		assert(numerator < 281474976710656ULL); //2^48
+		assert(numerator < 281474976710656ULL); // 2^48
 		return fixed_point_t::parse_raw((numerator << fixed_point_t::PRECISION) / denominator);
 	}
 
@@ -102,4 +103,4 @@ namespace OpenVic::fp {
 	OV_SPEED_INLINE static constexpr fixed_point_t from_fraction(StrongType const& numerator, StrongType const& denominator) {
 		return from_fraction(type_safe::get(numerator), type_safe::get(denominator));
 	}
-}
\ No newline at end of file
+}
diff --git a/src/openvic-simulation/types/fixed_point/String.hpp b/src/openvic-simulation/core/object/FixedPoint/String.hpp
similarity index 98%
rename from src/openvic-simulation/types/fixed_point/String.hpp
rename to src/openvic-simulation/core/object/FixedPoint/String.hpp
index 81766f04d..11feba71d 100644
--- a/src/openvic-simulation/types/fixed_point/String.hpp
+++ b/src/openvic-simulation/core/object/FixedPoint/String.hpp
@@ -3,9 +3,9 @@
 #include <charconv>
 
 #include "openvic-simulation/core/Math.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/stl/containers/StackString.hpp"
 #include "openvic-simulation/core/string/CharConv.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
 
 namespace OpenVic::fp {
@@ -229,4 +229,4 @@ namespace OpenVic::fp {
 
 		return fixed_point_t::parse_raw(integer_value);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/openvic-simulation/core/object/Vector.hpp b/src/openvic-simulation/core/object/Vector.hpp
index f0b19d16f..0f88c4253 100644
--- a/src/openvic-simulation/core/object/Vector.hpp
+++ b/src/openvic-simulation/core/object/Vector.hpp
@@ -6,10 +6,11 @@
 #include <fmt/format.h>
 
 #include "openvic-simulation/core/Math.hpp" // IWYU pragma: keep
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp" // IWYU pragma: keep
 #include "openvic-simulation/core/stl/BasicIterator.hpp" // IWYU pragma: keep
 #include "openvic-simulation/core/template/Concepts.hpp" // IWYU pragma: keep
 #include "openvic-simulation/core/Typedefs.hpp" // IWYU pragma: keep
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 #define VEC_TYPE vec2_t
 #define FOR_VEC_COMPONENTS(F, SEP) F(x) SEP F(y)
diff --git a/src/openvic-simulation/core/random/WeightedSampling.hpp b/src/openvic-simulation/core/random/WeightedSampling.hpp
index c82ea0a2d..3a3bd7ba1 100644
--- a/src/openvic-simulation/core/random/WeightedSampling.hpp
+++ b/src/openvic-simulation/core/random/WeightedSampling.hpp
@@ -4,8 +4,8 @@
 #include <limits>
 #include <span>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 namespace OpenVic {
 	OV_SPEED_INLINE static size_t sample_weighted_index(
diff --git a/src/openvic-simulation/country/CountryInstance.cpp b/src/openvic-simulation/country/CountryInstance.cpp
index 72dd6fc8a..20600dd7f 100644
--- a/src/openvic-simulation/country/CountryInstance.cpp
+++ b/src/openvic-simulation/country/CountryInstance.cpp
@@ -11,6 +11,8 @@
 
 #include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/core/object/Date.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp"
 #include "openvic-simulation/core/object/Timespan.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 #include "openvic-simulation/country/CountryDefinition.hpp"
@@ -48,8 +50,6 @@
 #include "openvic-simulation/research/Invention.hpp"
 #include "openvic-simulation/research/Technology.hpp"
 #include "openvic-simulation/types/ClampedValue.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/types/fixed_point/Math.hpp"
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/types/UnitBranchType.hpp"
diff --git a/src/openvic-simulation/country/CountryInstance.hpp b/src/openvic-simulation/country/CountryInstance.hpp
index 0c3102da5..7a1ff65ed 100644
--- a/src/openvic-simulation/country/CountryInstance.hpp
+++ b/src/openvic-simulation/country/CountryInstance.hpp
@@ -8,6 +8,8 @@
 #include "openvic-simulation/core/memory/SmartPtr.hpp"
 #include "openvic-simulation/core/memory/Vector.hpp"
 #include "openvic-simulation/core/object/Date.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Atomic.hpp"
 #include "openvic-simulation/core/object/Timespan.hpp"
 #include "openvic-simulation/core/stl/containers/TypedSpan.hpp"
 #include "openvic-simulation/core/thread/SpinMutex.hpp"
@@ -21,8 +23,6 @@
 #include "openvic-simulation/population/PopsAggregate.hpp"
 #include "openvic-simulation/research/TechnologyUnlockLevel.hpp"
 #include "openvic-simulation/types/ClampedValue.hpp"
-#include "openvic-simulation/types/fixed_point/Atomic.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/FlagStrings.hpp"
 #include "openvic-simulation/types/HasIndex.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
diff --git a/src/openvic-simulation/country/SharedCountryValues.hpp b/src/openvic-simulation/country/SharedCountryValues.hpp
index 71c366fd3..8220c9c95 100644
--- a/src/openvic-simulation/country/SharedCountryValues.hpp
+++ b/src/openvic-simulation/country/SharedCountryValues.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/population/PopNeedsMacro.hpp"
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/UnitBranchType.hpp"
 #include "openvic-simulation/utility/reactive/MutableState.hpp"
 
diff --git a/src/openvic-simulation/dataloader/NodeTools.cpp b/src/openvic-simulation/dataloader/NodeTools.cpp
index 8df94dcbe..f29f66fae 100644
--- a/src/openvic-simulation/dataloader/NodeTools.cpp
+++ b/src/openvic-simulation/dataloader/NodeTools.cpp
@@ -16,10 +16,10 @@
 #include <range/v3/view/enumerate.hpp>
 
 #include "openvic-simulation/core/object/Colour.hpp"
+#include "openvic-simulation/core/object/FixedPoint/String.hpp"
 #include "openvic-simulation/core/object/Timespan.hpp"
 #include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/ui/TextFormat.hpp"
-#include "openvic-simulation/types/fixed_point/String.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/defines/AIDefines.hpp b/src/openvic-simulation/defines/AIDefines.hpp
index e8cd04529..76520ae0a 100644
--- a/src/openvic-simulation/defines/AIDefines.hpp
+++ b/src/openvic-simulation/defines/AIDefines.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/object/Timespan.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
 namespace OpenVic {
diff --git a/src/openvic-simulation/defines/CountryDefines.hpp b/src/openvic-simulation/defines/CountryDefines.hpp
index 5621cf2e3..74b439d5c 100644
--- a/src/openvic-simulation/defines/CountryDefines.hpp
+++ b/src/openvic-simulation/defines/CountryDefines.hpp
@@ -2,9 +2,9 @@
 
 #include <cstddef>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/object/Timespan.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/map/LifeRating.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
diff --git a/src/openvic-simulation/defines/DiplomacyDefines.hpp b/src/openvic-simulation/defines/DiplomacyDefines.hpp
index 9bfc68edf..a99108661 100644
--- a/src/openvic-simulation/defines/DiplomacyDefines.hpp
+++ b/src/openvic-simulation/defines/DiplomacyDefines.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/object/Timespan.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
 namespace OpenVic {
diff --git a/src/openvic-simulation/defines/EconomyDefines.hpp b/src/openvic-simulation/defines/EconomyDefines.hpp
index c0548e340..3ac580030 100644
--- a/src/openvic-simulation/defines/EconomyDefines.hpp
+++ b/src/openvic-simulation/defines/EconomyDefines.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/object/Timespan.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
 namespace OpenVic {
diff --git a/src/openvic-simulation/defines/MilitaryDefines.hpp b/src/openvic-simulation/defines/MilitaryDefines.hpp
index 0cf75cb68..296bb5172 100644
--- a/src/openvic-simulation/defines/MilitaryDefines.hpp
+++ b/src/openvic-simulation/defines/MilitaryDefines.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/object/Timespan.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/military/CombatWidth.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/population/PopSize.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
diff --git a/src/openvic-simulation/defines/PopsDefines.hpp b/src/openvic-simulation/defines/PopsDefines.hpp
index 631ae7892..0b3d3ea25 100644
--- a/src/openvic-simulation/defines/PopsDefines.hpp
+++ b/src/openvic-simulation/defines/PopsDefines.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/population/PopSum.hpp"
 #include "openvic-simulation/map/LifeRating.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
diff --git a/src/openvic-simulation/economy/BuildingInstance.hpp b/src/openvic-simulation/economy/BuildingInstance.hpp
index 4ed66a6fa..862d08169 100644
--- a/src/openvic-simulation/economy/BuildingInstance.hpp
+++ b/src/openvic-simulation/economy/BuildingInstance.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "openvic-simulation/core/object/Date.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/economy/BuildingLevel.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/HasIdentifier.hpp"
 
 namespace OpenVic {
diff --git a/src/openvic-simulation/economy/BuildingType.cpp b/src/openvic-simulation/economy/BuildingType.cpp
index 6cf61bbf4..4f75ba2ec 100644
--- a/src/openvic-simulation/economy/BuildingType.cpp
+++ b/src/openvic-simulation/economy/BuildingType.cpp
@@ -3,6 +3,7 @@
 #include <optional>
 
 #include "openvic-simulation/core/error/ErrorMacros.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/economy/GoodDefinition.hpp"
 #include "openvic-simulation/economy/production/ProductionType.hpp"
@@ -11,7 +12,6 @@
 #include "openvic-simulation/map/State.hpp"
 #include "openvic-simulation/modifier/ModifierEffectCache.hpp"
 #include "openvic-simulation/modifier/ModifierManager.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/economy/BuildingType.hpp b/src/openvic-simulation/economy/BuildingType.hpp
index 8c1f2a814..69bb4cfa6 100644
--- a/src/openvic-simulation/economy/BuildingType.hpp
+++ b/src/openvic-simulation/economy/BuildingType.hpp
@@ -4,6 +4,7 @@
 #include <optional>
 
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/modifier/Modifier.hpp"
 #include "openvic-simulation/core/object/Timespan.hpp"
 #include "openvic-simulation/core/stl/containers/TypedSpan.hpp"
@@ -11,7 +12,6 @@
 #include "openvic-simulation/economy/BuildingRestrictionCategory.hpp"
 #include "openvic-simulation/types/HasIndex.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 
 namespace OpenVic {
diff --git a/src/openvic-simulation/economy/production/ArtisanalProducer.cpp b/src/openvic-simulation/economy/production/ArtisanalProducer.cpp
index 33eb06de4..dff574119 100644
--- a/src/openvic-simulation/economy/production/ArtisanalProducer.cpp
+++ b/src/openvic-simulation/economy/production/ArtisanalProducer.cpp
@@ -5,6 +5,8 @@
 
 #include <type_safe/strong_typedef.hpp>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp"
 #include "openvic-simulation/core/random/RandomGenerator.hpp"
 #include "openvic-simulation/core/random/WeightedSampling.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
@@ -19,8 +21,6 @@
 #include "openvic-simulation/modifier/ModifierEffectCache.hpp"
 #include "openvic-simulation/population/Pop.hpp"
 #include "openvic-simulation/population/PopValuesFromProvince.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/types/fixed_point/Math.hpp"
 
 #include "ArtisanalProducerDeps.hpp"
 
diff --git a/src/openvic-simulation/economy/production/ArtisanalProducer.hpp b/src/openvic-simulation/economy/production/ArtisanalProducer.hpp
index fe7f75dc3..12e6ed9b2 100644
--- a/src/openvic-simulation/economy/production/ArtisanalProducer.hpp
+++ b/src/openvic-simulation/economy/production/ArtisanalProducer.hpp
@@ -5,10 +5,10 @@
 
 #include "openvic-simulation/core/memory/Vector.hpp"
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Fraction.hpp"
 #include "openvic-simulation/core/stl/containers/TypedSpan.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp"
-#include "openvic-simulation/types/fixed_point/Fraction.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
diff --git a/src/openvic-simulation/economy/production/Employee.hpp b/src/openvic-simulation/economy/production/Employee.hpp
index 43c2612cb..084d7ed30 100644
--- a/src/openvic-simulation/economy/production/Employee.hpp
+++ b/src/openvic-simulation/economy/production/Employee.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/population/PopSize.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
diff --git a/src/openvic-simulation/economy/production/FactoryProducer.hpp b/src/openvic-simulation/economy/production/FactoryProducer.hpp
index 380419e9a..677316506 100644
--- a/src/openvic-simulation/economy/production/FactoryProducer.hpp
+++ b/src/openvic-simulation/economy/production/FactoryProducer.hpp
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
 #include "openvic-simulation/population/PopSize.hpp"
diff --git a/src/openvic-simulation/economy/production/ProductionType.hpp b/src/openvic-simulation/economy/production/ProductionType.hpp
index 361dd0fa6..e12dc14bf 100644
--- a/src/openvic-simulation/economy/production/ProductionType.hpp
+++ b/src/openvic-simulation/economy/production/ProductionType.hpp
@@ -3,12 +3,12 @@
 #include <openvic-dataloader/v2script/Parser.hpp>
 
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/stl/containers/TypedSpan.hpp"
 #include "openvic-simulation/population/PopSize.hpp"
 #include "openvic-simulation/scripts/ConditionScript.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
 #include "openvic-simulation/types/IndexedFlatMap.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/PopSprite.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 
diff --git a/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp b/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp
index 8bc0435ba..7984a6575 100644
--- a/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp
+++ b/src/openvic-simulation/economy/production/ResourceGatheringOperation.cpp
@@ -2,6 +2,8 @@
 
 #include <type_safe/strong_typedef.hpp>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/economy/GoodDefinition.hpp"
 #include "openvic-simulation/economy/production/ProductionType.hpp"
@@ -16,8 +18,6 @@
 #include "openvic-simulation/population/PopSum.hpp"
 #include "openvic-simulation/population/PopType.hpp"
 #include "openvic-simulation/types/ConstructorTags.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/types/fixed_point/Math.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
 
diff --git a/src/openvic-simulation/economy/production/ResourceGatheringOperation.hpp b/src/openvic-simulation/economy/production/ResourceGatheringOperation.hpp
index f471366a3..edf8fc04d 100644
--- a/src/openvic-simulation/economy/production/ResourceGatheringOperation.hpp
+++ b/src/openvic-simulation/economy/production/ResourceGatheringOperation.hpp
@@ -4,8 +4,8 @@
 
 #include "openvic-simulation/core/memory/FixedVector.hpp"
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/economy/production/Employee.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/population/PopSize.hpp"
 #include "openvic-simulation/population/PopSum.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
diff --git a/src/openvic-simulation/economy/trading/BuyResult.hpp b/src/openvic-simulation/economy/trading/BuyResult.hpp
index e12c5b42e..e0d7ffd10 100644
--- a/src/openvic-simulation/economy/trading/BuyResult.hpp
+++ b/src/openvic-simulation/economy/trading/BuyResult.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 
 namespace OpenVic {
diff --git a/src/openvic-simulation/economy/trading/GoodMarket.cpp b/src/openvic-simulation/economy/trading/GoodMarket.cpp
index 1b2ac01c3..0ca423743 100644
--- a/src/openvic-simulation/economy/trading/GoodMarket.cpp
+++ b/src/openvic-simulation/economy/trading/GoodMarket.cpp
@@ -3,12 +3,12 @@
 #include <algorithm>
 #include <mutex>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp"
 #include "openvic-simulation/economy/GoodDefinition.hpp"
 #include "openvic-simulation/economy/trading/BuyUpToOrder.hpp"
 #include "openvic-simulation/economy/trading/MarketSellOrder.hpp"
 #include "openvic-simulation/misc/GameRulesManager.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/types/fixed_point/Math.hpp"
 
 using namespace OpenVic;
 static constexpr size_t MONTHS_OF_PRICE_HISTORY = 36;
diff --git a/src/openvic-simulation/economy/trading/GoodMarket.hpp b/src/openvic-simulation/economy/trading/GoodMarket.hpp
index f09b83282..5b663d9a8 100644
--- a/src/openvic-simulation/economy/trading/GoodMarket.hpp
+++ b/src/openvic-simulation/economy/trading/GoodMarket.hpp
@@ -3,11 +3,11 @@
 #include <span>
 
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/stl/containers/TypedSpan.hpp"
 #include "openvic-simulation/core/thread/SpinMutex.hpp"
 #include "openvic-simulation/economy/trading/BuyUpToOrder.hpp"
 #include "openvic-simulation/economy/trading/MarketSellOrder.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/types/ValueHistory.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
diff --git a/src/openvic-simulation/economy/trading/MarketInstance.cpp b/src/openvic-simulation/economy/trading/MarketInstance.cpp
index b39cea789..1cced2ad4 100644
--- a/src/openvic-simulation/economy/trading/MarketInstance.cpp
+++ b/src/openvic-simulation/economy/trading/MarketInstance.cpp
@@ -1,11 +1,11 @@
 #include "MarketInstance.hpp"
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/defines/CountryDefines.hpp"
 #include "openvic-simulation/economy/GoodDefinition.hpp"
 #include "openvic-simulation/economy/GoodInstance.hpp"
 #include "openvic-simulation/economy/trading/BuyUpToOrder.hpp"
 #include "openvic-simulation/economy/trading/MarketSellOrder.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/utility/ThreadPool.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 
diff --git a/src/openvic-simulation/economy/trading/MarketInstance.hpp b/src/openvic-simulation/economy/trading/MarketInstance.hpp
index dd524da2e..038ddfbae 100644
--- a/src/openvic-simulation/economy/trading/MarketInstance.hpp
+++ b/src/openvic-simulation/economy/trading/MarketInstance.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "openvic-simulation/core/memory/Vector.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 
 namespace OpenVic {
diff --git a/src/openvic-simulation/economy/trading/SellResult.hpp b/src/openvic-simulation/economy/trading/SellResult.hpp
index 31cd47d36..54b75fd2c 100644
--- a/src/openvic-simulation/economy/trading/SellResult.hpp
+++ b/src/openvic-simulation/economy/trading/SellResult.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 
 namespace OpenVic {
diff --git a/src/openvic-simulation/history/CountryHistory.cpp b/src/openvic-simulation/history/CountryHistory.cpp
index 8a523256e..4c3697266 100644
--- a/src/openvic-simulation/history/CountryHistory.cpp
+++ b/src/openvic-simulation/history/CountryHistory.cpp
@@ -1,10 +1,10 @@
 #include "CountryHistory.hpp"
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/country/CountryDefinition.hpp"
 #include "openvic-simulation/DefinitionManager.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/politics/Government.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/core/FormatValidate.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/map/MapDefinition.cpp b/src/openvic-simulation/map/MapDefinition.cpp
index 728bdf19c..a901a79f7 100644
--- a/src/openvic-simulation/map/MapDefinition.cpp
+++ b/src/openvic-simulation/map/MapDefinition.cpp
@@ -19,6 +19,8 @@
 #include "openvic-simulation/core/FormatValidate.hpp"
 #include "openvic-simulation/core/io/BMP.hpp"
 #include "openvic-simulation/core/object/Colour.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp"
 #include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/stl/containers/TypedSpan.hpp"
 #include "openvic-simulation/core/string/CharConv.hpp"
@@ -26,8 +28,6 @@
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/map/ProvinceDefinition.hpp"
 #include "openvic-simulation/modifier/ModifierManager.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/types/fixed_point/Math.hpp"
 #include "openvic-simulation/types/OrderedContainersMath.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
 
diff --git a/src/openvic-simulation/map/ProvinceDefinition.cpp b/src/openvic-simulation/map/ProvinceDefinition.cpp
index ee0a49181..daa0dd0e1 100644
--- a/src/openvic-simulation/map/ProvinceDefinition.cpp
+++ b/src/openvic-simulation/map/ProvinceDefinition.cpp
@@ -2,10 +2,10 @@
 
 #include <fmt/format.h>
 
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/economy/BuildingType.hpp"
 #include "openvic-simulation/map/MapDefinition.hpp"
-#include "openvic-simulation/types/fixed_point/Math.hpp"
 
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
diff --git a/src/openvic-simulation/map/ProvinceDefinition.hpp b/src/openvic-simulation/map/ProvinceDefinition.hpp
index 5f9880952..2954fa53c 100644
--- a/src/openvic-simulation/map/ProvinceDefinition.hpp
+++ b/src/openvic-simulation/map/ProvinceDefinition.hpp
@@ -6,9 +6,9 @@
 #include <type_safe/strong_typedef.hpp>
 
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp"
 #include "openvic-simulation/types/HasIdentifier.hpp"
 #include "openvic-simulation/types/HasIndex.hpp"
diff --git a/src/openvic-simulation/map/State.cpp b/src/openvic-simulation/map/State.cpp
index 083f48618..6aa2acf70 100644
--- a/src/openvic-simulation/map/State.cpp
+++ b/src/openvic-simulation/map/State.cpp
@@ -1,6 +1,7 @@
 #include "State.hpp"
 
 #include "openvic-simulation/core/error/ErrorMacros.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/map/MapDefinition.hpp"
 #include "openvic-simulation/map/MapInstance.hpp"
@@ -10,7 +11,6 @@
 #include "openvic-simulation/population/PopsAggregateDeps.hpp"
 #include "openvic-simulation/population/PopType.hpp"
 #include "openvic-simulation/types/ConstructorTags.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 using namespace OpenVic;
 
diff --git a/src/openvic-simulation/map/State.hpp b/src/openvic-simulation/map/State.hpp
index 14573c7a9..b87c804a3 100644
--- a/src/openvic-simulation/map/State.hpp
+++ b/src/openvic-simulation/map/State.hpp
@@ -7,10 +7,10 @@
 #include "openvic-simulation/core/memory/Colony.hpp"
 #include "openvic-simulation/core/memory/FixedVector.hpp"
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/portable/ForwardableSpan.hpp"
 #include "openvic-simulation/population/PopsAggregate.hpp"
 #include "openvic-simulation/types/ColonyStatus.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
diff --git a/src/openvic-simulation/military/Leader.hpp b/src/openvic-simulation/military/Leader.hpp
index 8867f183f..cdaf47e3c 100644
--- a/src/openvic-simulation/military/Leader.hpp
+++ b/src/openvic-simulation/military/Leader.hpp
@@ -3,7 +3,7 @@
 #include <string_view>
 
 #include "openvic-simulation/core/object/Date.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/types/UnitBranchType.hpp"
 #include "openvic-simulation/types/UniqueId.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
diff --git a/src/openvic-simulation/military/UnitInstance.hpp b/src/openvic-simulation/military/UnitInstance.hpp
index 9b3a57d6d..b472ac3c3 100644
--- a/src/openvic-simulation/military/UnitInstance.hpp
+++ b/src/openvic-simulation/military/UnitInstance.hpp
@@ -2,8 +2,8 @@
 
 #include <string_view>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/military/UnitType.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/UnitBranchType.hpp"
 #include "openvic-simulation/types/UniqueId.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
diff --git a/src/openvic-simulation/military/UnitInstanceGroup.hpp b/src/openvic-simulation/military/UnitInstanceGroup.hpp
index ee2804ab7..aa3301cba 100644
--- a/src/openvic-simulation/military/UnitInstanceGroup.hpp
+++ b/src/openvic-simulation/military/UnitInstanceGroup.hpp
@@ -4,10 +4,10 @@
 #include <string_view>
 
 #include "openvic-simulation/core/memory/Colony.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/military/Leader.hpp"
 #include "openvic-simulation/military/UnitInstance.hpp"
 #include "openvic-simulation/military/UnitType.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/UnitBranchType.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
diff --git a/src/openvic-simulation/military/UnitType.hpp b/src/openvic-simulation/military/UnitType.hpp
index cd874dc44..62afbf556 100644
--- a/src/openvic-simulation/military/UnitType.hpp
+++ b/src/openvic-simulation/military/UnitType.hpp
@@ -5,6 +5,7 @@
 
 #include <openvic-dataloader/v2script/Parser.hpp>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/object/Timespan.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/economy/GoodDefinition.hpp"
@@ -12,7 +13,6 @@
 #include "openvic-simulation/types/HasIdentifier.hpp"
 #include "openvic-simulation/types/HasIndex.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/types/UnitBranchType.hpp"
 
diff --git a/src/openvic-simulation/misc/GameAction.hpp b/src/openvic-simulation/misc/GameAction.hpp
index 8d4096034..cb6ce2501 100644
--- a/src/openvic-simulation/misc/GameAction.hpp
+++ b/src/openvic-simulation/misc/GameAction.hpp
@@ -9,8 +9,8 @@
 
 #include <type_safe/strong_typedef.hpp>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/population/PopIdInProvince.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/types/UniqueId.hpp"
 #include "openvic-simulation/types/UnitBranchType.hpp"
diff --git a/src/openvic-simulation/misc/SoundEffect.hpp b/src/openvic-simulation/misc/SoundEffect.hpp
index 628090b98..ea698bba3 100644
--- a/src/openvic-simulation/misc/SoundEffect.hpp
+++ b/src/openvic-simulation/misc/SoundEffect.hpp
@@ -2,8 +2,8 @@
 
 #include <filesystem>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/types/IdentifierRegistry.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/HasIdentifier.hpp"
 
 namespace OpenVic {
diff --git a/src/openvic-simulation/modifier/ModifierSum.hpp b/src/openvic-simulation/modifier/ModifierSum.hpp
index fb08bf715..a8474b83f 100644
--- a/src/openvic-simulation/modifier/ModifierSum.hpp
+++ b/src/openvic-simulation/modifier/ModifierSum.hpp
@@ -5,11 +5,11 @@
 
 #include "openvic-simulation/core/stl/containers/BulkInsertWrapper.hpp"
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/portable/ForwardableSpan.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/modifier/ModifierValue.hpp"
 #include "openvic-simulation/modifier/Modifier.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 namespace OpenVic {
 	struct CountryInstance;
diff --git a/src/openvic-simulation/pathfinding/AStarPathing.cpp b/src/openvic-simulation/pathfinding/AStarPathing.cpp
index 062966390..42de33dea 100644
--- a/src/openvic-simulation/pathfinding/AStarPathing.cpp
+++ b/src/openvic-simulation/pathfinding/AStarPathing.cpp
@@ -8,6 +8,7 @@
 
 #include <tsl/ordered_set.h>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/map/MapDefinition.hpp"
@@ -15,7 +16,6 @@
 #include "openvic-simulation/map/ProvinceInstance.hpp"
 #include "openvic-simulation/military/UnitInstanceGroup.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 using namespace OpenVic;
 
diff --git a/src/openvic-simulation/pathfinding/AStarPathing.hpp b/src/openvic-simulation/pathfinding/AStarPathing.hpp
index ff2be0b7f..4ee8889c3 100644
--- a/src/openvic-simulation/pathfinding/AStarPathing.hpp
+++ b/src/openvic-simulation/pathfinding/AStarPathing.hpp
@@ -5,8 +5,8 @@
 #include <tsl/ordered_map.h>
 #include <tsl/ordered_set.h>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/pathfinding/PathingBase.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/UnitBranchType.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
diff --git a/src/openvic-simulation/pathfinding/FringePathing.cpp b/src/openvic-simulation/pathfinding/FringePathing.cpp
index 67c9e1abc..b1d2a77a5 100644
--- a/src/openvic-simulation/pathfinding/FringePathing.cpp
+++ b/src/openvic-simulation/pathfinding/FringePathing.cpp
@@ -9,8 +9,8 @@
 #include <tsl/ordered_map.h>
 #include <tsl/ordered_set.h>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 using namespace OpenVic;
 
diff --git a/src/openvic-simulation/pathfinding/FringePathing.hpp b/src/openvic-simulation/pathfinding/FringePathing.hpp
index 72123ac48..625c8dcfa 100644
--- a/src/openvic-simulation/pathfinding/FringePathing.hpp
+++ b/src/openvic-simulation/pathfinding/FringePathing.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/pathfinding/PathingBase.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 namespace OpenVic {
 	struct FringePathingNode final : public PathingNodeBase<FringePathingNode> {
diff --git a/src/openvic-simulation/pathfinding/PathingBase.hpp b/src/openvic-simulation/pathfinding/PathingBase.hpp
index ca7b73f34..fa0b6ebbf 100644
--- a/src/openvic-simulation/pathfinding/PathingBase.hpp
+++ b/src/openvic-simulation/pathfinding/PathingBase.hpp
@@ -10,10 +10,10 @@
 #include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/core/memory/Formatting.hpp"
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
 #include "openvic-simulation/types/Signal.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/types/fixed_point/Math.hpp"
 
 namespace OpenVic {
 	template<typename ValueT, typename KeyT = PointMap::points_key_type>
diff --git a/src/openvic-simulation/pathfinding/PointMap.cpp b/src/openvic-simulation/pathfinding/PointMap.cpp
index b4f2e5bb6..dabab048e 100644
--- a/src/openvic-simulation/pathfinding/PointMap.cpp
+++ b/src/openvic-simulation/pathfinding/PointMap.cpp
@@ -12,9 +12,9 @@
 
 #include "openvic-simulation/core/error/ErrorMacros.hpp"
 #include "openvic-simulation/core/memory/Formatting.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 using namespace OpenVic;
 
diff --git a/src/openvic-simulation/pathfinding/PointMap.hpp b/src/openvic-simulation/pathfinding/PointMap.hpp
index 4213fdcb0..4a642b3f1 100644
--- a/src/openvic-simulation/pathfinding/PointMap.hpp
+++ b/src/openvic-simulation/pathfinding/PointMap.hpp
@@ -10,9 +10,9 @@
 #include <tsl/ordered_set.h>
 
 #include "openvic-simulation/core/Hash.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/core/template/EnumBitfield.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/Signal.hpp"
 
 namespace OpenVic {
diff --git a/src/openvic-simulation/population/Pop.cpp b/src/openvic-simulation/population/Pop.cpp
index 4e90ecf2b..ef887fe2e 100644
--- a/src/openvic-simulation/population/Pop.cpp
+++ b/src/openvic-simulation/population/Pop.cpp
@@ -11,6 +11,8 @@
 #include <type_safe/strong_typedef.hpp>
 
 #include "openvic-simulation/core/error/ErrorMacros.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp"
 #include "openvic-simulation/core/stl/containers/TypedSpan.hpp"
 #include "openvic-simulation/core/Typedefs.hpp"
 #include "openvic-simulation/country/CountryDefinition.hpp"
@@ -37,9 +39,7 @@
 #include "openvic-simulation/population/PopsAggregateDeps.hpp"
 #include "openvic-simulation/population/Religion.hpp"
 #include "openvic-simulation/types/ConstructorTags.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp"
-#include "openvic-simulation/types/fixed_point/Math.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/utility/Logger.hpp"
diff --git a/src/openvic-simulation/population/Pop.hpp b/src/openvic-simulation/population/Pop.hpp
index 838edd327..475412719 100644
--- a/src/openvic-simulation/population/Pop.hpp
+++ b/src/openvic-simulation/population/Pop.hpp
@@ -6,13 +6,13 @@
 #include <type_safe/strong_typedef.hpp>
 
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Atomic.hpp"
 #include "openvic-simulation/core/portable/ForwardableSpan.hpp"
 #include "openvic-simulation/economy/production/ArtisanalProducer.hpp"
 #include "openvic-simulation/population/PopIdInProvince.hpp"
 #include "openvic-simulation/population/PopNeedsMacro.hpp"
 #include "openvic-simulation/population/PopSize.hpp"
-#include "openvic-simulation/types/fixed_point/Atomic.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp"
 #include "openvic-simulation/types/UnitBranchType.hpp"
 
diff --git a/src/openvic-simulation/population/PopSize.hpp b/src/openvic-simulation/population/PopSize.hpp
index 340ccae44..94cafd06d 100644
--- a/src/openvic-simulation/population/PopSize.hpp
+++ b/src/openvic-simulation/population/PopSize.hpp
@@ -7,7 +7,7 @@
 
 #include <type_safe/strong_typedef.hpp>
 
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 
 namespace OpenVic {
 	struct pop_size_t : type_safe::strong_typedef<pop_size_t, std::int32_t>,
diff --git a/src/openvic-simulation/population/PopSum.hpp b/src/openvic-simulation/population/PopSum.hpp
index 59984489a..6b89f3749 100644
--- a/src/openvic-simulation/population/PopSum.hpp
+++ b/src/openvic-simulation/population/PopSum.hpp
@@ -8,8 +8,8 @@
 
 #include <type_safe/strong_typedef.hpp>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/population/PopSize.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 namespace OpenVic {
 	namespace detail {
diff --git a/src/openvic-simulation/population/PopType.hpp b/src/openvic-simulation/population/PopType.hpp
index 2bef12ef1..4d7621b8f 100644
--- a/src/openvic-simulation/population/PopType.hpp
+++ b/src/openvic-simulation/population/PopType.hpp
@@ -3,8 +3,8 @@
 #include <functional>
 
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/scripts/ConditionalWeight.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp"
 #include "openvic-simulation/types/HasIdentifier.hpp"
 #include "openvic-simulation/types/HasIndex.hpp"
diff --git a/src/openvic-simulation/population/PopValuesFromProvince.cpp b/src/openvic-simulation/population/PopValuesFromProvince.cpp
index d40f71ba6..95919e8b2 100644
--- a/src/openvic-simulation/population/PopValuesFromProvince.cpp
+++ b/src/openvic-simulation/population/PopValuesFromProvince.cpp
@@ -1,6 +1,7 @@
 #include "PopValuesFromProvince.hpp"
 #include <algorithm>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/defines/PopsDefines.hpp"
 #include "openvic-simulation/economy/GoodInstance.hpp"
@@ -9,7 +10,6 @@
 #include "openvic-simulation/modifier/ModifierEffectCache.hpp"
 #include "openvic-simulation/map/ProvinceInstance.hpp"
 #include "openvic-simulation/misc/GameRulesManager.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 using namespace OpenVic;
 
diff --git a/src/openvic-simulation/population/PopValuesFromProvince.hpp b/src/openvic-simulation/population/PopValuesFromProvince.hpp
index 60820c63d..c072a948d 100644
--- a/src/openvic-simulation/population/PopValuesFromProvince.hpp
+++ b/src/openvic-simulation/population/PopValuesFromProvince.hpp
@@ -2,7 +2,7 @@
 
 #include "openvic-simulation/core/memory/FixedVector.hpp"
 #include "openvic-simulation/core/memory/Vector.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 
diff --git a/src/openvic-simulation/population/PopsAggregate.cpp b/src/openvic-simulation/population/PopsAggregate.cpp
index 05eeb25a1..9014451fe 100644
--- a/src/openvic-simulation/population/PopsAggregate.cpp
+++ b/src/openvic-simulation/population/PopsAggregate.cpp
@@ -5,13 +5,13 @@
 
 #include <type_safe/strong_typedef.hpp>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/country/CountryDefinition.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/population/Pop.hpp"
 #include "openvic-simulation/population/PopsAggregateDeps.hpp"
 #include "openvic-simulation/population/PopType.hpp"
 #include "openvic-simulation/types/ConstructorTags.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/OrderedContainersMath.hpp"
 
 using namespace OpenVic;
diff --git a/src/openvic-simulation/population/PopsAggregate.hpp b/src/openvic-simulation/population/PopsAggregate.hpp
index e0d028b33..d6f38e380 100644
--- a/src/openvic-simulation/population/PopsAggregate.hpp
+++ b/src/openvic-simulation/population/PopsAggregate.hpp
@@ -3,8 +3,8 @@
 #include <boost/int128/detail/int128_imp.hpp>
 
 #include "openvic-simulation/core/memory/FixedVector.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/population/PopSum.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/fixed_point/FixedPointMap.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
diff --git a/src/openvic-simulation/scripts/ConditionalWeight.hpp b/src/openvic-simulation/scripts/ConditionalWeight.hpp
index fe45d7d0d..d62fc42a1 100644
--- a/src/openvic-simulation/scripts/ConditionalWeight.hpp
+++ b/src/openvic-simulation/scripts/ConditionalWeight.hpp
@@ -3,9 +3,9 @@
 #include <variant>
 
 #include "openvic-simulation/core/memory/Vector.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/dataloader/NodeTools.hpp"
 #include "openvic-simulation/scripts/ConditionScript.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 namespace OpenVic {
 	enum class conditional_weight_type_t : uint8_t {
diff --git a/src/openvic-simulation/types/ClampedValue.hpp b/src/openvic-simulation/types/ClampedValue.hpp
index 5aea6bf64..4427f9bc1 100644
--- a/src/openvic-simulation/types/ClampedValue.hpp
+++ b/src/openvic-simulation/types/ClampedValue.hpp
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/utility/Getters.hpp"
 #include "openvic-simulation/utility/reactive/MutableState.hpp"
 
diff --git a/src/openvic-simulation/types/fixed_point/FixedPointMap.hpp b/src/openvic-simulation/types/fixed_point/FixedPointMap.hpp
index 82762167f..90c1a08c4 100644
--- a/src/openvic-simulation/types/fixed_point/FixedPointMap.hpp
+++ b/src/openvic-simulation/types/fixed_point/FixedPointMap.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/types/OrderedContainers.hpp"
 #include "openvic-simulation/types/OrderedContainersMath.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 namespace OpenVic {
 
diff --git a/src/openvic-simulation/utility/ThreadPool.cpp b/src/openvic-simulation/utility/ThreadPool.cpp
index 77c02f9b3..49610f095 100644
--- a/src/openvic-simulation/utility/ThreadPool.cpp
+++ b/src/openvic-simulation/utility/ThreadPool.cpp
@@ -5,13 +5,13 @@
 #include <span>
 #include <thread>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/stl/containers/TypedSpan.hpp"
 #include "openvic-simulation/country/CountryInstance.hpp"
 #include "openvic-simulation/economy/GoodDefinition.hpp" // IWYU pragma: keep for constructor requirement
 #include "openvic-simulation/economy/GoodInstance.hpp"
 #include "openvic-simulation/economy/trading/GoodMarket.hpp"
 #include "openvic-simulation/map/ProvinceInstance.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 
 using namespace OpenVic;
diff --git a/tests/src/types/Approx.hpp b/tests/src/core/object/Approx.hpp
similarity index 97%
rename from tests/src/types/Approx.hpp
rename to tests/src/core/object/Approx.hpp
index 15cd50a22..b7080d470 100644
--- a/tests/src/types/Approx.hpp
+++ b/tests/src/core/object/Approx.hpp
@@ -6,6 +6,7 @@
 #include <limits>
 
 #include "openvic-simulation/core/Math.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp" // IWYU pragma: keep
 #include "openvic-simulation/core/object/Vector.hpp"
 
 #include "core/object/Vector.hpp" // IWYU pragma: keep
diff --git a/tests/src/core/object/Colour.cpp b/tests/src/core/object/Colour.cpp
index 14548416e..6a6ba9159 100644
--- a/tests/src/core/object/Colour.cpp
+++ b/tests/src/core/object/Colour.cpp
@@ -5,9 +5,9 @@
 
 #include <fmt/format.h>
 
-#include "Colour.hpp" // IWYU pragma: keep
+#include "core/object/Colour.hpp" // IWYU pragma: keep
+#include "core/object/Numeric.hpp" // IWYU pragma: keep
 #include "Helper.hpp" // IWYU pragma: keep
-#include "types/Numeric.hpp" // IWYU pragma: keep
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_constexpr.hpp>
 #include <snitch/snitch_macros_misc.hpp>
diff --git a/tests/src/types/FixedPoint.cpp b/tests/src/core/object/FixedPoint.cpp
similarity index 98%
rename from tests/src/types/FixedPoint.cpp
rename to tests/src/core/object/FixedPoint.cpp
index efbbab8ba..7ca6cf746 100644
--- a/tests/src/types/FixedPoint.cpp
+++ b/tests/src/core/object/FixedPoint.cpp
@@ -1,6 +1,4 @@
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/types/fixed_point/String.hpp"
-#include "openvic-simulation/types/fixed_point/Math.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 
 #include <cstdint>
 #include <limits>
@@ -8,9 +6,12 @@
 #include <string_view>
 #include <system_error>
 
-#include "Approx.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp"
+#include "openvic-simulation/core/object/FixedPoint/String.hpp"
+
+#include "core/object/Approx.hpp"
+#include "core/object/Numeric.hpp" // IWYU pragma: keep
 #include "Helper.hpp" // IWYU pragma: keep
-#include "Numeric.hpp" // IWYU pragma: keep
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_constexpr.hpp>
 #include <snitch/snitch_macros_misc.hpp>
diff --git a/tests/src/types/AtomicFixedPoint.cpp b/tests/src/core/object/FixedPoint/Atomic.cpp
similarity index 88%
rename from tests/src/types/AtomicFixedPoint.cpp
rename to tests/src/core/object/FixedPoint/Atomic.cpp
index b06c1f3b8..ec1232b21 100644
--- a/tests/src/types/AtomicFixedPoint.cpp
+++ b/tests/src/core/object/FixedPoint/Atomic.cpp
@@ -1,11 +1,12 @@
+#include "openvic-simulation/core/object/FixedPoint/Atomic.hpp"
+
 #include <thread>
 #include <vector>
 
-#include "openvic-simulation/types/fixed_point/Atomic.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 
+#include "core/object/Numeric.hpp" // IWYU pragma: keep
 #include "Helper.hpp" // IWYU pragma: keep
-#include "Numeric.hpp" // IWYU pragma: keep
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_misc.hpp>
 #include <snitch/snitch_macros_test_case.hpp>
diff --git a/tests/src/types/Numeric.hpp b/tests/src/core/object/Numeric.hpp
similarity index 92%
rename from tests/src/types/Numeric.hpp
rename to tests/src/core/object/Numeric.hpp
index d7e2cfd13..9b88bb09e 100644
--- a/tests/src/types/Numeric.hpp
+++ b/tests/src/core/object/Numeric.hpp
@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 
 #include <snitch/snitch_string.hpp>
 #include <snitch/snitch_string_utility.hpp>
diff --git a/tests/src/core/object/Vector.hpp b/tests/src/core/object/Vector.hpp
index a519b8dec..dbb7d4566 100644
--- a/tests/src/core/object/Vector.hpp
+++ b/tests/src/core/object/Vector.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/object/Vector.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
-#include "types/Numeric.hpp"
+#include "core/object/Numeric.hpp"
 #include <snitch/snitch_string.hpp>
 #include <snitch/snitch_string_utility.hpp>
 
diff --git a/tests/src/core/object/Vector2.cpp b/tests/src/core/object/Vector2.cpp
index ba2da45d2..4f1904e86 100644
--- a/tests/src/core/object/Vector2.cpp
+++ b/tests/src/core/object/Vector2.cpp
@@ -1,14 +1,14 @@
 #include <cmath>
 #include <cstdlib>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp"
 #include "openvic-simulation/core/object/Vector.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/types/fixed_point/Math.hpp"
 
+#include "core/object/Approx.hpp"
+#include "core/object/Numeric.hpp"
+#include "core/object/Vector.hpp"
 #include "Helper.hpp" // IWYU pragma: keep
-#include "types/Approx.hpp"
-#include "types/Numeric.hpp"
-#include "Vector.hpp"
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_constexpr.hpp>
 #include <snitch/snitch_macros_misc.hpp>
diff --git a/tests/src/core/object/Vector3.cpp b/tests/src/core/object/Vector3.cpp
index a7fd32f50..11ab62f65 100644
--- a/tests/src/core/object/Vector3.cpp
+++ b/tests/src/core/object/Vector3.cpp
@@ -1,14 +1,14 @@
 #include <cmath>
 #include <cstdlib>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp"
 #include "openvic-simulation/core/object/Vector.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/types/fixed_point/Math.hpp"
 
+#include "core/object/Approx.hpp"
+#include "core/object/Numeric.hpp"
+#include "core/object/Vector.hpp"
 #include "Helper.hpp" // IWYU pragma: keep
-#include "types/Approx.hpp"
-#include "types/Numeric.hpp"
-#include "Vector.hpp"
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_constexpr.hpp>
 #include <snitch/snitch_macros_misc.hpp>
diff --git a/tests/src/core/object/Vector4.cpp b/tests/src/core/object/Vector4.cpp
index b7e26233f..1de334853 100644
--- a/tests/src/core/object/Vector4.cpp
+++ b/tests/src/core/object/Vector4.cpp
@@ -1,13 +1,14 @@
 #include <cmath>
 #include <cstdlib>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/Math.hpp"
 #include "openvic-simulation/core/object/Vector.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/types/fixed_point/Math.hpp"
 
+#include "core/object/Approx.hpp"
+#include "core/object/Numeric.hpp"
+#include "core/object/Vector.hpp" // IWYU pragma: keep
 #include "Helper.hpp" // IWYU pragma: keep
-#include "types/Approx.hpp"
-#include "types/Numeric.hpp"
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_constexpr.hpp>
 #include <snitch/snitch_macros_misc.hpp>
diff --git a/tests/src/core/random/WeightedSampling.cpp b/tests/src/core/random/WeightedSampling.cpp
index 2ccb0d963..5eb1ad2d1 100644
--- a/tests/src/core/random/WeightedSampling.cpp
+++ b/tests/src/core/random/WeightedSampling.cpp
@@ -1,10 +1,11 @@
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/core/random/WeightedSampling.hpp"
 
 #include <cstdint>
 #include <limits>
 #include <boost/int128.hpp>
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_test_case.hpp>
 
diff --git a/tests/src/dataloader/NodeTools.cpp b/tests/src/dataloader/NodeTools.cpp
index 906dc6c2e..b3a33ced0 100644
--- a/tests/src/dataloader/NodeTools.cpp
+++ b/tests/src/dataloader/NodeTools.cpp
@@ -24,14 +24,14 @@
 
 #include "openvic-simulation/core/object/Colour.hpp"
 #include "openvic-simulation/core/object/Date.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint/String.hpp"
 #include "openvic-simulation/core/object/Timespan.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
-#include "openvic-simulation/types/fixed_point/String.hpp"
 #include "openvic-simulation/core/string/CharConv.hpp"
 
-#include "../core/object/Colour.hpp" // IWYU pragma: keep
+#include "core/object/Colour.hpp" // IWYU pragma: keep
+#include "core/object/Numeric.hpp" // IWYU pragma: keep
 #include "Helper.hpp" // IWYU pragma: keep
-#include "types/Numeric.hpp" // IWYU pragma: keep
 #include <snitch/snitch_macros_check.hpp>
 #include <snitch/snitch_macros_constexpr.hpp>
 #include <snitch/snitch_macros_misc.hpp>
diff --git a/tests/src/economy/trading/GoodMarket.cpp b/tests/src/economy/trading/GoodMarket.cpp
index 6e1effad4..1036a3314 100644
--- a/tests/src/economy/trading/GoodMarket.cpp
+++ b/tests/src/economy/trading/GoodMarket.cpp
@@ -4,9 +4,9 @@
 #include <optional>
 
 #include "openvic-simulation/core/object/Colour.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/stl/containers/TypedSpan.hpp"
 #include "openvic-simulation/misc/GameRulesManager.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 #include "openvic-simulation/types/TypedIndices.hpp"
 
 #include <snitch/snitch_macros_check.hpp>
diff --git a/tests/src/ecs/KeyedReductions.cpp b/tests/src/ecs/KeyedReductions.cpp
index bcab48730..532371db2 100644
--- a/tests/src/ecs/KeyedReductions.cpp
+++ b/tests/src/ecs/KeyedReductions.cpp
@@ -1,6 +1,6 @@
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/ecs/EcsThreadPool.hpp"
 #include "openvic-simulation/ecs/Reductions.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 #include <cstdint>
 #include <span>
diff --git a/tests/src/pathfinding/AStarPathing.cpp b/tests/src/pathfinding/AStarPathing.cpp
index 07e5fb4c1..560583e91 100644
--- a/tests/src/pathfinding/AStarPathing.cpp
+++ b/tests/src/pathfinding/AStarPathing.cpp
@@ -1,8 +1,8 @@
 #include "openvic-simulation/pathfinding/AStarPathing.hpp"
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 #include "Helper.hpp"
 #include "pathfinding/Pathing.hpp"
diff --git a/tests/src/pathfinding/FringePathing.cpp b/tests/src/pathfinding/FringePathing.cpp
index 8ee448e31..18e1f9903 100644
--- a/tests/src/pathfinding/FringePathing.cpp
+++ b/tests/src/pathfinding/FringePathing.cpp
@@ -1,8 +1,8 @@
 #include "openvic-simulation/pathfinding/FringePathing.hpp"
 
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 #include "openvic-simulation/core/object/Vector.hpp"
 #include "openvic-simulation/pathfinding/PointMap.hpp"
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
 
 #include "Helper.hpp"
 #include "pathfinding/Pathing.hpp"
diff --git a/tests/src/pathfinding/PointMap.cpp b/tests/src/pathfinding/PointMap.cpp
index 21951a1fb..9f51763a6 100644
--- a/tests/src/pathfinding/PointMap.cpp
+++ b/tests/src/pathfinding/PointMap.cpp
@@ -1,6 +1,6 @@
 #include "openvic-simulation/pathfinding/PointMap.hpp"
 
-#include "openvic-simulation/types/fixed_point/FixedPoint.hpp"
+#include "openvic-simulation/core/object/FixedPoint.hpp"
 
 #include "Helper.hpp" // IWYU pragma: keep
 #include <snitch/snitch.hpp>