Merge pull request #14 from OpenVicProject/dataloading

Dataloading scaffolding + basic culture and pop history loading

30 files changed, 0 insertions, 2836 deletions

diff --git a/src/openvic/Date.cpp b/src/openvic/Date.cpp
deleted file mode 100644
index 7c37386..0000000
--- a/src/openvic/Date.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-#include "Date.hpp"
-
-#include <algorithm>
-#include <cassert>
-#include <cctype>
-#include <charconv>
-
-#include "utility/Logger.hpp"
-
-using namespace OpenVic;
-
-Timespan::Timespan(day_t value) : days { value } {}
-
-bool Timespan::operator<(Timespan other) const { return days < other.days; };
-bool Timespan::operator>(Timespan other) const { return days > other.days; };
-bool Timespan::operator<=(Timespan other) const { return days <= other.days; };
-bool Timespan::operator>=(Timespan other) const { return days >= other.days; };
-bool Timespan::operator==(Timespan other) const { return days == other.days; };
-bool Timespan::operator!=(Timespan other) const { return days != other.days; };
-
-Timespan Timespan::operator+(Timespan other) const { return days + other.days; }
-
-Timespan Timespan::operator-(Timespan other) const { return days - other.days; }
-
-Timespan Timespan::operator*(day_t factor) const { return days * factor; }
-
-Timespan Timespan::operator/(day_t factor) const { return days / factor; }
-
-Timespan& Timespan::operator+=(Timespan other) {
-	days += other.days;
-	return *this;
-}
-
-Timespan& Timespan::operator-=(Timespan other) {
-	days -= other.days;
-	return *this;
-}
-
-Timespan& Timespan::operator++() {
-	days++;
-	return *this;
-}
-
-Timespan Timespan::operator++(int) {
-	Timespan old = *this;
-	++(*this);
-	return old;
-}
-
-Timespan::operator day_t() const {
-	return days;
-}
-
-Timespan::operator double() const {
-	return days;
-}
-
-Timespan::operator std::string() const {
-	return std::to_string(days);
-}
-
-std::ostream& OpenVic::operator<<(std::ostream& out, Timespan const& timespan) {
-	return out << static_cast<std::string>(timespan);
-}
-
-Timespan Date::_dateToTimespan(year_t year, month_t month, day_t day) {
-	month = std::clamp<month_t>(month, 1, MONTHS_IN_YEAR);
-	day = std::clamp<day_t>(day, 1, DAYS_IN_MONTH[month - 1]);
-	return year * DAYS_IN_YEAR + DAYS_UP_TO_MONTH[month - 1] + day - 1;
-}
-
-Timespan::day_t const* Date::DAYS_UP_TO_MONTH = generate_days_up_to_month();
-
-Timespan::day_t const* Date::generate_days_up_to_month() {
-	static Timespan::day_t days_up_to_month[MONTHS_IN_YEAR];
-	Timespan::day_t days = 0;
-	for (int month = 0; month < MONTHS_IN_YEAR;
-		days_up_to_month[month] = days, days += DAYS_IN_MONTH[month++]);
-	assert(days == DAYS_IN_YEAR);
-	return days_up_to_month;
-}
-
-Date::month_t const* Date::MONTH_FROM_DAY_IN_YEAR = generate_month_from_day_in_year();
-
-Date::month_t const* Date::generate_month_from_day_in_year() {
-	static month_t month_from_day_in_year[DAYS_IN_YEAR];
-	Timespan::day_t days_left = 0;
-	for (int day = 0, month = 0; day < DAYS_IN_YEAR;
-		days_left = (days_left > 0 ? days_left : DAYS_IN_MONTH[month++]) - 1,
-		month_from_day_in_year[day++] = month);
-	assert(days_left == 0);
-	assert(month_from_day_in_year[DAYS_IN_YEAR - 1] == MONTHS_IN_YEAR);
-	return month_from_day_in_year;
-}
-
-Date::Date(Timespan total_days) : timespan { total_days } {
-	if (timespan < 0) {
-		Logger::error("Invalid timespan for date: ", timespan, " (cannot be negative)");
-		timespan = 0;
-	}
-}
-
-Date::Date(year_t year, month_t month, day_t day) : timespan { _dateToTimespan(year, month, day) } {}
-
-Date::year_t Date::getYear() const {
-	return static_cast<Timespan::day_t>(timespan) / DAYS_IN_YEAR;
-}
-
-Date::month_t Date::getMonth() const {
-	return MONTH_FROM_DAY_IN_YEAR[static_cast<Timespan::day_t>(timespan) % DAYS_IN_YEAR];
-}
-
-Date::day_t Date::getDay() const {
-	return (static_cast<Timespan::day_t>(timespan) % DAYS_IN_YEAR) - DAYS_UP_TO_MONTH[getMonth() - 1] + 1;
-}
-
-bool Date::operator<(Date other) const { return timespan < other.timespan; };
-bool Date::operator>(Date other) const { return timespan > other.timespan; };
-bool Date::operator<=(Date other) const { return timespan <= other.timespan; };
-bool Date::operator>=(Date other) const { return timespan >= other.timespan; };
-bool Date::operator==(Date other) const { return timespan == other.timespan; };
-bool Date::operator!=(Date other) const { return timespan != other.timespan; };
-
-Date Date::operator+(Timespan other) const { return timespan + other; }
-
-Timespan Date::operator-(Date other) const { return timespan - other.timespan; }
-
-Date& Date::operator+=(Timespan other) {
-	timespan += other;
-	return *this;
-}
-
-Date& Date::operator-=(Timespan other) {
-	timespan -= other;
-	return *this;
-}
-
-Date& Date::operator++() {
-	timespan++;
-	return *this;
-}
-
-Date Date::operator++(int) {
-	Date old = *this;
-	++(*this);
-	return old;
-}
-
-Date::operator std::string() const {
-	std::stringstream ss;
-	ss << *this;
-	return ss.str();
-}
-
-std::ostream& OpenVic::operator<<(std::ostream& out, Date const& date) {
-	return out << static_cast<int>(date.getYear()) << '.' << static_cast<int>(date.getMonth()) << '.' << static_cast<int>(date.getDay());
-}
-
-// Parsed from string of the form YYYY.MM.DD
-Date Date::from_string(const std::string_view date) {
-	size_t first_pos = 0;
-	while (first_pos < date.length() && std::isdigit(date[first_pos])) {
-		first_pos++;
-	}
-
-	if (first_pos == 0) {
-		Logger::error("Failed to find year digits in date: ", date);
-		return {};
-	}
-
-	int val = 0;
-	char const* start = date.data();
-	char const* end = start + first_pos;
-	std::from_chars_result result = std::from_chars(start, end, val);
-	if (result.ec != std::errc{} || result.ptr != end || val < 0 || val >= 1 << (8 * sizeof(year_t))) {
-		Logger::error("Failed to read year: ", date);
-		return {};
-	}
-	year_t year = val;
-	month_t month = 1;
-	day_t day = 1;
-	if (first_pos < date.length()) {
-		if (date[first_pos] == '.') {
-			size_t second_pos = ++first_pos;
-			while (second_pos < date.length() && std::isdigit(date[second_pos])) {
-				second_pos++;
-			}
-			if (first_pos == second_pos) {
-				Logger::error("Failed to find month digits in date: ", date);
-			} else {
-				start = date.data() + first_pos;
-				end = date.data() + second_pos;
-				result = std::from_chars(start, end, val);
-				if (result.ec != std::errc{} || result.ptr != end || val < 1 || val > MONTHS_IN_YEAR) {
-					Logger::error("Failed to read month: ", date);
-				} else {
-					month = val;
-					if (second_pos < date.length()) {
-						if (date[second_pos] == '.') {
-							size_t third_pos = ++second_pos;
-							while (third_pos < date.length() && std::isdigit(date[third_pos])) {
-								third_pos++;
-							}
-							if (second_pos == third_pos) {
-								Logger::error("Failed to find day digits in date: ", date);
-							} else {
-								start = date.data() + second_pos;
-								end = date.data() + third_pos;
-								result = std::from_chars(start, end, val);
-								if (result.ec != std::errc{} || result.ptr != end || val < 1 || val > DAYS_IN_MONTH[month - 1]) {
-									Logger::error("Failed to read day: ", date);
-								} else {
-									day = val;
-									if (third_pos < date.length()) {
-										Logger::error("Unexpected string \"", date.substr(third_pos), "\" at the end of date ", date);
-									}
-								}
-							}
-						} else Logger::error("Unexpected character \"", date[second_pos], "\" in month of date ", date);
-					}
-				}
-			}
-		} else Logger::error("Unexpected character \"", date[first_pos], "\" in year of date ", date);
-	}
-	return _dateToTimespan(year, month, day);
-};
diff --git a/src/openvic/Date.hpp b/src/openvic/Date.hpp
deleted file mode 100644
index 2994523..0000000
--- a/src/openvic/Date.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <ostream>
-#include <string>
-
-namespace OpenVic {
-	// A relative period between points in time, measured in days
-	struct Timespan {
-		using day_t = int64_t;
-
-	private:
-		day_t days;
-
-	public:
-		Timespan(day_t value = 0);
-
-		bool operator<(Timespan other) const;
-		bool operator>(Timespan other) const;
-		bool operator<=(Timespan other) const;
-		bool operator>=(Timespan other) const;
-		bool operator==(Timespan other) const;
-		bool operator!=(Timespan other) const;
-
-		Timespan operator+(Timespan other) const;
-		Timespan operator-(Timespan other) const;
-		Timespan operator*(day_t factor) const;
-		Timespan operator/(day_t factor) const;
-		Timespan& operator+=(Timespan other);
-		Timespan& operator-=(Timespan other);
-		Timespan& operator++();
-		Timespan operator++(int);
-
-		explicit operator day_t() const;
-		explicit operator double() const;
-		explicit operator std::string() const;
-	};
-	std::ostream& operator<<(std::ostream& out, Timespan const& timespan);
-
-	// Represents an in-game date
-	// Note: Current implementation does not account for leap-years, or dates before Year 0
-	struct Date {
-		using year_t = uint16_t;
-		using month_t = uint8_t;
-		using day_t = uint8_t;
-
-		static constexpr Timespan::day_t MONTHS_IN_YEAR = 12;
-		static constexpr Timespan::day_t DAYS_IN_YEAR = 365;
-		static constexpr Timespan::day_t DAYS_IN_MONTH[MONTHS_IN_YEAR] { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-		static Timespan::day_t const* DAYS_UP_TO_MONTH;
-		static month_t const* MONTH_FROM_DAY_IN_YEAR;
-
-	private:
-		// Number of days since Jan 1st, Year 0
-		Timespan timespan;
-
-		static Timespan _dateToTimespan(year_t year, month_t month, day_t day);
-		static Timespan::day_t const* generate_days_up_to_month();
-		static month_t const* generate_month_from_day_in_year();
-
-	public:
-		// The Timespan is considered to be the number of days since Jan 1st, Year 0
-		Date(Timespan total_days);
-		// Year month day specification
-		Date(year_t year = 0, month_t month = 1, day_t day = 1);
-
-		year_t getYear() const;
-		month_t getMonth() const;
-		day_t getDay() const;
-
-		bool operator<(Date other) const;
-		bool operator>(Date other) const;
-		bool operator<=(Date other) const;
-		bool operator>=(Date other) const;
-		bool operator==(Date other) const;
-		bool operator!=(Date other) const;
-
-		Date operator+(Timespan other) const;
-		Timespan operator-(Date other) const;
-		Date& operator+=(Timespan other);
-		Date& operator-=(Timespan other);
-		Date& operator++();
-		Date operator++(int);
-
-		explicit operator std::string() const;
-		// Parsed from string of the form YYYY.MM.DD
-		static Date from_string(const std::string_view date);
-	};
-	std::ostream& operator<<(std::ostream& out, Date const& date);
-}
diff --git a/src/openvic/GameAdvancementHook.cpp b/src/openvic/GameAdvancementHook.cpp
deleted file mode 100644
index ac16158..0000000
--- a/src/openvic/GameAdvancementHook.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-#include "GameAdvancementHook.hpp"
-
-using namespace OpenVic;
-
-const std::vector<std::chrono::milliseconds> GameAdvancementHook::GAME_SPEEDS = {
-	std::chrono::milliseconds { 4000 },
-	std::chrono::milliseconds { 3000 },
-	std::chrono::milliseconds { 2000 },
-	std::chrono::milliseconds { 1000 },
-	std::chrono::milliseconds { 100 },
-	std::chrono::milliseconds { 1 }
-};
-
-GameAdvancementHook::GameAdvancementHook(AdvancementFunction tickFunction,
-	RefreshFunction updateFunction, bool startPaused, speed_t startingSpeed)
-	: triggerFunction { tickFunction },
-	  refreshFunction { updateFunction },
-	  isPaused { startPaused } {
-	lastPolledTime = std::chrono::high_resolution_clock::now();
-	setSimulationSpeed(startingSpeed);
-}
-
-void GameAdvancementHook::setSimulationSpeed(speed_t speed) {
-	if (speed < 0)
-		currentSpeed = 0;
-	else if (speed >= GAME_SPEEDS.size())
-		currentSpeed = GAME_SPEEDS.size() - 1;
-	else
-		currentSpeed = speed;
-}
-
-GameAdvancementHook::speed_t GameAdvancementHook::getSimulationSpeed() const {
-	return currentSpeed;
-}
-
-void GameAdvancementHook::increaseSimulationSpeed() {
-	setSimulationSpeed(currentSpeed + 1);
-}
-
-void GameAdvancementHook::decreaseSimulationSpeed() {
-	setSimulationSpeed(currentSpeed - 1);
-}
-
-bool GameAdvancementHook::canIncreaseSimulationSpeed() const {
-	return currentSpeed + 1 < GAME_SPEEDS.size();
-}
-
-bool GameAdvancementHook::canDecreaseSimulationSpeed() const {
-	return currentSpeed > 0;
-}
-
-GameAdvancementHook& GameAdvancementHook::operator++() {
-	increaseSimulationSpeed();
-	return *this;
-};
-
-GameAdvancementHook& GameAdvancementHook::operator--() {
-	decreaseSimulationSpeed();
-	return *this;
-};
-
-void GameAdvancementHook::conditionallyAdvanceGame() {
-	if (!isPaused) {
-		time_point_t currentTime = std::chrono::high_resolution_clock::now();
-		if (std::chrono::duration_cast<std::chrono::milliseconds>(currentTime - lastPolledTime) >= GAME_SPEEDS[currentSpeed]) {
-			lastPolledTime = currentTime;
-			if (triggerFunction) triggerFunction();
-		}
-	}
-	if (refreshFunction) refreshFunction();
-}
-
-void GameAdvancementHook::reset() {
-	isPaused = true;
-	currentSpeed = 0;
-}
diff --git a/src/openvic/GameAdvancementHook.hpp b/src/openvic/GameAdvancementHook.hpp
deleted file mode 100644
index 59e43a4..0000000
--- a/src/openvic/GameAdvancementHook.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-#include <chrono>
-#include <functional>
-#include <vector>
-
-namespace OpenVic {
-	// Conditionally advances game with provided behaviour
-	// Class governs game speed and pause state
-	class GameAdvancementHook {
-	public:
-		using AdvancementFunction = std::function<void()>;
-		using RefreshFunction = std::function<void()>;
-		using speed_t = int8_t;
-
-		// Minimum number of miliseconds before the simulation advances
-		static const std::vector<std::chrono::milliseconds> GAME_SPEEDS;
-
-	private:
-		using time_point_t = std::chrono::time_point<std::chrono::high_resolution_clock>;
-
-		time_point_t lastPolledTime;
-		// A function pointer that advances the simulation, intended to be a capturing lambda or something similar. May need to be reworked later
-		AdvancementFunction triggerFunction;
-		RefreshFunction refreshFunction;
-		speed_t currentSpeed;
-
-	public:
-		bool isPaused;
-
-		GameAdvancementHook(AdvancementFunction tickFunction, RefreshFunction updateFunction, bool startPaused = true, speed_t startingSpeed = 0);
-
-		void setSimulationSpeed(speed_t speed);
-		speed_t getSimulationSpeed() const;
-		void increaseSimulationSpeed();
-		void decreaseSimulationSpeed();
-		bool canIncreaseSimulationSpeed() const;
-		bool canDecreaseSimulationSpeed() const;
-		GameAdvancementHook& operator++();
-		GameAdvancementHook& operator--();
-		void conditionallyAdvanceGame();
-		void reset();
-	};
-}
\ No newline at end of file
diff --git a/src/openvic/GameManager.cpp b/src/openvic/GameManager.cpp
deleted file mode 100644
index 580dc4b..0000000
--- a/src/openvic/GameManager.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "GameManager.hpp"
-
-#include "utility/Logger.hpp"
-
-using namespace OpenVic;
-
-GameManager::GameManager(state_updated_func_t state_updated_callback)
-	: clock { [this]() { tick(); }, [this]() { update_state(); } },
-	  state_updated { state_updated_callback } {}
-
-void GameManager::set_needs_update() {
-	needs_update = true;
-}
-
-void GameManager::update_state() {
-	if (needs_update) {
-		Logger::info("Update: ", today);
-		map.update_state(today);
-		if (state_updated) state_updated();
-		needs_update = false;
-	}
-}
-
-/* REQUIREMENTS:
- * SS-98, SS-101
- */
-void GameManager::tick() {
-	today++;
-	Logger::info("Tick: ", today);
-	map.tick(today);
-	set_needs_update();
-}
-
-return_t GameManager::setup() {
-	session_start = time(nullptr);
-	clock.reset();
-	today = { 1836 };
-	good_manager.reset_to_defaults();
-	return_t ret = map.setup(good_manager, building_manager, pop_manager);
-	set_needs_update();
-	return ret;
-}
-
-Date const& GameManager::get_today() const {
-	return today;
-}
-
-return_t GameManager::expand_building(index_t province_index, const std::string_view building_type_identifier) {
-	set_needs_update();
-	Province* province = map.get_province_by_index(province_index);
-	if (province == nullptr) return FAILURE;
-	return province->expand_building(building_type_identifier);
-}
diff --git a/src/openvic/GameManager.hpp b/src/openvic/GameManager.hpp
deleted file mode 100644
index 52de06e..0000000
--- a/src/openvic/GameManager.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "GameAdvancementHook.hpp"
-#include "economy/Good.hpp"
-#include "map/Map.hpp"
-
-namespace OpenVic {
-	struct GameManager {
-		using state_updated_func_t = std::function<void()>;
-
-		Map map;
-		BuildingManager building_manager;
-		GoodManager good_manager;
-		PopManager pop_manager;
-		GameAdvancementHook clock;
-
-	private:
-		time_t session_start; /* SS-54, as well as allowing time-tracking */
-		Date today;
-		state_updated_func_t state_updated;
-		bool needs_update;
-
-		void set_needs_update();
-		void update_state();
-		void tick();
-
-	public:
-		GameManager(state_updated_func_t state_updated_callback);
-
-		return_t setup();
-
-		Date const& get_today() const;
-		return_t expand_building(index_t province_index, const std::string_view building_type_identifier);
-	};
-}
diff --git a/src/openvic/Simulation.hpp b/src/openvic/Simulation.hpp
deleted file mode 100644
index b0c2a19..0000000
--- a/src/openvic/Simulation.hpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-namespace OpenVic {
-	class Simulation {};
-}
\ No newline at end of file
diff --git a/src/openvic/Types.cpp b/src/openvic/Types.cpp
deleted file mode 100644
index 4902ce3..0000000
--- a/src/openvic/Types.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "Types.hpp"
-
-#include <cassert>
-#include <iomanip>
-#include <sstream>
-
-using namespace OpenVic;
-
-HasIdentifier::HasIdentifier(const std::string_view new_identifier)
-	: identifier { new_identifier } {
-	assert(!identifier.empty());
-}
-
-std::string const& HasIdentifier::get_identifier() const {
-	return identifier;
-}
-
-HasColour::HasColour(colour_t const new_colour, bool can_be_null) : colour(new_colour) {
-	assert((can_be_null || colour != NULL_COLOUR) && colour <= MAX_COLOUR_RGB);
-}
-
-colour_t HasColour::get_colour() const { return colour; }
-
-std::string HasColour::colour_to_hex_string(colour_t const colour) {
-	std::ostringstream stream;
-	stream << std::hex << std::setfill('0') << std::setw(6) << colour;
-	return stream.str();
-}
-
-std::string HasColour::colour_to_hex_string() const {
-	return colour_to_hex_string(colour);
-}
-
-HasIdentifierAndColour::HasIdentifierAndColour(const std::string_view new_identifier,
-	const colour_t new_colour, bool can_be_null)
-	: HasIdentifier { new_identifier },
-	  HasColour { new_colour, can_be_null } {}
diff --git a/src/openvic/Types.hpp b/src/openvic/Types.hpp
deleted file mode 100644
index dab455f..0000000
--- a/src/openvic/Types.hpp
+++ /dev/null
@@ -1,174 +0,0 @@
-#pragma once
-
-#include <algorithm>
-#include <cstdint>
-#include <map>
-#include <unordered_map>
-#include <vector>
-
-#include "utility/Logger.hpp"
-
-namespace OpenVic {
-	// Represents a 24-bit RGB integer OR a 32-bit ARGB integer
-	using colour_t = uint32_t;
-	/* When colour_t is used as an identifier, NULL_COLOUR is disallowed
-	 * and should be reserved as an error value.
-	 * When colour_t is used in a purely graphical context, NULL_COLOUR
-	 * should be allowed.
-	 */
-	static constexpr colour_t NULL_COLOUR = 0, FULL_COLOUR = 0xFF, MAX_COLOUR_RGB = 0xFFFFFF;
-	constexpr colour_t float_to_colour_byte(float f, float min = 0.0f, float max = 1.0f) {
-		return static_cast<colour_t>(std::clamp(min + f * (max - min), min, max) * 255.0f);
-	}
-	constexpr colour_t fraction_to_colour_byte(int n, int d, float min = 0.0f, float max = 1.0f) {
-		return float_to_colour_byte(static_cast<float>(n) / static_cast<float>(d), min, max);
-	}
-	constexpr colour_t float_to_alpha_value(float a) {
-		return float_to_colour_byte(a) << 24;
-	}
-	constexpr float colour_byte_to_float(colour_t colour) {
-		return std::clamp(static_cast<float>(colour) / 255.0f, 0.0f, 1.0f);
-	}
-
-	using index_t = uint16_t;
-	static constexpr index_t NULL_INDEX = 0, MAX_INDEX = 0xFFFF;
-
-	// TODO: price_t must be changed to a fixed-point numeric type before multiplayer
-	using price_t = double;
-	static constexpr price_t NULL_PRICE = 0.0;
-	using return_t = bool;
-
-	// This mirrors godot::Error, where `OK = 0` and `FAILED = 1`.
-	static constexpr return_t SUCCESS = false, FAILURE = true;
-
-	/*
-	 * Base class for objects with a non-empty string identifier,
-	 * uniquely named instances of which can be entered into an
-	 * IdentifierRegistry instance.
-	 */
-	class HasIdentifier {
-		const std::string identifier;
-
-	protected:
-		HasIdentifier(const std::string_view new_identifier);
-
-	public:
-		HasIdentifier(HasIdentifier const&) = delete;
-		HasIdentifier(HasIdentifier&&) = default;
-		HasIdentifier& operator=(HasIdentifier const&) = delete;
-		HasIdentifier& operator=(HasIdentifier&&) = delete;
-
-		std::string const& get_identifier() const;
-	};
-
-	/*
-	 * Base class for objects with associated colour information.
-	 */
-	class HasColour {
-		const colour_t colour;
-
-	protected:
-		HasColour(const colour_t new_colour, bool can_be_null);
-
-	public:
-		HasColour(HasColour const&) = delete;
-		HasColour(HasColour&&) = default;
-		HasColour& operator=(HasColour const&) = delete;
-		HasColour& operator=(HasColour&&) = delete;
-
-		colour_t get_colour() const;
-		std::string colour_to_hex_string() const;
-		static std::string colour_to_hex_string(colour_t const colour);
-	};
-
-	/*
-	 * Base class for objects with a unique string identifier
-	 * and associated colour information.
-	 */
-	class HasIdentifierAndColour : public HasIdentifier, public HasColour {
-	protected:
-		HasIdentifierAndColour(const std::string_view new_identifier, const colour_t new_colour, bool can_be_null);
-
-	public:
-		HasIdentifierAndColour(HasIdentifierAndColour const&) = delete;
-		HasIdentifierAndColour(HasIdentifierAndColour&&) = default;
-		HasIdentifierAndColour& operator=(HasIdentifierAndColour const&) = delete;
-		HasIdentifierAndColour& operator=(HasIdentifierAndColour&&) = delete;
-	};
-
-	using distribution_t = std::unordered_map<HasIdentifierAndColour const*, float>;
-
-	/*
-	 * Template for a list of objects with unique string identifiers that can
-	 * be locked to prevent any further additions. The template argument T is
-	 * the type of object that the registry will store, and the second part ensures
-	 * that HasIdentifier is a base class of T.
-	 */
-	template<class T, typename std::enable_if<std::is_base_of<HasIdentifier, T>::value>::type* = nullptr>
-	class IdentifierRegistry {
-		using identifier_index_map_t = std::map<std::string, size_t, std::less<void>>;
-
-		const std::string name;
-		std::vector<T> items;
-		bool locked = false;
-		identifier_index_map_t identifier_index_map;
-
-	public:
-		IdentifierRegistry(const std::string_view new_name) : name { new_name } {}
-		return_t add_item(T&& item) {
-			if (locked) {
-				Logger::error("Cannot add item to the ", name, " registry - locked!");
-				return FAILURE;
-			}
-			T const* old_item = get_item_by_identifier(item.get_identifier());
-			if (old_item != nullptr) {
-				Logger::error("Cannot add item to the ", name, " registry - an item with the identifier \"", item.get_identifier(), "\" already exists!");
-				return FAILURE;
-			}
-			identifier_index_map[item.get_identifier()] = items.size();
-			items.push_back(std::move(item));
-			return SUCCESS;
-		}
-		void lock(bool log = true) {
-			if (locked) {
-				Logger::error("Failed to lock ", name, " registry - already locked!");
-			} else {
-				locked = true;
-				if (log) Logger::info("Locked ", name, " registry after registering ", get_item_count(), " items");
-			}
-		}
-		bool is_locked() const {
-			return locked;
-		}
-		void reset() {
-			identifier_index_map.clear();
-			items.clear();
-			locked = false;
-		}
-		size_t get_item_count() const {
-			return items.size();
-		}
-		T* get_item_by_identifier(const std::string_view identifier) {
-			const identifier_index_map_t::const_iterator it = identifier_index_map.find(identifier);
-			if (it != identifier_index_map.end()) return &items[it->second];
-			return nullptr;
-		}
-		T const* get_item_by_identifier(const std::string_view identifier) const {
-			const identifier_index_map_t::const_iterator it = identifier_index_map.find(identifier);
-			if (it != identifier_index_map.end()) return &items[it->second];
-			return nullptr;
-		}
-		T* get_item_by_index(size_t index) {
-			return index < items.size() ? &items[index] : nullptr;
-		}
-		T const* get_item_by_index(size_t index) const {
-			return index < items.size() ? &items[index] : nullptr;
-		}
-		std::vector<T>& get_items() {
-			return items;
-		}
-		std::vector<T> const& get_items() const {
-			return items;
-		}
-	};
-}
diff --git a/src/openvic/dataloader/Dataloader.hpp b/src/openvic/dataloader/Dataloader.hpp
deleted file mode 100644
index 062f3d5..0000000
--- a/src/openvic/dataloader/Dataloader.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-#include <filesystem>
-#include "../Simulation.hpp"
-
-namespace OpenVic {
-	class Dataloader {
-		public:
-		enum class LoadingMode {
-			DL_COMPATIBILITY
-		};
-
-		static bool loadDir(std::filesystem::path p, Simulation& sim, LoadingMode loadMode = LoadingMode::DL_COMPATIBILITY) {
-			return true;
-		}
-	};
-}
\ No newline at end of file
diff --git a/src/openvic/economy/Good.cpp b/src/openvic/economy/Good.cpp
deleted file mode 100644
index 9e8a7dd..0000000
--- a/src/openvic/economy/Good.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-#include "Good.hpp"
-
-#include <cassert>
-
-using namespace OpenVic;
-
-Good::Good(const std::string_view new_identifier, colour_t new_colour, const std::string_view new_category, price_t new_base_price,
-	bool new_default_available, bool new_tradeable, bool new_currency, bool new_overseas_maintenance)
-	: HasIdentifierAndColour { new_identifier, new_colour, true },
-	  category { new_category },
-	  base_price { new_base_price },
-	  default_available { new_default_available },
-	  tradeable { new_tradeable },
-	  currency { new_currency },
-	  overseas_maintenance { new_overseas_maintenance } {
-	assert(base_price > NULL_PRICE);
-}
-
-std::string const& Good::get_category() const {
-	return category;
-}
-
-price_t Good::get_base_price() const {
-	return base_price;
-}
-
-price_t Good::get_price() const {
-	return price;
-}
-
-bool Good::is_default_available() const {
-	return default_available;
-}
-
-bool Good::is_available() const {
-	return available;
-}
-
-void Good::reset_to_defaults() {
-	available = default_available;
-	price = base_price;
-}
-
-GoodManager::GoodManager() : goods { "goods" } {}
-
-return_t GoodManager::add_good(const std::string_view identifier, colour_t colour, const std::string_view category,
-	price_t base_price, bool default_available, bool tradeable, bool currency, bool overseas_maintenance) {
-	if (identifier.empty()) {
-		Logger::error("Invalid good identifier - empty!");
-		return FAILURE;
-	}
-	if (colour > MAX_COLOUR_RGB) {
-		Logger::error("Invalid good colour for ", identifier, ": ", Good::colour_to_hex_string(colour));
-		return FAILURE;
-	}
-	if (category.empty()) {
-		Logger::error("Invalid good category for ", identifier, ": empty!");
-		return FAILURE;
-	}
-	if (base_price <= NULL_PRICE) {
-		Logger::error("Invalid base price for ", identifier, ": ", base_price);
-		return FAILURE;
-	}
-	return goods.add_item({ identifier, colour, category, base_price, default_available, tradeable, currency, overseas_maintenance });
-}
-
-void GoodManager::lock_goods() {
-	goods.lock();
-}
-
-void GoodManager::reset_to_defaults() {
-	for (Good& good : goods.get_items())
-		good.reset_to_defaults();
-}
-
-Good const* GoodManager::get_good_by_index(size_t index) const {
-	return goods.get_item_by_index(index);
-}
-
-Good const* GoodManager::get_good_by_identifier(const std::string_view identifier) const {
-	return goods.get_item_by_identifier(identifier);
-}
-
-size_t GoodManager::get_good_count() const {
-	return goods.get_item_count();
-}
-
-std::vector<Good> const& GoodManager::get_goods() const {
-	return goods.get_items();
-}
diff --git a/src/openvic/economy/Good.hpp b/src/openvic/economy/Good.hpp
deleted file mode 100644
index cfe185d..0000000
--- a/src/openvic/economy/Good.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#pragma once
-
-#include "../Types.hpp"
-
-namespace OpenVic {
-	struct GoodManager;
-
-	/* REQUIREMENTS:
-	 *
-	 * ECON-3 , ECON-4 , ECON-5 , ECON-6 , ECON-7 , ECON-8 , ECON-9 , ECON-10, ECON-11, ECON-12, ECON-13, ECON-14,
-	 * ECON-15, ECON-16, ECON-17, ECON-18, ECON-19, ECON-20, ECON-21, ECON-22, ECON-23, ECON-24, ECON-25, ECON-26,
-	 * ECON-27, ECON-28, ECON-29, ECON-30, ECON-31, ECON-32, ECON-33, ECON-34, ECON-35, ECON-36, ECON-37, ECON-38,
-	 * ECON-39, ECON-40, ECON-41, ECON-42, ECON-43, ECON-44, ECON-45, ECON-46, ECON-47, ECON-48, ECON-49, ECON-50
-	 *
-	 * ECON-123, ECON-124, ECON-125, ECON-126, ECON-127, ECON-128, ECON-129, ECON-130, ECON-131, ECON-132, ECON-133, ECON-134,
-	 * ECON-135, ECON-136, ECON-137, ECON-138, ECON-139, ECON-140, ECON-141, ECON-142, ECON-234, ECON-235, ECON-236, ECON-237,
-	 * ECON-238, ECON-239, ECON-240, ECON-241, ECON-242, ECON-243, ECON-244, ECON-245, ECON-246, ECON-247, ECON-248, ECON-249,
-	 * ECON-250, ECON-251, ECON-252, ECON-253, ECON-254, ECON-255, ECON-256, ECON-257, ECON-258, ECON-259, ECON-260, ECON-261
-	 */
-	struct Good : HasIdentifierAndColour {
-		friend struct GoodManager;
-
-	private:
-		const std::string category;
-		const price_t base_price;
-		price_t price;
-		const bool default_available, tradeable, currency, overseas_maintenance;
-		bool available;
-
-		Good(const std::string_view new_identifier, colour_t new_colour, const std::string_view new_category, price_t new_base_price,
-			bool new_default_available, bool new_tradeable, bool new_currency, bool new_overseas_maintenance);
-
-	public:
-		Good(Good&&) = default;
-
-		std::string const& get_category() const;
-		price_t get_base_price() const;
-		price_t get_price() const;
-		bool is_default_available() const;
-		bool is_available() const;
-		void reset_to_defaults();
-	};
-
-	struct GoodManager {
-	private:
-		IdentifierRegistry<Good> goods;
-
-	public:
-		GoodManager();
-
-		return_t add_good(const std::string_view identifier, colour_t colour, const std::string_view category, price_t base_price,
-			bool default_available, bool tradeable, bool currency, bool overseas_maintenance);
-		void lock_goods();
-		void reset_to_defaults();
-
-		Good const* get_good_by_index(size_t index) const;
-		Good const* get_good_by_identifier(const std::string_view identifier) const;
-		size_t get_good_count() const;
-		std::vector<Good> const& get_goods() const;
-	};
-}
diff --git a/src/openvic/map/Building.cpp b/src/openvic/map/Building.cpp
deleted file mode 100644
index 73a1886..0000000
--- a/src/openvic/map/Building.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-#include "Building.hpp"
-
-#include <cassert>
-
-#include "../utility/Logger.hpp"
-#include "Province.hpp"
-
-using namespace OpenVic;
-
-Building::Building(BuildingType const& new_type)
-	: HasIdentifier { new_type.get_identifier() },
-	  type { new_type } {}
-
-bool Building::_can_expand() const {
-	return level < type.get_max_level();
-}
-
-BuildingType const& Building::get_type() const {
-	return type;
-}
-
-Building::level_t Building::get_level() const {
-	return level;
-}
-
-Building::ExpansionState Building::get_expansion_state() const {
-	return expansion_state;
-}
-
-Date const& Building::get_start_date() const {
-	return start;
-}
-
-Date const& Building::get_end_date() const {
-	return end;
-}
-
-float Building::get_expansion_progress() const {
-	return expansion_progress;
-}
-
-return_t Building::expand() {
-	if (expansion_state == ExpansionState::CanExpand) {
-		expansion_state = ExpansionState::Preparing;
-		expansion_progress = 0.0f;
-		return SUCCESS;
-	}
-	return FAILURE;
-}
-
-/* REQUIREMENTS:
- * MAP-71, MAP-74, MAP-77
- */
-void Building::update_state(Date const& today) {
-	switch (expansion_state) {
-		case ExpansionState::Preparing:
-			start = today;
-			end = start + type.get_build_time();
-			break;
-		case ExpansionState::Expanding:
-			expansion_progress = static_cast<double>(today - start) / static_cast<double>(end - start);
-			break;
-		default: expansion_state = _can_expand() ? ExpansionState::CanExpand : ExpansionState::CannotExpand;
-	}
-}
-
-void Building::tick(Date const& today) {
-	if (expansion_state == ExpansionState::Preparing) {
-		expansion_state = ExpansionState::Expanding;
-	}
-	if (expansion_state == ExpansionState::Expanding) {
-		if (end <= today) {
-			level++;
-			expansion_state = ExpansionState::CannotExpand;
-		}
-	}
-}
-
-BuildingType::BuildingType(const std::string_view new_identifier, Building::level_t new_max_level, Timespan new_build_time)
-	: HasIdentifier { new_identifier },
-	  max_level { new_max_level },
-	  build_time { new_build_time } {
-	assert(max_level >= 0);
-	assert(build_time >= 0);
-}
-
-Building::level_t BuildingType::get_max_level() const {
-	return max_level;
-}
-
-Timespan BuildingType::get_build_time() const {
-	return build_time;
-}
-
-BuildingManager::BuildingManager() : building_types { "building types" } {}
-
-return_t BuildingManager::add_building_type(const std::string_view identifier, Building::level_t max_level, Timespan build_time) {
-	if (identifier.empty()) {
-		Logger::error("Invalid building type identifier - empty!");
-		return FAILURE;
-	}
-	if (max_level < 0) {
-		Logger::error("Invalid building type max level for ", identifier, ": ", max_level);
-		return FAILURE;
-	}
-	if (build_time < 0) {
-		Logger::error("Invalid building type build time for ", identifier, ": ", build_time);
-		return FAILURE;
-	}
-	return building_types.add_item({ identifier, max_level, build_time });
-}
-
-void BuildingManager::lock_building_types() {
-	building_types.lock();
-}
-
-BuildingType const* BuildingManager::get_building_type_by_identifier(const std::string_view identifier) const {
-	return building_types.get_item_by_identifier(identifier);
-}
-
-return_t BuildingManager::generate_province_buildings(Province& province) const {
-	province.reset_buildings();
-	if (!building_types.is_locked()) {
-		Logger::error("Cannot generate buildings until building types are locked!");
-		return FAILURE;
-	}
-	return_t ret = SUCCESS;
-	if (!province.is_water()) {
-		for (BuildingType const& type : building_types.get_items()) {
-			if (province.add_building({ type }) != SUCCESS) {
-				ret = FAILURE;
-			}
-		}
-	}
-	province.lock_buildings();
-	return ret;
-}
diff --git a/src/openvic/map/Building.hpp b/src/openvic/map/Building.hpp
deleted file mode 100644
index c00932b..0000000
--- a/src/openvic/map/Building.hpp
+++ /dev/null
@@ -1,86 +0,0 @@
-#pragma once
-
-#include <vector>
-
-#include "../Date.hpp"
-#include "../Types.hpp"
-
-namespace OpenVic {
-
-	struct BuildingManager;
-	struct BuildingType;
-
-	/* REQUIREMENTS:
-	 * MAP-11, MAP-72, MAP-73
-	 * MAP-12, MAP-75, MAP-76
-	 * MAP-13, MAP-78, MAP-79
-	 */
-	struct Building : HasIdentifier {
-		friend struct BuildingManager;
-
-		using level_t = int8_t;
-
-		enum class ExpansionState {
-			CannotExpand,
-			CanExpand,
-			Preparing,
-			Expanding
-		};
-
-	private:
-		BuildingType const& type;
-		level_t level = 0;
-		ExpansionState expansion_state = ExpansionState::CannotExpand;
-		Date start, end;
-		float expansion_progress;
-
-		Building(BuildingType const& new_type);
-
-		bool _can_expand() const;
-
-	public:
-		Building(Building&&) = default;
-
-		BuildingType const& get_type() const;
-		level_t get_level() const;
-		ExpansionState get_expansion_state() const;
-		Date const& get_start_date() const;
-		Date const& get_end_date() const;
-		float get_expansion_progress() const;
-
-		return_t expand();
-		void update_state(Date const& today);
-		void tick(Date const& today);
-	};
-
-	struct BuildingType : HasIdentifier {
-		friend struct BuildingManager;
-
-	private:
-		const Building::level_t max_level;
-		const Timespan build_time;
-
-		BuildingType(const std::string_view new_identifier, Building::level_t new_max_level, Timespan new_build_time);
-
-	public:
-		BuildingType(BuildingType&&) = default;
-
-		Building::level_t get_max_level() const;
-		Timespan get_build_time() const;
-	};
-
-	struct Province;
-
-	struct BuildingManager {
-	private:
-		IdentifierRegistry<BuildingType> building_types;
-
-	public:
-		BuildingManager();
-
-		return_t add_building_type(const std::string_view identifier, Building::level_t max_level, Timespan build_time);
-		void lock_building_types();
-		BuildingType const* get_building_type_by_identifier(const std::string_view identifier) const;
-		return_t generate_province_buildings(Province& province) const;
-	};
-}
diff --git a/src/openvic/map/Map.cpp b/src/openvic/map/Map.cpp
deleted file mode 100644
index 44c393d..0000000
--- a/src/openvic/map/Map.cpp
+++ /dev/null
@@ -1,423 +0,0 @@
-#include "Map.hpp"
-
-#include <cassert>
-#include <unordered_set>
-
-#include "../economy/Good.hpp"
-#include "../utility/Logger.hpp"
-
-using namespace OpenVic;
-
-Mapmode::Mapmode(const std::string_view new_identifier, index_t new_index, colour_func_t new_colour_func)
-	: HasIdentifier { new_identifier },
-	  index { new_index },
-	  colour_func { new_colour_func } {
-	assert(colour_func != nullptr);
-}
-
-const Mapmode Mapmode::ERROR_MAPMODE { "mapmode_error", 0,
-	[](Map const& map, Province const& province) -> colour_t { return 0xFFFF0000; } };
-
-Mapmode::index_t Mapmode::get_index() const {
-	return index;
-}
-
-colour_t Mapmode::get_colour(Map const& map, Province const& province) const {
-	return colour_func ? colour_func(map, province) : NULL_COLOUR;
-}
-
-Map::Map() : provinces { "provinces" },
-			 regions { "regions" },
-			 mapmodes { "mapmodes" } {}
-
-return_t Map::add_province(const std::string_view identifier, colour_t colour) {
-	if (provinces.get_item_count() >= MAX_INDEX) {
-		Logger::error("The map's province list is full - there can be at most ", MAX_INDEX, " provinces");
-		return FAILURE;
-	}
-	if (identifier.empty()) {
-		Logger::error("Invalid province identifier - empty!");
-		return FAILURE;
-	}
-	if (colour == NULL_COLOUR || colour > MAX_COLOUR_RGB) {
-		Logger::error("Invalid province colour for ", identifier, ": ", Province::colour_to_hex_string(colour));
-		return FAILURE;
-	}
-	Province new_province { identifier, colour, static_cast<index_t>(provinces.get_item_count() + 1) };
-	const index_t index = get_index_from_colour(colour);
-	if (index != NULL_INDEX) {
-		Logger::error("Duplicate province colours: ", get_province_by_index(index)->to_string(), " and ", new_province.to_string());
-		return FAILURE;
-	}
-	colour_index_map[new_province.get_colour()] = new_province.get_index();
-	return provinces.add_item(std::move(new_province));
-}
-
-void Map::lock_provinces() {
-	provinces.lock();
-}
-
-return_t Map::set_water_province(const std::string_view identifier) {
-	if (water_provinces.is_locked()) {
-		Logger::error("The map's water provinces have already been locked!");
-		return FAILURE;
-	}
-	Province* province = get_province_by_identifier(identifier);
-	if (province == nullptr) {
-		Logger::error("Unrecognised water province identifier: ", identifier);
-		return FAILURE;
-	}
-	if (province->is_water()) {
-		Logger::error("Province ", identifier, " is already a water province!");
-		return FAILURE;
-	}
-	if (water_provinces.add_province(province) != SUCCESS) {
-		Logger::error("Failed to add province ", identifier, " to water province set!");
-		return FAILURE;
-	}
-	province->water = true;
-	return SUCCESS;
-}
-
-void Map::lock_water_provinces() {
-	water_provinces.lock();
-	Logger::info("Locked water provinces after registering ", water_provinces.get_province_count());
-}
-
-return_t Map::add_region(const std::string_view identifier, std::vector<std::string_view> const& province_identifiers) {
-	if (identifier.empty()) {
-		Logger::error("Invalid region identifier - empty!");
-		return FAILURE;
-	}
-	Region new_region { identifier };
-	return_t ret = SUCCESS;
-	for (const std::string_view province_identifier : province_identifiers) {
-		Province* province = get_province_by_identifier(province_identifier);
-		if (province != nullptr) {
-			if (new_region.contains_province(province)) {
-				Logger::error("Duplicate province identifier ", province_identifier, " in region ", identifier);
-				ret = FAILURE;
-			} else {
-				size_t other_region_index = reinterpret_cast<size_t>(province->get_region());
-				if (other_region_index != 0) {
-					other_region_index--;
-					if (other_region_index < regions.get_item_count())
-						Logger::error("Cannot add province ", province_identifier, " to region ", identifier, " - it is already part of ", regions.get_item_by_index(other_region_index)->get_identifier());
-					else
-						Logger::error("Cannot add province ", province_identifier, " to region ", identifier, " - it is already part of an unknown region with index ", other_region_index);
-					ret = FAILURE;
-				} else if (new_region.add_province(province) != SUCCESS) {
-					Logger::error("Failed to add province ", province_identifier, " to region ", identifier);
-					ret = FAILURE;
-				}
-			}
-		} else {
-			Logger::error("Invalid province identifier ", province_identifier, " for region ", identifier);
-			ret = FAILURE;
-		}
-	}
-	new_region.lock();
-	if (!new_region.get_province_count()) {
-		Logger::error("No valid provinces in list for ", identifier);
-		return FAILURE;
-	}
-
-	// Used to detect provinces listed in multiple regions, will
-	// be corrected once regions is stable (i.e. lock_regions).
-	Region* tmp_region_index = reinterpret_cast<Region*>(regions.get_item_count());
-	for (Province* province : new_region.get_provinces())
-		province->region = tmp_region_index;
-	if (regions.add_item(std::move(new_region)) != SUCCESS) ret = FAILURE;
-	return ret;
-}
-
-void Map::lock_regions() {
-	regions.lock();
-	for (Region& region : regions.get_items())
-		for (Province* province : region.get_provinces())
-			province->region = &region;
-}
-
-size_t Map::get_province_count() const {
-	return provinces.get_item_count();
-}
-
-Province* Map::get_province_by_index(index_t index) {
-	return index != NULL_INDEX ? provinces.get_item_by_index(index - 1) : nullptr;
-}
-
-Province const* Map::get_province_by_index(index_t index) const {
-	return index != NULL_INDEX ? provinces.get_item_by_index(index - 1) : nullptr;
-}
-
-Province* Map::get_province_by_identifier(const std::string_view identifier) {
-	return provinces.get_item_by_identifier(identifier);
-}
-
-Province const* Map::get_province_by_identifier(const std::string_view identifier) const {
-	return provinces.get_item_by_identifier(identifier);
-}
-
-index_t Map::get_index_from_colour(colour_t colour) const {
-	const colour_index_map_t::const_iterator it = colour_index_map.find(colour);
-	if (it != colour_index_map.end()) return it->second;
-	return NULL_INDEX;
-}
-
-index_t Map::get_province_index_at(size_t x, size_t y) const {
-	if (x < width && y < height) return province_shape_image[x + y * width].index;
-	return NULL_INDEX;
-}
-
-void Map::set_selected_province(index_t index) {
-	if (index > get_province_count()) {
-		Logger::error("Trying to set selected province to an invalid index ", index, " (max index is ", get_province_count(), ")");
-		selected_province = NULL_INDEX;
-	} else {
-		selected_province = index;
-	}
-}
-
-index_t Map::get_selected_province_index() const {
-	return selected_province;
-}
-
-Province const* Map::get_selected_province() const {
-	return get_province_by_index(get_selected_province_index());
-}
-
-Region* Map::get_region_by_identifier(const std::string_view identifier) {
-	return regions.get_item_by_identifier(identifier);
-}
-
-Region const* Map::get_region_by_identifier(const std::string_view identifier) const {
-	return regions.get_item_by_identifier(identifier);
-}
-
-static colour_t colour_at(uint8_t const* colour_data, int32_t idx) {
-	idx *= 3;
-	return (colour_data[idx] << 16) | (colour_data[idx + 1] << 8) | colour_data[idx + 2];
-}
-
-return_t Map::generate_province_shape_image(size_t new_width, size_t new_height, uint8_t const* colour_data,
-	uint8_t const* terrain_data, terrain_variant_map_t const& terrain_variant_map, bool detailed_errors) {
-	if (!province_shape_image.empty()) {
-		Logger::error("Province index image has already been generated!");
-		return FAILURE;
-	}
-	if (!provinces.is_locked()) {
-		Logger::error("Province index image cannot be generated until after provinces are locked!");
-		return FAILURE;
-	}
-	if (new_width < 1 || new_height < 1) {
-		Logger::error("Invalid province image dimensions: ", new_width, "x", new_height);
-		return FAILURE;
-	}
-	if (colour_data == nullptr) {
-		Logger::error("Province colour data pointer is null!");
-		return FAILURE;
-	}
-	if (terrain_data == nullptr) {
-		Logger::error("Province terrain data pointer is null!");
-		return FAILURE;
-	}
-	width = new_width;
-	height = new_height;
-	province_shape_image.resize(width * height);
-
-	std::vector<bool> province_checklist(provinces.get_item_count());
-	return_t ret = SUCCESS;
-	std::unordered_set<colour_t> unrecognised_province_colours, unrecognised_terrain_colours;
-
-	for (int32_t y = 0; y < height; ++y) {
-		for (int32_t x = 0; x < width; ++x) {
-			const int32_t idx = x + y * width;
-
-			const colour_t terrain_colour = colour_at(terrain_data, idx);
-			const terrain_variant_map_t::const_iterator it = terrain_variant_map.find(terrain_colour);
-			if (it != terrain_variant_map.end()) province_shape_image[idx].terrain = it->second;
-			else {
-				if (unrecognised_terrain_colours.find(terrain_colour) == unrecognised_terrain_colours.end()) {
-					unrecognised_terrain_colours.insert(terrain_colour);
-					if (detailed_errors) {
-						Logger::error("Unrecognised terrain colour ", Province::colour_to_hex_string(terrain_colour),
-							" at (", x, ", ", y, ")");
-					}
-				}
-				province_shape_image[idx].terrain = 0;
-			}
-
-			const colour_t province_colour = colour_at(colour_data, idx);
-			if (x > 0) {
-				const int32_t jdx = idx - 1;
-				if (colour_at(colour_data, jdx) == province_colour) {
-					province_shape_image[idx].index = province_shape_image[jdx].index;
-					continue;
-				}
-			}
-			if (y > 0) {
-				const int32_t jdx = idx - width;
-				if (colour_at(colour_data, jdx) == province_colour) {
-					province_shape_image[idx].index = province_shape_image[jdx].index;
-					continue;
-				}
-			}
-			const index_t index = get_index_from_colour(province_colour);
-			if (index != NULL_INDEX) {
-				province_checklist[index - 1] = true;
-				province_shape_image[idx].index = index;
-				continue;
-			}
-			if (unrecognised_province_colours.find(province_colour) == unrecognised_province_colours.end()) {
-				unrecognised_province_colours.insert(province_colour);
-				if (detailed_errors) {
-					Logger::error("Unrecognised province colour ", Province::colour_to_hex_string(province_colour),
-						" at (", x, ", ", y, ")");
-				}
-			}
-			province_shape_image[idx].index = NULL_INDEX;
-		}
-	}
-	if (!unrecognised_province_colours.empty()) {
-		Logger::error("Province image contains ", unrecognised_province_colours.size(), " unrecognised province colours");
-		ret = FAILURE;
-	}
-	if (!unrecognised_terrain_colours.empty()) {
-		Logger::error("Terrain image contains ", unrecognised_terrain_colours.size(), " unrecognised terrain colours");
-		ret = FAILURE;
-	}
-
-	size_t missing = 0;
-	for (size_t idx = 0; idx < province_checklist.size(); ++idx) {
-		if (!province_checklist[idx]) {
-			if (detailed_errors) {
-				Logger::error("Province missing from shape image: ", provinces.get_item_by_index(idx)->to_string());
-			}
-			missing++;
-		}
-	}
-	if (missing > 0) {
-		Logger::error("Province image is missing ", missing, " province colours");
-		ret = FAILURE;
-	}
-	return ret;
-}
-
-size_t Map::get_width() const {
-	return width;
-}
-
-size_t Map::get_height() const {
-	return height;
-}
-
-std::vector<Map::shape_pixel_t> const& Map::get_province_shape_image() const {
-	return province_shape_image;
-}
-
-return_t Map::add_mapmode(const std::string_view identifier, Mapmode::colour_func_t colour_func) {
-	if (identifier.empty()) {
-		Logger::error("Invalid mapmode identifier - empty!");
-		return FAILURE;
-	}
-	if (colour_func == nullptr) {
-		Logger::error("Mapmode colour function is null for identifier: ", identifier);
-		return FAILURE;
-	}
-	return mapmodes.add_item({ identifier, mapmodes.get_item_count(), colour_func });
-}
-
-void Map::lock_mapmodes() {
-	mapmodes.lock();
-}
-
-size_t Map::get_mapmode_count() const {
-	return mapmodes.get_item_count();
-}
-
-Mapmode const* Map::get_mapmode_by_index(size_t index) const {
-	return mapmodes.get_item_by_index(index);
-}
-
-Mapmode const* Map::get_mapmode_by_identifier(const std::string_view identifier) const {
-	return mapmodes.get_item_by_identifier(identifier);
-}
-
-return_t Map::generate_mapmode_colours(Mapmode::index_t index, uint8_t* target) const {
-	if (target == nullptr) {
-		Logger::error("Mapmode colour target pointer is null!");
-		return FAILURE;
-	}
-	return_t ret = SUCCESS;
-	Mapmode const* mapmode = mapmodes.get_item_by_index(index);
-	if (mapmode == nullptr) {
-		// Not an error if mapmodes haven't yet been loaded,
-		// e.g. if we want to allocate the province colour
-		// texture before mapmodes are loaded.
-		if (!(mapmodes.get_item_count() == 0 && index == 0)) {
-			Logger::error("Invalid mapmode index: ", index);
-			ret = FAILURE;
-		}
-		mapmode = &Mapmode::ERROR_MAPMODE;
-	}
-	// Skip past Province::NULL_INDEX
-	for (size_t i = 0; i < MAPMODE_COLOUR_SIZE; ++i)
-		*target++ = 0;
-	for (Province const& province : provinces.get_items()) {
-		const colour_t colour = mapmode->get_colour(*this, province);
-		*target++ = (colour >> 16) & FULL_COLOUR;
-		*target++ = (colour >> 8) & FULL_COLOUR;
-		*target++ = colour & FULL_COLOUR;
-		*target++ = (colour >> 24) & FULL_COLOUR;
-	}
-	return ret;
-}
-
-void Map::update_highest_province_population() {
-	highest_province_population = 0;
-	for (Province const& province : provinces.get_items()) {
-		highest_province_population = std::max(highest_province_population, province.get_total_population());
-	}
-}
-
-Pop::pop_size_t Map::get_highest_province_population() const {
-	return highest_province_population;
-}
-
-void Map::update_total_map_population() {
-	total_map_population = 0;
-	for (Province const& province : provinces.get_items()) {
-		total_map_population += province.get_total_population();
-	}
-}
-
-Pop::pop_size_t Map::get_total_map_population() const {
-	return total_map_population;
-}
-
-return_t Map::setup(GoodManager const& good_manager, BuildingManager const& building_manager, PopManager const& pop_manager) {
-	return_t ret = SUCCESS;
-	for (Province& province : provinces.get_items()) {
-		province.clear_pops();
-		// Set all land provinces to have an RGO based on their index to test them
-		if (!province.is_water() && good_manager.get_good_count() > 0)
-			province.rgo = good_manager.get_good_by_index(province.get_index() % good_manager.get_good_count());
-		if (building_manager.generate_province_buildings(province) != SUCCESS) ret = FAILURE;
-		// Add some pops to the province (for testing purposes)
-		if (!province.is_water())
-			pop_manager.generate_test_pops(province);
-	}
-	return ret;
-}
-
-void Map::update_state(Date const& today) {
-	for (Province& province : provinces.get_items())
-		province.update_state(today);
-	update_highest_province_population();
-	update_total_map_population();
-}
-
-void Map::tick(Date const& today) {
-	for (Province& province : provinces.get_items())
-		province.tick(today);
-}
diff --git a/src/openvic/map/Map.hpp b/src/openvic/map/Map.hpp
deleted file mode 100644
index 64678c8..0000000
--- a/src/openvic/map/Map.hpp
+++ /dev/null
@@ -1,107 +0,0 @@
-#pragma once
-
-#include <functional>
-
-#include "Region.hpp"
-
-namespace OpenVic {
-
-	struct Mapmode : HasIdentifier {
-		friend struct Map;
-
-		using colour_func_t = std::function<colour_t(Map const&, Province const&)>;
-		using index_t = size_t;
-
-	private:
-		const index_t index;
-		const colour_func_t colour_func;
-
-		Mapmode(const std::string_view new_identifier, index_t new_index, colour_func_t new_colour_func);
-
-	public:
-		static const Mapmode ERROR_MAPMODE;
-
-		index_t get_index() const;
-		colour_t get_colour(Map const& map, Province const& province) const;
-	};
-
-	struct GoodManager;
-
-	/* REQUIREMENTS:
-	 * MAP-4
-	 */
-	struct Map {
-		using terrain_t = uint8_t;
-		using terrain_variant_map_t = std::map<colour_t, terrain_t>;
-
-#pragma pack(push, 1)
-		struct shape_pixel_t {
-			index_t index;
-			terrain_t terrain;
-		};
-#pragma pack(pop)
-	private:
-		using colour_index_map_t = std::map<colour_t, index_t>;
-
-		IdentifierRegistry<Province> provinces;
-		IdentifierRegistry<Region> regions;
-		IdentifierRegistry<Mapmode> mapmodes;
-		ProvinceSet water_provinces;
-
-		size_t width = 0, height = 0;
-		std::vector<shape_pixel_t> province_shape_image;
-		colour_index_map_t colour_index_map;
-		index_t selected_province = NULL_INDEX;
-
-		Pop::pop_size_t highest_province_population, total_map_population;
-
-		index_t get_index_from_colour(colour_t colour) const;
-
-	public:
-		Map();
-
-		return_t add_province(const std::string_view identifier, colour_t colour);
-		void lock_provinces();
-		return_t set_water_province(const std::string_view identifier);
-		void lock_water_provinces();
-		return_t add_region(const std::string_view identifier, std::vector<std::string_view> const& province_identifiers);
-		void lock_regions();
-
-		size_t get_province_count() const;
-		Province* get_province_by_index(index_t index);
-		Province const* get_province_by_index(index_t index) const;
-		Province* get_province_by_identifier(const std::string_view identifier);
-		Province const* get_province_by_identifier(const std::string_view identifier) const;
-		index_t get_province_index_at(size_t x, size_t y) const;
-		void set_selected_province(index_t index);
-		index_t get_selected_province_index() const;
-		Province const* get_selected_province() const;
-
-		Region* get_region_by_identifier(const std::string_view identifier);
-		Region const* get_region_by_identifier(const std::string_view identifier) const;
-
-		return_t generate_province_shape_image(size_t new_width, size_t new_height, uint8_t const* colour_data,
-			uint8_t const* terrain_data, terrain_variant_map_t const& terrain_variant_map, bool detailed_errors);
-		size_t get_width() const;
-		size_t get_height() const;
-		std::vector<shape_pixel_t> const& get_province_shape_image() const;
-
-		return_t add_mapmode(const std::string_view identifier, Mapmode::colour_func_t colour_func);
-		void lock_mapmodes();
-		size_t get_mapmode_count() const;
-		Mapmode const* get_mapmode_by_index(Mapmode::index_t index) const;
-		Mapmode const* get_mapmode_by_identifier(const std::string_view identifier) const;
-		static constexpr size_t MAPMODE_COLOUR_SIZE = 4;
-		return_t generate_mapmode_colours(Mapmode::index_t index, uint8_t* target) const;
-
-		return_t setup(GoodManager const& good_manager, BuildingManager const& building_manager, PopManager const& pop_manager);
-
-		void update_highest_province_population();
-		Pop::pop_size_t get_highest_province_population() const;
-		void update_total_map_population();
-		Pop::pop_size_t get_total_map_population() const;
-
-		void update_state(Date const& today);
-		void tick(Date const& today);
-	};
-}
diff --git a/src/openvic/map/Province.cpp b/src/openvic/map/Province.cpp
deleted file mode 100644
index ea284b6..0000000
--- a/src/openvic/map/Province.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-#include "Province.hpp"
-
-#include <cassert>
-#include <iomanip>
-#include <sstream>
-
-using namespace OpenVic;
-
-Province::Province(const std::string_view new_identifier, colour_t new_colour, index_t new_index)
-	: HasIdentifierAndColour { new_identifier, new_colour, false },
-	  index { new_index },
-	  buildings { "buildings" } {
-	assert(index != NULL_INDEX);
-}
-
-index_t Province::get_index() const {
-	return index;
-}
-
-Region* Province::get_region() const {
-	return region;
-}
-
-bool Province::is_water() const {
-	return water;
-}
-
-Province::life_rating_t Province::get_life_rating() const {
-	return life_rating;
-}
-
-return_t Province::add_building(Building&& building) {
-	return buildings.add_item(std::move(building));
-}
-
-void Province::lock_buildings() {
-	buildings.lock(false);
-}
-
-void Province::reset_buildings() {
-	buildings.reset();
-}
-
-Building const* Province::get_building_by_identifier(const std::string_view identifier) const {
-	return buildings.get_item_by_identifier(identifier);
-}
-
-std::vector<Building> const& Province::get_buildings() const {
-	return buildings.get_items();
-}
-
-return_t Province::expand_building(const std::string_view building_type_identifier) {
-	Building* building = buildings.get_item_by_identifier(building_type_identifier);
-	if (building == nullptr) return FAILURE;
-	return building->expand();
-}
-
-Good const* Province::get_rgo() const {
-	return rgo;
-}
-
-std::string Province::to_string() const {
-	std::stringstream stream;
-	stream << "(#" << std::to_string(index) << ", " << get_identifier() << ", 0x" << colour_to_hex_string() << ")";
-	return stream.str();
-}
-
-void Province::add_pop(Pop&& pop) {
-	if (is_water()) {
-		Logger::error("Trying to add pop to water province ", get_identifier());
-	} else {
-		pops.push_back(std::move(pop));
-	}
-}
-
-void Province::clear_pops() {
-	pops.clear();
-}
-
-Pop::pop_size_t Province::get_total_population() const {
-	return total_population;
-}
-
-distribution_t const& Province::get_pop_type_distribution() const {
-	return pop_types;
-}
-
-distribution_t const& Province::get_culture_distribution() const {
-	return cultures;
-}
-
-/* REQUIREMENTS:
- * MAP-65
- */
-void Province::update_pops() {
-	total_population = 0;
-	pop_types.clear();
-	cultures.clear();
-	for (Pop const& pop : pops) {
-		total_population += pop.get_size();
-		pop_types[&pop.get_type()] += pop.get_size();
-		cultures[&pop.get_culture()] += pop.get_size();
-	}
-}
-
-void Province::update_state(Date const& today) {
-	for (Building& building : buildings.get_items())
-		building.update_state(today);
-	update_pops();
-}
-
-void Province::tick(Date const& today) {
-	for (Building& building : buildings.get_items())
-		building.tick(today);
-}
diff --git a/src/openvic/map/Province.hpp b/src/openvic/map/Province.hpp
deleted file mode 100644
index 20c5870..0000000
--- a/src/openvic/map/Province.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-
-#include "../pop/Pop.hpp"
-#include "Building.hpp"
-
-namespace OpenVic {
-	struct Map;
-	struct Region;
-	struct Good;
-
-	/* REQUIREMENTS:
-	 * MAP-5, MAP-7, MAP-8, MAP-43, MAP-47
-	 */
-	struct Province : HasIdentifierAndColour {
-		friend struct Map;
-
-		using life_rating_t = int8_t;
-
-	private:
-		const index_t index;
-		Region* region = nullptr;
-		bool water = false;
-		life_rating_t life_rating = 0;
-		IdentifierRegistry<Building> buildings;
-		// TODO - change this into a factory-like structure
-		Good const* rgo = nullptr;
-
-		std::vector<Pop> pops;
-		Pop::pop_size_t total_population;
-		distribution_t pop_types, cultures;
-
-		Province(const std::string_view new_identifier, colour_t new_colour, index_t new_index);
-
-	public:
-		Province(Province&&) = default;
-
-		index_t get_index() const;
-		Region* get_region() const;
-		bool is_water() const;
-		life_rating_t get_life_rating() const;
-		return_t add_building(Building&& building);
-		void lock_buildings();
-		void reset_buildings();
-		Building const* get_building_by_identifier(const std::string_view identifier) const;
-		std::vector<Building> const& get_buildings() const;
-		return_t expand_building(const std::string_view building_type_identifier);
-		Good const* get_rgo() const;
-		std::string to_string() const;
-
-		void add_pop(Pop&& pop);
-		void clear_pops();
-		Pop::pop_size_t get_total_population() const;
-		distribution_t const& get_pop_type_distribution() const;
-		distribution_t const& get_culture_distribution() const;
-		void update_pops();
-
-		void update_state(Date const& today);
-		void tick(Date const& today);
-	};
-}
diff --git a/src/openvic/map/Region.cpp b/src/openvic/map/Region.cpp
deleted file mode 100644
index fc207e3..0000000
--- a/src/openvic/map/Region.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include "Region.hpp"
-
-#include <cassert>
-
-using namespace OpenVic;
-
-return_t ProvinceSet::add_province(Province* province) {
-	if (locked) {
-		Logger::error("Cannot add province to province set - locked!");
-		return FAILURE;
-	}
-	if (province == nullptr) {
-		Logger::error("Cannot add province to province set - null province!");
-		return FAILURE;
-	}
-	if (contains_province(province)) {
-		Logger::error("Cannot add province ", province->get_identifier(), " to province set - already in the set!");
-		return FAILURE;
-	}
-	provinces.push_back(province);
-	return SUCCESS;
-}
-
-void ProvinceSet::lock(bool log) {
-	if (locked) {
-		Logger::error("Failed to lock province set - already locked!");
-	} else {
-		locked = true;
-		if (log) Logger::info("Locked province set with ", get_province_count(), " provinces");
-	}
-}
-
-bool ProvinceSet::is_locked() const {
-	return locked;
-}
-
-void ProvinceSet::reset() {
-	provinces.clear();
-	locked = false;
-}
-
-size_t ProvinceSet::get_province_count() const {
-	return provinces.size();
-}
-
-bool ProvinceSet::contains_province(Province const* province) const {
-	return province && std::find(provinces.begin(), provinces.end(), province) != provinces.end();
-}
-
-std::vector<Province*> const& ProvinceSet::get_provinces() const {
-	return provinces;
-}
-
-Region::Region(const std::string_view new_identifier) : HasIdentifier { new_identifier } {}
-
-colour_t Region::get_colour() const {
-	if (provinces.empty()) return FULL_COLOUR << 16;
-	return provinces.front()->get_colour();
-}
diff --git a/src/openvic/map/Region.hpp b/src/openvic/map/Region.hpp
deleted file mode 100644
index beeb76e..0000000
--- a/src/openvic/map/Region.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include "Province.hpp"
-
-namespace OpenVic {
-
-	struct ProvinceSet {
-	protected:
-		std::vector<Province*> provinces;
-		bool locked = false;
-
-	public:
-		return_t add_province(Province* province);
-		void lock(bool log = false);
-		bool is_locked() const;
-		void reset();
-		size_t get_province_count() const;
-		bool contains_province(Province const* province) const;
-		std::vector<Province*> const& get_provinces() const;
-	};
-
-	/* REQUIREMENTS:
-	 * MAP-6, MAP-44, MAP-48
-	 */
-	struct Region : HasIdentifier, ProvinceSet {
-		friend struct Map;
-
-	private:
-		Region(const std::string_view new_identifier);
-
-	public:
-		Region(Region&&) = default;
-
-		colour_t get_colour() const;
-	};
-}
diff --git a/src/openvic/pop/Culture.cpp b/src/openvic/pop/Culture.cpp
deleted file mode 100644
index f50bb23..0000000
--- a/src/openvic/pop/Culture.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "Culture.hpp"
-
-#include <cassert>
-
-using namespace OpenVic;
-
-GraphicalCultureType::GraphicalCultureType(const std::string_view new_identifier) : HasIdentifier { new_identifier } {}
-
-CultureGroup::CultureGroup(const std::string_view new_identifier,
-	GraphicalCultureType const& new_unit_graphical_culture_type)
-	: HasIdentifier { new_identifier },
-	  unit_graphical_culture_type { new_unit_graphical_culture_type } {}
-
-GraphicalCultureType const& CultureGroup::get_unit_graphical_culture_type() const {
-	return unit_graphical_culture_type;
-}
-
-Culture::Culture(const std::string_view new_identifier, colour_t new_colour, CultureGroup const& new_group,
-	name_list_t const& new_first_names, name_list_t const& new_last_names)
-	: HasIdentifierAndColour { new_identifier, new_colour, true },
-	  group { new_group },
-	  first_names { new_first_names },
-	  last_names { new_last_names } {
-}
-
-CultureGroup const& Culture::get_group() const {
-	return group;
-}
-
-CultureManager::CultureManager()
-	: graphical_culture_types { "graphical culture types" },
-	  culture_groups { "culture groups" },
-	  cultures { "cultures" } {}
-
-return_t CultureManager::add_graphical_culture_type(const std::string_view identifier) {
-	if (identifier.empty()) {
-		Logger::error("Invalid culture group identifier - empty!");
-		return FAILURE;
-	}
-	return graphical_culture_types.add_item({ identifier });
-}
-
-void CultureManager::lock_graphical_culture_types() {
-	graphical_culture_types.lock();
-}
-
-GraphicalCultureType const* CultureManager::get_graphical_culture_type_by_identifier(const std::string_view identifier) const {
-	return graphical_culture_types.get_item_by_identifier(identifier);
-}
-
-return_t CultureManager::add_culture_group(const std::string_view identifier, GraphicalCultureType const* graphical_culture_type) {
-	if (!graphical_culture_types.is_locked()) {
-		Logger::error("Cannot register culture groups until graphical culture types are locked!");
-		return FAILURE;
-	}
-	if (identifier.empty()) {
-		Logger::error("Invalid culture group identifier - empty!");
-		return FAILURE;
-	}
-	if (graphical_culture_type == nullptr) {
-		Logger::error("Null graphical culture type for ", identifier);
-		return FAILURE;
-	}
-	return culture_groups.add_item({ identifier, *graphical_culture_type });
-}
-
-void CultureManager::lock_culture_groups() {
-	culture_groups.lock();
-}
-
-CultureGroup const* CultureManager::get_culture_group_by_identifier(const std::string_view identifier) const {
-	return culture_groups.get_item_by_identifier(identifier);
-}
-
-return_t CultureManager::add_culture(const std::string_view identifier, colour_t colour, CultureGroup const* group, Culture::name_list_t const& first_names, Culture::name_list_t const& last_names) {
-	if (!culture_groups.is_locked()) {
-		Logger::error("Cannot register cultures until culture groups are locked!");
-		return FAILURE;
-	}
-	if (identifier.empty()) {
-		Logger::error("Invalid culture identifier - empty!");
-		return FAILURE;
-	}
-	if (group == nullptr) {
-		Logger::error("Null culture group for ", identifier);
-		return FAILURE;
-	}
-	if (colour > MAX_COLOUR_RGB) {
-		Logger::error("Invalid culture colour for ", identifier, ": ", Culture::colour_to_hex_string(colour));
-		return FAILURE;
-	}
-	// TODO - name list sanatisation?
-	return cultures.add_item({ identifier, colour, *group, first_names, last_names });
-}
-
-void CultureManager::lock_cultures() {
-	cultures.lock();
-}
-
-Culture const* CultureManager::get_culture_by_identifier(const std::string_view identifier) const {
-	return cultures.get_item_by_identifier(identifier);
-}
diff --git a/src/openvic/pop/Culture.hpp b/src/openvic/pop/Culture.hpp
deleted file mode 100644
index 645e226..0000000
--- a/src/openvic/pop/Culture.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-#pragma once
-
-#include "../Types.hpp"
-
-namespace OpenVic {
-
-	struct CultureManager;
-
-	struct GraphicalCultureType : HasIdentifier {
-		friend struct CultureManager;
-
-	private:
-		GraphicalCultureType(const std::string_view new_identifier);
-
-	public:
-		GraphicalCultureType(GraphicalCultureType&&) = default;
-	};
-
-	struct CultureGroup : HasIdentifier {
-		friend struct CultureManager;
-
-	private:
-		GraphicalCultureType const& unit_graphical_culture_type;
-
-		// TODO - leader type, union tag
-
-		CultureGroup(const std::string_view new_identifier, GraphicalCultureType const& new_unit_graphical_culture_type);
-
-	public:
-		CultureGroup(CultureGroup&&) = default;
-
-		GraphicalCultureType const& get_unit_graphical_culture_type() const;
-	};
-
-	struct Culture : HasIdentifierAndColour {
-		friend struct CultureManager;
-
-		using name_list_t = std::vector<std::string>;
-
-	private:
-		CultureGroup const& group;
-		const name_list_t first_names, last_names;
-
-		// TODO - radicalism, primary tag
-
-		Culture(const std::string_view new_identifier, colour_t new_colour, CultureGroup const& new_group, name_list_t const& new_first_names, name_list_t const& new_last_names);
-
-	public:
-		Culture(Culture&&) = default;
-
-		CultureGroup const& get_group() const;
-	};
-
-	struct CultureManager {
-	private:
-		IdentifierRegistry<GraphicalCultureType> graphical_culture_types;
-		IdentifierRegistry<CultureGroup> culture_groups;
-		IdentifierRegistry<Culture> cultures;
-
-	public:
-		CultureManager();
-
-		return_t add_graphical_culture_type(const std::string_view identifier);
-		void lock_graphical_culture_types();
-		GraphicalCultureType const* get_graphical_culture_type_by_identifier(const std::string_view identifier) const;
-		return_t add_culture_group(const std::string_view identifier, GraphicalCultureType const* new_graphical_culture_type);
-		void lock_culture_groups();
-		CultureGroup const* get_culture_group_by_identifier(const std::string_view identifier) const;
-		return_t add_culture(const std::string_view identifier, colour_t colour, CultureGroup const* group, Culture::name_list_t const& first_names, Culture::name_list_t const& last_names);
-		void lock_cultures();
-		Culture const* get_culture_by_identifier(const std::string_view identifier) const;
-	};
-}
diff --git a/src/openvic/pop/Pop.cpp b/src/openvic/pop/Pop.cpp
deleted file mode 100644
index 81915f6..0000000
--- a/src/openvic/pop/Pop.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-#include "Pop.hpp"
-
-#include <cassert>
-
-#include "../map/Province.hpp"
-#include "../utility/Logger.hpp"
-
-using namespace OpenVic;
-
-Pop::Pop(PopType const& new_type, Culture const& new_culture, Religion const& new_religion, pop_size_t new_size)
-	: type { new_type },
-	  culture { new_culture },
-	  religion { new_religion },
-	  size { new_size } {
-	assert(size > 0);
-}
-
-PopType const& Pop::get_type() const {
-	return type;
-}
-
-Culture const& Pop::get_culture() const {
-	return culture;
-}
-
-Religion const& Pop::get_religion() const {
-	return religion;
-}
-
-Pop::pop_size_t Pop::get_size() const {
-	return size;
-}
-
-Pop::pop_size_t Pop::get_num_promoted() const {
-	return num_promoted;
-}
-
-Pop::pop_size_t Pop::get_num_demoted() const {
-	return num_demoted;
-}
-
-Pop::pop_size_t Pop::get_num_migrated() const {
-	return num_migrated;
-}
-
-Pop::pop_size_t Pop::get_pop_daily_change() const {
-	return Pop::get_num_promoted() - (Pop::get_num_demoted() + Pop::get_num_migrated());
-}
-
-PopType::PopType(const std::string_view new_identifier, colour_t new_colour,
-	strata_t new_strata, sprite_t new_sprite,
-	Pop::pop_size_t new_max_size, Pop::pop_size_t new_merge_max_size,
-	bool new_state_capital_only, bool new_demote_migrant, bool new_is_artisan, bool new_is_slave)
-	: HasIdentifierAndColour { new_identifier, new_colour, true },
-	  strata { new_strata },
-	  sprite { new_sprite },
-	  max_size { new_max_size },
-	  merge_max_size { new_merge_max_size },
-	  state_capital_only { new_state_capital_only },
-	  demote_migrant { new_demote_migrant },
-	  is_artisan { new_is_artisan },
-	  is_slave { new_is_slave } {
-	assert(sprite > 0);
-	assert(max_size > 0);
-	assert(merge_max_size > 0);
-}
-
-PopType::sprite_t PopType::get_sprite() const {
-	return sprite;
-}
-
-PopType::strata_t PopType::get_strata() const {
-	return strata;
-}
-
-Pop::pop_size_t PopType::get_max_size() const {
-	return max_size;
-}
-
-Pop::pop_size_t PopType::get_merge_max_size() const {
-	return merge_max_size;
-}
-
-bool PopType::get_state_capital_only() const {
-	return state_capital_only;
-}
-
-bool PopType::get_demote_migrant() const {
-	return demote_migrant;
-}
-
-bool PopType::get_is_artisan() const {
-	return is_artisan;
-}
-
-bool PopType::get_is_slave() const {
-	return is_slave;
-}
-
-static const std::string test_graphical_culture_type = "test_graphical_culture_type";
-static const std::string test_culture_group = "test_culture_group";
-static const std::string test_culture = "test_culture";
-static const std::string test_religion_group = "test_religion_group";
-static const std::string test_religion = "test_religion";
-static const std::string test_pop_type_poor = "test_pop_type_poor";
-static const std::string test_pop_type_middle = "test_pop_type_middle";
-static const std::string test_pop_type_rich = "test_pop_type_rich";
-
-
-PopManager::PopManager() : pop_types { "pop types" } {
-	culture_manager.add_graphical_culture_type(test_graphical_culture_type);
-	culture_manager.lock_graphical_culture_types();
-
-	culture_manager.add_culture_group(test_culture_group, culture_manager.get_graphical_culture_type_by_identifier(test_graphical_culture_type));
-	culture_manager.lock_culture_groups();
-
-	culture_manager.add_culture(test_culture, 0x0000FF, culture_manager.get_culture_group_by_identifier(test_culture_group),
-		{ "john" }, { "smith" });
-	culture_manager.lock_cultures();
-
-	religion_manager.add_religion_group(test_religion_group);
-	religion_manager.lock_religion_groups();
-
-	religion_manager.add_religion(test_religion, 0xFF0000, religion_manager.get_religion_group_by_identifier(test_religion_group), 1, false);
-	religion_manager.lock_religions();
-
-	add_pop_type(test_pop_type_poor, 0xFF0000, PopType::strata_t::POOR, 1, 1, 1, false, false, false, false);
-	add_pop_type(test_pop_type_middle, 0x00FF00, PopType::strata_t::MIDDLE, 1, 1, 1, false, false, false, false);
-	add_pop_type(test_pop_type_rich, 0x0000FF, PopType::strata_t::RICH, 1, 1, 1, false, false, false, false);
-	lock_pop_types();
-}
-
-return_t PopManager::add_pop_type(const std::string_view identifier, colour_t colour, PopType::strata_t strata, PopType::sprite_t sprite,
-	Pop::pop_size_t max_size, Pop::pop_size_t merge_max_size, bool state_capital_only, bool demote_migrant, bool is_artisan, bool is_slave) {
-	if (identifier.empty()) {
-		Logger::error("Invalid pop type identifier - empty!");
-		return FAILURE;
-	}
-	if (colour > MAX_COLOUR_RGB) {
-		Logger::error("Invalid pop type colour for ", identifier, ": ", PopType::colour_to_hex_string(colour));
-		return FAILURE;
-	}
-	if (sprite <= 0) {
-		Logger::error("Invalid pop type sprite index for ", identifier, ": ", sprite);
-		return FAILURE;
-	}
-	if (max_size <= 0) {
-		Logger::error("Invalid pop type max size for ", identifier, ": ", max_size);
-		return FAILURE;
-	}
-	if (merge_max_size <= 0) {
-		Logger::error("Invalid pop type merge max size for ", identifier, ": ", merge_max_size);
-		return FAILURE;
-	}
-	return pop_types.add_item({ identifier, colour, strata, sprite, max_size, merge_max_size, state_capital_only, demote_migrant, is_artisan, is_slave });
-}
-
-void PopManager::lock_pop_types() {
-	pop_types.lock();
-}
-
-PopType const* PopManager::get_pop_type_by_identifier(const std::string_view identifier) const {
-	return pop_types.get_item_by_identifier(identifier);
-}
-
-void PopManager::generate_test_pops(Province& province) const {
-	if (pop_types.is_locked()) {
-		static PopType const& type_poor = *get_pop_type_by_identifier(test_pop_type_poor);
-		static PopType const& type_middle = *get_pop_type_by_identifier(test_pop_type_middle);
-		static PopType const& type_rich = *get_pop_type_by_identifier(test_pop_type_rich);
-		static Culture const& culture = *culture_manager.get_culture_by_identifier(test_culture);
-		static Religion const& religion = *religion_manager.get_religion_by_identifier(test_religion);
-
-		province.add_pop({ type_poor, culture, religion, static_cast<Pop::pop_size_t>(province.get_index() * province.get_index()) * 100 });
-		province.add_pop({ type_middle, culture, religion, static_cast<Pop::pop_size_t>(province.get_index() * province.get_index()) * 50 });
-		province.add_pop({ type_rich, culture, religion, static_cast<Pop::pop_size_t>(province.get_index()) * 1000 });
-	} else {
-		Logger::error("Cannot generate pops before pop types registry is locked!");
-	}
-}
diff --git a/src/openvic/pop/Pop.hpp b/src/openvic/pop/Pop.hpp
deleted file mode 100644
index db9633f..0000000
--- a/src/openvic/pop/Pop.hpp
+++ /dev/null
@@ -1,99 +0,0 @@
-#pragma once
-
-#include "../Types.hpp"
-#include "Culture.hpp"
-#include "Religion.hpp"
-
-namespace OpenVic {
-
-	struct PopManager;
-	struct PopType;
-
-	/* REQUIREMENTS:
-	 * POP-18, POP-19, POP-20, POP-21
-	 */
-	struct Pop {
-		friend struct PopManager;
-
-		using pop_size_t = int64_t;
-
-	private:
-		PopType const& type;
-		Culture const& culture;
-		Religion const& religion;
-		pop_size_t size, num_migrated, num_promoted, num_demoted, num_migrated;
-
-		Pop(PopType const& new_type, Culture const& new_culture, Religion const& new_religion, pop_size_t new_size);
-
-	public:
-		Pop(Pop const&) = delete;
-		Pop(Pop&&) = default;
-		Pop& operator=(Pop const&) = delete;
-		Pop& operator=(Pop&&) = delete;
-
-		PopType const& get_type() const;
-		Culture const& get_culture() const;
-		Religion const& get_religion() const;
-		pop_size_t get_size() const;
-		pop_size_t get_num_promoted() const;
-		pop_size_t get_num_demoted() const;
-		pop_size_t get_num_migrated() const;
-		pop_size_t get_pop_daily_change() const;
-	};
-
-	/* REQUIREMENTS:
-	 * POP-26
-	 */
-	struct PopType : HasIdentifierAndColour {
-		friend struct PopManager;
-
-		using sprite_t = uint8_t;
-
-	private:
-		const enum class strata_t {
-			POOR,
-			MIDDLE,
-			RICH
-		} strata;
-		const sprite_t sprite;
-		const Pop::pop_size_t max_size, merge_max_size;
-		const bool state_capital_only, demote_migrant, is_artisan, is_slave;
-
-		// TODO - rebel composition, life/everyday/luxury needs, country and province migration targets, promote_to targets, ideologies and issues
-
-		PopType(const std::string_view new_identifier, colour_t new_colour, strata_t new_strata, sprite_t new_sprite, Pop::pop_size_t new_max_size, Pop::pop_size_t new_merge_max_size,
-			bool new_state_capital_only, bool new_demote_migrant, bool new_is_artisan, bool new_is_slave);
-
-	public:
-		PopType(PopType&&) = default;
-
-		strata_t get_strata() const;
-		sprite_t get_sprite() const;
-		Pop::pop_size_t get_max_size() const;
-		Pop::pop_size_t get_merge_max_size() const;
-		bool get_state_capital_only() const;
-		bool get_demote_migrant() const;
-		bool get_is_artisan() const;
-		bool get_is_slave() const;
-	};
-
-	struct Province;
-
-	struct PopManager {
-	private:
-		IdentifierRegistry<PopType> pop_types;
-		CultureManager culture_manager;
-		ReligionManager religion_manager;
-
-	public:
-		PopManager();
-
-		return_t add_pop_type(const std::string_view identifier, colour_t new_colour, PopType::strata_t strata, PopType::sprite_t sprite,
-			Pop::pop_size_t max_size, Pop::pop_size_t merge_max_size, bool state_capital_only, bool demote_migrant,
-			bool is_artisan, bool is_slave);
-		void lock_pop_types();
-		PopType const* get_pop_type_by_identifier(const std::string_view identifier) const;
-
-		void generate_test_pops(Province& province) const;
-	};
-}
diff --git a/src/openvic/pop/Religion.cpp b/src/openvic/pop/Religion.cpp
deleted file mode 100644
index 0cfc7a6..0000000
--- a/src/openvic/pop/Religion.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-#include "Religion.hpp"
-
-#include <cassert>
-
-using namespace OpenVic;
-
-ReligionGroup::ReligionGroup(const std::string_view new_identifier) : HasIdentifier { new_identifier } {}
-
-Religion::Religion(const std::string_view new_identifier, colour_t new_colour,
-	ReligionGroup const& new_group, icon_t new_icon, bool new_pagan)
-	: HasIdentifierAndColour { new_identifier, new_colour, true },
-	  group { new_group },
-	  icon { new_icon },
-	  pagan { new_pagan } {
-	assert(icon > 0);
-}
-
-ReligionGroup const& Religion::get_group() const {
-	return group;
-}
-
-Religion::icon_t Religion::get_icon() const {
-	return icon;
-}
-
-bool Religion::get_pagan() const {
-	return pagan;
-}
-
-ReligionManager::ReligionManager()
-	: religion_groups { "religion groups" },
-	  religions { "religions" } {}
-
-return_t ReligionManager::add_religion_group(const std::string_view identifier) {
-	if (identifier.empty()) {
-		Logger::error("Invalid religion group identifier - empty!");
-		return FAILURE;
-	}
-	return religion_groups.add_item({ identifier });
-}
-
-void ReligionManager::lock_religion_groups() {
-	religion_groups.lock();
-}
-
-ReligionGroup const* ReligionManager::get_religion_group_by_identifier(const std::string_view identifier) const {
-	return religion_groups.get_item_by_identifier(identifier);
-}
-
-return_t ReligionManager::add_religion(const std::string_view identifier, colour_t colour, ReligionGroup const* group, Religion::icon_t icon, bool pagan) {
-	if (!religion_groups.is_locked()) {
-		Logger::error("Cannot register religions until religion groups are locked!");
-		return FAILURE;
-	}
-	if (identifier.empty()) {
-		Logger::error("Invalid religion identifier - empty!");
-		return FAILURE;
-	}
-	if (group == nullptr) {
-		Logger::error("Null religion group for ", identifier);
-		return FAILURE;
-	}
-	if (colour > MAX_COLOUR_RGB) {
-		Logger::error("Invalid religion colour for ", identifier, ": ", Religion::colour_to_hex_string(colour));
-		return FAILURE;
-	}
-	if (icon <= 0) {
-		Logger::error("Invalid religion icon for ", identifier, ": ", icon);
-		return FAILURE;
-	}
-	return religions.add_item({ identifier, colour, *group, icon, pagan });
-}
-
-void ReligionManager::lock_religions() {
-	religions.lock();
-}
-
-Religion const* ReligionManager::get_religion_by_identifier(const std::string_view identifier) const {
-	return religions.get_item_by_identifier(identifier);
-}
diff --git a/src/openvic/pop/Religion.hpp b/src/openvic/pop/Religion.hpp
deleted file mode 100644
index 4eb3e4c..0000000
--- a/src/openvic/pop/Religion.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include "../Types.hpp"
-
-namespace OpenVic {
-
-	struct ReligionManager;
-
-	struct ReligionGroup : HasIdentifier {
-		friend struct ReligionManager;
-
-	private:
-		ReligionGroup(const std::string_view new_identifier);
-
-	public:
-		ReligionGroup(ReligionGroup&&) = default;
-	};
-
-	struct Religion : HasIdentifierAndColour {
-		friend struct ReligionManager;
-
-		using icon_t = uint8_t;
-
-	private:
-		ReligionGroup const& group;
-		const icon_t icon;
-		const bool pagan;
-
-		Religion(const std::string_view new_identifier, colour_t new_colour, ReligionGroup const& new_group, icon_t new_icon, bool new_pagan);
-
-	public:
-		Religion(Religion&&) = default;
-
-		ReligionGroup const& get_group() const;
-		icon_t get_icon() const;
-		bool get_pagan() const;
-	};
-
-	struct ReligionManager {
-	private:
-		IdentifierRegistry<ReligionGroup> religion_groups;
-		IdentifierRegistry<Religion> religions;
-
-	public:
-		ReligionManager();
-
-		return_t add_religion_group(const std::string_view identifier);
-		void lock_religion_groups();
-		ReligionGroup const* get_religion_group_by_identifier(const std::string_view identifier) const;
-		return_t add_religion(const std::string_view identifier, colour_t colour, ReligionGroup const* group, Religion::icon_t icon, bool pagan);
-		void lock_religions();
-		Religion const* get_religion_by_identifier(const std::string_view identifier) const;
-	};
-}
diff --git a/src/openvic/utility/BMP.cpp b/src/openvic/utility/BMP.cpp
deleted file mode 100644
index 9a90d68..0000000
--- a/src/openvic/utility/BMP.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-#include "BMP.hpp"
-
-#include <cstring>
-#include <set>
-
-#include "Logger.hpp"
-
-using namespace OpenVic;
-
-BMP::~BMP() {
-	close();
-}
-
-return_t BMP::open(char const* filepath) {
-	reset();
-	errno = 0;
-	file = fopen(filepath, "rb");
-	if (file == nullptr || errno != 0) {
-		Logger::error("Failed to open BMP file \"", filepath, "\" (errno = ", errno, ")");
-		file = nullptr;
-		return FAILURE;
-	}
-	return SUCCESS;
-}
-
-return_t BMP::read_header() {
-	if (header_validated) {
-		Logger::error("BMP header already validated!");
-		return FAILURE;
-	}
-	if (file == nullptr) {
-		Logger::error("Cannot read BMP header before opening a file");
-		return FAILURE;
-	}
-	if (fseek(file, 0, SEEK_SET) != 0) {
-		Logger::error("Failed to move to the beginning of the BMP file!");
-		return FAILURE;
-	}
-	if (fread(&header, sizeof(header), 1, file) != 1) {
-		Logger::error("Failed to read BMP header!");
-		return FAILURE;
-	}
-	return_t ret = SUCCESS;
-
-	// Validate constants
-	static constexpr uint16_t BMP_SIGNATURE = 0x4d42;
-	if (header.signature != BMP_SIGNATURE) {
-		Logger::error("Invalid BMP signature: ", header.signature, " (must be ", BMP_SIGNATURE, ")");
-		ret = FAILURE;
-	}
-	static constexpr uint32_t DIB_HEADER_SIZE = 40;
-	if (header.dib_header_size != DIB_HEADER_SIZE) {
-		Logger::error("Invalid BMP DIB header size: ", header.dib_header_size, " (must be ", DIB_HEADER_SIZE, ")");
-		ret = FAILURE;
-	}
-	static constexpr uint16_t NUM_PLANES = 1;
-	if (header.num_planes != NUM_PLANES) {
-		Logger::error("Invalid BMP plane count: ", header.num_planes, " (must be ", NUM_PLANES, ")");
-		ret = FAILURE;
-	}
-	static constexpr uint16_t COMPRESSION = 0; // Only support uncompressed BMPs
-	if (header.compression != COMPRESSION) {
-		Logger::error("Invalid BMP compression method: ", header.compression, " (must be ", COMPRESSION, ")");
-		ret = FAILURE;
-	}
-
-	// Validate sizes and dimensions
-	// TODO - image_size_bytes can be 0 for non-compressed BMPs
-	if (header.file_size != header.offset + header.image_size_bytes) {
-		Logger::error("Invalid BMP memory sizes: file size = ", header.file_size, " != ", header.offset + header.image_size_bytes,
-			" = ", header.offset, " + ", header.image_size_bytes, " = image data offset + image data size");
-		ret = FAILURE;
-	}
-	// TODO - support negative widths (i.e. horizontal flip)
-	if (header.width_px <= 0) {
-		Logger::error("Invalid BMP width: ", header.width_px, " (must be positive)");
-		ret = FAILURE;
-	}
-	// TODO - support negative heights (i.e. vertical flip)
-	if (header.height_px <= 0) {
-		Logger::error("Invalid BMP height: ", header.height_px, " (must be positive)");
-		ret = FAILURE;
-	}
-	// TODO - validate x_resolution_ppm
-	// TODO - validate y_resolution_ppm
-
-	// Validate colours
-#define VALID_BITS_PER_PIXEL 1, 2, 4, 8, 16, 24, 32
-#define STR(x) #x
-	static const std::set<uint16_t> BITS_PER_PIXEL { VALID_BITS_PER_PIXEL };
-	if (!BITS_PER_PIXEL.contains(header.bits_per_pixel)) {
-		Logger::error("Invalid BMP bits per pixel: ", header.bits_per_pixel, " (must be one of " STR(VALID_BITS_PER_PIXEL) ")");
-		ret = FAILURE;
-	}
-#undef VALID_BITS_PER_PIXEL
-#undef STR
-	static constexpr uint16_t PALETTE_BITS_PER_PIXEL_LIMIT = 8;
-	if (header.num_colours != 0 && header.bits_per_pixel > PALETTE_BITS_PER_PIXEL_LIMIT) {
-		Logger::error("Invalid BMP palette size: ", header.num_colours, " (should be 0 as bits per pixel is ", header.bits_per_pixel, " > 8)");
-		ret = FAILURE;
-	}
-	// TODO - validate important_colours
-
-	palette_size = header.bits_per_pixel > PALETTE_BITS_PER_PIXEL_LIMIT ? 0
-		// Use header.num_colours if it's greater than 0 and at most 1 << header.bits_per_pixel
-		: 0 < header.num_colours && header.num_colours - 1 >> header.bits_per_pixel == 0 ? header.num_colours
-		: 1 << header.bits_per_pixel;
-
-	const uint32_t expected_offset = palette_size * PALETTE_COLOUR_SIZE + sizeof(header);
-	if (header.offset != expected_offset) {
-		Logger::error("Invalid BMP image data offset: ", header.offset, " (should be ", expected_offset, ")");
-		ret = FAILURE;
-	}
-
-	header_validated = ret == SUCCESS;
-	return ret;
-}
-
-return_t BMP::read_palette() {
-	if (file == nullptr) {
-		Logger::error("Cannot read BMP palette before opening a file");
-		return FAILURE;
-	}
-	if (!header_validated) {
-		Logger::error("Cannot read palette before BMP header is validated!");
-		return FAILURE;
-	}
-	if (palette_size == 0) {
-		Logger::error("Cannot read BMP palette - header indicates this file doesn't have one");
-		return FAILURE;
-	}
-	if (fseek(file, sizeof(header), SEEK_SET) != 0) {
-		Logger::error("Failed to move to the palette in the BMP file!");
-		return FAILURE;
-	}
-	palette.resize(palette_size);
-	if (fread(palette.data(), palette_size * PALETTE_COLOUR_SIZE, 1, file) != 1) {
-		Logger::error("Failed to read BMP header!");
-		palette.clear();
-		return FAILURE;
-	}
-	return SUCCESS;
-}
-
-void BMP::close() {
-	if (file != nullptr) {
-		if (fclose(file) != 0)
-			Logger::error("Failed to close BMP!");
-		file = nullptr;
-	}
-}
-
-void BMP::reset() {
-	close();
-	memset(&header, 0, sizeof(header));
-	header_validated = false;
-	palette_size = 0;
-	palette.clear();
-}
-
-std::vector<colour_t> const& BMP::get_palette() const {
-	return palette;
-}
diff --git a/src/openvic/utility/BMP.hpp b/src/openvic/utility/BMP.hpp
deleted file mode 100644
index c6f5815..0000000
--- a/src/openvic/utility/BMP.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include "../Types.hpp"
-
-namespace OpenVic {
-	class BMP {
-#pragma pack(push)
-#pragma pack(1)
-		struct header_t {
-			uint16_t signature;			// Signature: 0x4d42 (or 'B' 'M')
-			uint32_t file_size;			// File size in bytes
-			uint16_t reserved1;			// Not used
-			uint16_t reserved2;			// Not used
-			uint32_t offset;			// Offset to image data in bytes from beginning of file
-			uint32_t dib_header_size;	// DIB header size in bytes
-			int32_t width_px;			// Width of the image
-			int32_t height_px;			// Height of image
-			uint16_t num_planes;		// Number of colour planes
-			uint16_t bits_per_pixel;	// Bits per pixel
-			uint32_t compression;		// Compression type
-			uint32_t image_size_bytes;	// Image size in bytes
-			int32_t x_resolution_ppm;	// Pixels per meter
-			int32_t y_resolution_ppm;	// Pixels per meter
-			uint32_t num_colours;		// Number of colours
-			uint32_t important_colours; // Important colours
-		} header;
-#pragma pack(pop)
-
-		FILE* file = nullptr;
-		bool header_validated = false;
-		uint32_t palette_size = 0;
-		std::vector<colour_t> palette;
-
-	public:
-		static constexpr uint32_t PALETTE_COLOUR_SIZE = sizeof(colour_t);
-
-		BMP() = default;
-		~BMP();
-
-		return_t open(char const* filepath);
-		return_t read_header();
-		return_t read_palette();
-		void close();
-		void reset();
-
-		std::vector<colour_t> const& get_palette() const;
-	};
-}
diff --git a/src/openvic/utility/Logger.cpp b/src/openvic/utility/Logger.cpp
deleted file mode 100644
index bf9a67c..0000000
--- a/src/openvic/utility/Logger.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "Logger.hpp"
-
-#include <iostream>
-
-using namespace OpenVic;
-
-Logger::log_func_t Logger::info_func {};
-Logger::log_queue_t Logger::info_queue {};
-Logger::log_func_t Logger::error_func {};
-Logger::log_queue_t Logger::error_queue {};
-
-char const* Logger::get_filename(char const* filepath) {
-	if (filepath == nullptr) return nullptr;
-	char const* last_slash = filepath;
-	while (*filepath != '\0') {
-		if (*filepath == '\\' || *filepath == '/') last_slash = filepath + 1;
-		filepath++;
-	}
-	return last_slash;
-}
diff --git a/src/openvic/utility/Logger.hpp b/src/openvic/utility/Logger.hpp
deleted file mode 100644
index 417aba7..0000000
--- a/src/openvic/utility/Logger.hpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#pragma once
-
-#include <functional>
-#include <queue>
-#include <sstream>
-#ifdef __cpp_lib_source_location
-#include <source_location>
-#endif
-
-namespace OpenVic {
-
-#ifndef __cpp_lib_source_location
-#include <string>
-	// Implementation of std::source_location for compilers that do not support it
-	// Note: uses non-standard extensions that are supported by Clang, GCC, and MSVC
-	// https://clang.llvm.org/docs/LanguageExtensions.html#source-location-builtins
-	// https://stackoverflow.com/a/67970107
-	class source_location {
-		std::string _file;
-		int _line;
-		std::string _function;
-
-	public:
-		source_location(std::string f, int l, std::string n) : _file(f), _line(l), _function(n) {}
-		static source_location current(std::string f = __builtin_FILE(), int l = __builtin_LINE(), std::string n = __builtin_FUNCTION()) {
-			return source_location(f, l, n);
-		}
-
-		inline char const* file_name() const { return _file.c_str(); }
-		inline int line() const { return _line; }
-		inline char const* function_name() const { return _function.c_str(); }
-	};
-#endif
-
-	class Logger {
-		using log_func_t = std::function<void(std::string&&)>;
-		using log_queue_t = std::queue<std::string>;
-
-#ifdef __cpp_lib_source_location
-		using source_location = std::source_location;
-#else
-		using source_location = OpenVic::source_location;
-#endif
-
-		static char const* get_filename(char const* filepath);
-
-		template<typename... Ts>
-		struct log {
-			log(log_func_t log_func, log_queue_t& log_queue, Ts&&... ts, source_location const& location) {
-				std::stringstream stream;
-				stream << "\n" << get_filename(location.file_name()) << "("
-						<< location.line() << ") `" << location.function_name() << "`: ";
-				((stream << std::forward<Ts>(ts)), ...);
-				stream << std::endl;
-				log_queue.push(stream.str());
-				if (log_func) {
-					do {
-						log_func(std::move(log_queue.front()));
-						log_queue.pop();
-					} while (!log_queue.empty());
-				}
-			}
-		};
-
-#define LOG_FUNC(name)																			\
-	private:																					\
-		static log_func_t name##_func;															\
-		static log_queue_t name##_queue;														\
-	public:																						\
-		static void set_##name##_func(log_func_t log_func) {									\
-			name##_func = log_func;																\
-		}																						\
-		template <typename... Ts>																\
-		struct name {																			\
-			name(Ts&&... ts, source_location const& location = source_location::current()) {	\
-				log<Ts...>{ name##_func, name##_queue, std::forward<Ts>(ts)..., location };		\
-			}																					\
-		};																						\
-		template <typename... Ts>																\
-		name(Ts&&...) -> name<Ts...>;
-
-		LOG_FUNC(info)
-		LOG_FUNC(error)
-
-#undef LOG_FUNC
-	};
-}