From 40d02748924aa7c48b04cf948204d8dacdfbbc74 Mon Sep 17 00:00:00 2001
From: HampusM <hampus@hampusmat.com>
Date: Sat, 30 Apr 2022 16:28:13 +0200
Subject: refactor: replace DI files with the yacppdic library

---
 lib/CMakeLists.txt                     |   8 ++
 lib/yacppdic/CMakeLists.txt            |   4 +
 src/CMakeLists.txt                     |  12 +-
 src/DI/alloc_functor.hpp               |  84 --------------
 src/DI/alloc_functor.tpp               | 179 -----------------------------
 src/DI/allocation.hpp                  |  32 ------
 src/DI/allocation.tpp                  |  18 ---
 src/DI/auto_wirable.hpp                |  15 ---
 src/DI/auto_wirable.tpp                |  11 --
 src/DI/compressed_pair.hpp             | 200 ---------------------------------
 src/DI/concepts.hpp                    |  11 --
 src/DI/container.cpp                   |   9 --
 src/DI/container.hpp                   |  60 ----------
 src/DI/container.tpp                   |  82 --------------
 src/DI/copyable_functor.hpp            |  47 --------
 src/DI/copyable_functor.tpp            | 107 ------------------
 src/DI/extra_concepts.hpp              |   6 -
 src/DI/factory.hpp                     | 192 -------------------------------
 src/DI/factory.tpp                     |  65 -----------
 src/DI/function_wrapper.hpp            |  20 ----
 src/DI/function_wrapper.tpp            |  17 ---
 src/DI/interfaces/copyable_functor.hpp |  41 -------
 src/DI/interfaces/wrapper.hpp          |  17 ---
 src/DI/object_type.cpp                 |  27 -----
 src/DI/object_type.hpp                 |  32 ------
 src/DI/object_wrapper.hpp              |  20 ----
 src/DI/object_wrapper.tpp              |  10 --
 src/DI/strip_signature.hpp             | 103 -----------------
 src/DI/type_traits.hpp                 |  18 ---
 src/DI/value_functor.hpp               |  65 -----------
 src/DI/value_functor.tpp               | 191 -------------------------------
 src/argument_parser.hpp                |   6 +-
 src/bootstrap.cpp                      |   6 +-
 src/bootstrap.hpp                      |   4 +-
 src/engine/engine.hpp                  |   5 +-
 src/engine/graphics/window.hpp         |   5 +-
 src/engine/user/cursor.hpp             |   5 +-
 src/engine/user/input.hpp              |   6 +-
 src/interfaces/game.hpp                |   4 +-
 src/interfaces/generation_tracker.hpp  |   4 +-
 src/interfaces/matrix.hpp              |   6 +-
 src/interfaces/randomization.hpp       |   4 +-
 src/interfaces/scene.hpp               |   4 +-
 src/interfaces/status_updater.hpp      |   5 +-
 src/interfaces/statusline.hpp          |   4 +-
 src/randomization/seed_generator.hpp   |   5 +-
 46 files changed, 62 insertions(+), 1714 deletions(-)
 create mode 100644 lib/yacppdic/CMakeLists.txt
 delete mode 100644 src/DI/alloc_functor.hpp
 delete mode 100644 src/DI/alloc_functor.tpp
 delete mode 100644 src/DI/allocation.hpp
 delete mode 100644 src/DI/allocation.tpp
 delete mode 100644 src/DI/auto_wirable.hpp
 delete mode 100644 src/DI/auto_wirable.tpp
 delete mode 100644 src/DI/compressed_pair.hpp
 delete mode 100644 src/DI/concepts.hpp
 delete mode 100644 src/DI/container.cpp
 delete mode 100644 src/DI/container.hpp
 delete mode 100644 src/DI/container.tpp
 delete mode 100644 src/DI/copyable_functor.hpp
 delete mode 100644 src/DI/copyable_functor.tpp
 delete mode 100644 src/DI/extra_concepts.hpp
 delete mode 100644 src/DI/factory.hpp
 delete mode 100644 src/DI/factory.tpp
 delete mode 100644 src/DI/function_wrapper.hpp
 delete mode 100644 src/DI/function_wrapper.tpp
 delete mode 100644 src/DI/interfaces/copyable_functor.hpp
 delete mode 100644 src/DI/interfaces/wrapper.hpp
 delete mode 100644 src/DI/object_type.cpp
 delete mode 100644 src/DI/object_type.hpp
 delete mode 100644 src/DI/object_wrapper.hpp
 delete mode 100644 src/DI/object_wrapper.tpp
 delete mode 100644 src/DI/strip_signature.hpp
 delete mode 100644 src/DI/type_traits.hpp
 delete mode 100644 src/DI/value_functor.hpp
 delete mode 100644 src/DI/value_functor.tpp

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 0873b00..7fdf83c 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -24,6 +24,14 @@ FetchContent_Declare(
 
 add_subdirectory(GSL)
 
+FetchContent_Declare(
+  yacppdic
+  GIT_REPOSITORY "https://git.hampusmat.com/yacppdic"
+  GIT_TAG v0.1.2
+)
+
+add_subdirectory(yacppdic)
+
 if("${TESTING}")
 	FetchContent_Declare(
 		doctest
diff --git a/lib/yacppdic/CMakeLists.txt b/lib/yacppdic/CMakeLists.txt
new file mode 100644
index 0000000..73b7471
--- /dev/null
+++ b/lib/yacppdic/CMakeLists.txt
@@ -0,0 +1,4 @@
+message(STATUS "Fetching yacppdic...")
+
+FetchContent_MakeAvailable(yacppdic)
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 679949b..92ce76b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,7 +51,7 @@ target_compile_options(
 	-Wsign-conversion -Wsign-promo
 	-Wstrict-overflow=5 -Wswitch-default
 	-Wundef -Werror
-	-pedantic -fsanitize=address -fno-exceptions -stdlib=libc++
+	-pedantic -fsanitize=address -fno-exceptions
 )
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
@@ -64,6 +64,12 @@ endif()
 
 target_include_directories(${PROJECT_NAME} PRIVATE .)
 
-target_link_libraries_system(${PROJECT_NAME} ctre fmt::fmt-header-only GSL)
+target_link_libraries_system(
+	${PROJECT_NAME}
+	ctre
+	fmt::fmt-header-only
+	GSL
+	yacppdic
+)
 
-target_link_options(${PROJECT_NAME} PRIVATE -fsanitize=address -stdlib=libc++)
+target_link_options(${PROJECT_NAME} PRIVATE -fsanitize=address)
diff --git a/src/DI/alloc_functor.hpp b/src/DI/alloc_functor.hpp
deleted file mode 100644
index ea40b22..0000000
--- a/src/DI/alloc_functor.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-#pragma once
-
-#include "DI/allocation.hpp"
-#include "DI/compressed_pair.hpp"
-
-#include <memory>
-#include <type_traits>
-#include <utility>
-
-template <typename Return>
-struct InvokeReturnWrapper
-{
-	template <typename... Args>
-	static auto call(Args &&...args) -> Return;
-};
-
-/**
- * Holds a functor and a allocator.
- */
-template <class Function, class Allocator, class FunctionSignature>
-class AllocFunctor;
-
-template <class Function, class Allocator, class Return, class... Args>
-class AllocFunctor<Function, Allocator, Return(Args...)>
-{
-public:
-	using Target = Function;
-	using Alloc = Allocator;
-
-	explicit AllocFunctor(Target &&function);
-
-	explicit AllocFunctor(const Target &function, const Alloc &allocator);
-
-	explicit AllocFunctor(const Target &function, Alloc &&allocator);
-
-	explicit AllocFunctor(Target &&function, Alloc &&allocator);
-
-	auto operator()(Args &&...args) -> Return;
-
-	[[nodiscard]] auto target() const -> const Target &;
-
-	[[nodiscard]] auto get_allocator() const -> const Alloc &;
-
-	[[nodiscard]] auto clone() const -> AllocFunctor *;
-
-	void destroy() noexcept;
-
-	static void destroy_and_delete(AllocFunctor *functor);
-
-private:
-	CompressedPair<Function, Allocator> _function;
-};
-
-/**
- * Holds a functor and a allocator.
- */
-template <class Function, class FB>
-class DefaultAllocFunctor;
-
-template <class Function, class Return, class... Args>
-class DefaultAllocFunctor<Function, Return(Args...)>
-{
-public:
-	using Target = Function;
-
-	explicit DefaultAllocFunctor(Target &&function);
-
-	explicit DefaultAllocFunctor(const Target &function);
-
-	auto operator()(Args &&...args) -> Return;
-
-	auto target() const -> const Target &;
-
-	auto clone() const -> DefaultAllocFunctor *;
-
-	void destroy() noexcept;
-
-	static void destroy_and_delete(DefaultAllocFunctor *function);
-
-private:
-	Function _function;
-};
-
-#include "alloc_functor.tpp"
diff --git a/src/DI/alloc_functor.tpp b/src/DI/alloc_functor.tpp
deleted file mode 100644
index 9611a3d..0000000
--- a/src/DI/alloc_functor.tpp
+++ /dev/null
@@ -1,179 +0,0 @@
-#pragma once
-
-#include "alloc_functor.hpp"
-
-template <class Return>
-template <class... Args>
-auto InvokeReturnWrapper<Return>::call(Args &&...args) -> Return
-{
-	return std::invoke(std::forward<Args>(args)...);
-}
-
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define ALLOC_FUNCTOR_TEMPLATE                                                           \
-	template <class Function, class Allocator, class Return, class... Args>
-
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define ALLOC_FUNCTOR AllocFunctor<Function, Allocator, Return(Args...)>
-
-ALLOC_FUNCTOR_TEMPLATE
-ALLOC_FUNCTOR::AllocFunctor(Target &&function)
-	: _function(
-		  std::piecewise_construct,
-		  std::forward_as_tuple(std::move(function)),
-		  std::forward_as_tuple()
-	  )
-{
-}
-
-ALLOC_FUNCTOR_TEMPLATE
-ALLOC_FUNCTOR::AllocFunctor(const Target &function, const Alloc &allocator)
-	: _function(
-		  std::piecewise_construct,
-		  std::forward_as_tuple(function),
-		  std::forward_as_tuple(allocator)
-	  )
-{
-}
-
-ALLOC_FUNCTOR_TEMPLATE
-ALLOC_FUNCTOR::AllocFunctor(const Target &function, Alloc &&allocator)
-	: _function(
-		  std::piecewise_construct,
-		  std::forward_as_tuple(function),
-		  std::forward_as_tuple(std::move(allocator))
-	  )
-{
-}
-
-ALLOC_FUNCTOR_TEMPLATE
-ALLOC_FUNCTOR::AllocFunctor(Target &&function, Alloc &&allocator)
-	: _function(
-		  std::piecewise_construct,
-		  std::forward_as_tuple(std::move(function)),
-		  std::forward_as_tuple(std::move(allocator))
-	  )
-{
-}
-
-ALLOC_FUNCTOR_TEMPLATE
-auto ALLOC_FUNCTOR::operator()(Args &&...args) -> Return
-{
-	using Invoker = InvokeReturnWrapper<Return>;
-
-	return Invoker::call(_function.first(), std::forward<Args>(args)...);
-}
-
-ALLOC_FUNCTOR_TEMPLATE
-auto ALLOC_FUNCTOR::target() const -> const Target &
-{
-	return _function.first();
-}
-
-ALLOC_FUNCTOR_TEMPLATE
-auto ALLOC_FUNCTOR::get_allocator() const -> const Alloc &
-{
-	return _function.second();
-}
-
-ALLOC_FUNCTOR_TEMPLATE
-auto ALLOC_FUNCTOR::clone() const -> AllocFunctor *
-{
-	using AllocTraits = std::allocator_traits<Alloc>;
-
-	using AllocHelper = typename RebindAllocHelper<AllocTraits, AllocFunctor>::type;
-
-	auto alloc_helper = AllocHelper(_function.second());
-
-	using Destructor = AllocDestructor<AllocHelper>;
-
-	auto hold = std::unique_ptr<AllocFunctor, Destructor>(
-		alloc_helper.allocate(1),
-		_Dp(alloc_helper, 1)
-	);
-
-	::new (static_cast<void *>(hold.get()))
-		AllocFunctor(_function.first(), _Alloc(alloc_helper));
-
-	return hold.release();
-}
-
-ALLOC_FUNCTOR_TEMPLATE
-void ALLOC_FUNCTOR::destroy() noexcept
-{
-	_function.~CompressedPair<Target, Alloc>();
-}
-
-ALLOC_FUNCTOR_TEMPLATE
-void ALLOC_FUNCTOR::destroy_and_delete(AllocFunctor *functor)
-{
-	using AllocTraits = std::allocator_traits<Alloc>;
-
-	using FunctorAlloc = typename RebindAllocHelper<AllocTraits, AllocFunctor>::type;
-
-	auto functor_alloc = FunctorAlloc(functor->get_allocator());
-
-	functor->destroy();
-	functor_alloc.deallocate(functor, 1);
-}
-
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define DEFAULT_ALLOC_FUNCTOR_TEMPLATE                                                   \
-	template <class Function, class Return, class... Args>
-
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define DEFAULT_ALLOC_FUNCTOR DefaultAllocFunctor<Function, Return(Args...)>
-
-DEFAULT_ALLOC_FUNCTOR_TEMPLATE
-DEFAULT_ALLOC_FUNCTOR::DefaultAllocFunctor(Target &&function)
-	: _function(std::move(function))
-{
-}
-
-DEFAULT_ALLOC_FUNCTOR_TEMPLATE
-DEFAULT_ALLOC_FUNCTOR::DefaultAllocFunctor(const Target &function) : _function(function)
-{
-}
-
-DEFAULT_ALLOC_FUNCTOR_TEMPLATE
-auto DEFAULT_ALLOC_FUNCTOR::operator()(Args &&...args) -> Return
-{
-	using Invoker = InvokeReturnWrapper<Return>;
-
-	return Invoker::call(_function, std::forward<Args>(args)...);
-}
-
-DEFAULT_ALLOC_FUNCTOR_TEMPLATE
-auto DEFAULT_ALLOC_FUNCTOR::target() const -> const Target &
-{
-	return _function;
-}
-
-DEFAULT_ALLOC_FUNCTOR_TEMPLATE
-auto DEFAULT_ALLOC_FUNCTOR::clone() const -> DefaultAllocFunctor *
-{
-	std::allocator<DefaultAllocFunctor> allocator;
-
-	DefaultAllocFunctor *functor_ptr = allocator.allocate(1);
-
-	// NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
-	auto *res = ::new (static_cast<void *>(functor_ptr)) DefaultAllocFunctor(_function);
-
-	return res;
-}
-
-DEFAULT_ALLOC_FUNCTOR_TEMPLATE
-void DEFAULT_ALLOC_FUNCTOR::destroy() noexcept
-{
-	_function.~_Target();
-}
-
-DEFAULT_ALLOC_FUNCTOR_TEMPLATE
-void DEFAULT_ALLOC_FUNCTOR::destroy_and_delete(DefaultAllocFunctor *function)
-{
-	function->destroy();
-
-	std::allocator<DefaultAllocFunctor> allocator;
-
-	allocator.deallocate(function, 1);
-}
diff --git a/src/DI/allocation.hpp b/src/DI/allocation.hpp
deleted file mode 100644
index ac0fa38..0000000
--- a/src/DI/allocation.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <memory>
-
-template <class Traits, class Type>
-struct RebindAllocHelper
-{
-	using type = typename Traits::template rebind_alloc<Type>;
-};
-
-template <class Allocator>
-class AllocDestructor
-{
-	using _alloc_traits = std::allocator_traits<Allocator>;
-
-public:
-	using Pointer = typename _alloc_traits::pointer;
-	using Size = typename _alloc_traits::size_type;
-
-	using pointer = Pointer;
-	using size = Size;
-
-	AllocDestructor(Allocator &allocator, Size alloc_size) noexcept;
-
-	void operator()(Pointer ptr) noexcept;
-
-private:
-	Allocator &_allocator;
-	Size _size;
-};
-
-#include "allocation.tpp"
diff --git a/src/DI/allocation.tpp b/src/DI/allocation.tpp
deleted file mode 100644
index 8753970..0000000
--- a/src/DI/allocation.tpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "allocation.hpp"
-
-template <class Allocator>
-AllocDestructor<Allocator>::AllocDestructor(
-	Allocator &allocator,
-	Size alloc_size
-) noexcept
-	: _allocator(allocator), _size(alloc_size)
-{
-}
-
-template <class Allocator>
-void AllocDestructor<Allocator>::operator()(Pointer ptr) noexcept
-{
-	_alloc_traits::deallocate(_allocator, ptr, _size);
-}
diff --git a/src/DI/auto_wirable.hpp b/src/DI/auto_wirable.hpp
deleted file mode 100644
index 7c94074..0000000
--- a/src/DI/auto_wirable.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "DI/container.hpp"
-
-#include <memory>
-
-template <class Interface, class ObjectImpl, class... Dependencies>
-class AutoWirable
-{
-public:
-	static auto resolve(const Container &container) noexcept
-		-> std::unique_ptr<Interface>;
-};
-
-#include "auto_wirable.tpp"
diff --git a/src/DI/auto_wirable.tpp b/src/DI/auto_wirable.tpp
deleted file mode 100644
index 4ad34c4..0000000
--- a/src/DI/auto_wirable.tpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "auto_wirable.hpp"
-
-template <class Interface, class ObjectImpl, class... Dependencies>
-auto AutoWirable<Interface, ObjectImpl, Dependencies...>::resolve(
-	const Container &container
-) noexcept -> std::unique_ptr<Interface>
-{
-	return std::make_unique<ObjectImpl>(container.get<Dependencies>()...);
-}
diff --git a/src/DI/compressed_pair.hpp b/src/DI/compressed_pair.hpp
deleted file mode 100644
index b8646db..0000000
--- a/src/DI/compressed_pair.hpp
+++ /dev/null
@@ -1,200 +0,0 @@
-#pragma once
-
-#include "DI/extra_concepts.hpp"
-
-#include <concepts>
-#include <tuple>
-#include <type_traits>
-#include <utility>
-
-// Tag used to default initialize one or both of the pair's elements.
-struct DefaultInitTag
-{
-};
-
-struct ValueInitTag
-{
-};
-
-template <size_t...>
-struct TupleIndices
-{
-};
-
-template <class IdxType, IdxType... Values>
-struct IntegerSequence
-{
-	template <template <class OIdxType, OIdxType...> class ToIndexSeq, class ToIndexType>
-	using Convert = ToIndexSeq<ToIndexType, Values...>;
-
-	template <size_t Sp>
-	using ToTupleIndices = TupleIndices<(Values + Sp)...>;
-};
-
-template <size_t SizeOne, size_t SizeTwo>
-using MakeIndices =
-	typename __make_integer_seq<IntegerSequence, size_t, SizeOne - SizeTwo>::
-		template ToTupleIndices<SizeTwo>;
-
-template <size_t SizeOne, size_t SizeTwo = 0>
-requires(SizeTwo <= SizeOne) struct MakeTupleIndices
-{
-	using type = MakeIndices<SizeOne, SizeTwo>;
-};
-
-template <typename Value>
-concept ValueCanBeEmptyBase = std::is_empty_v<Value> && !std::is_final_v<Value>;
-
-template <class Value, int Idx>
-struct CompressedPairElement
-{
-	using ValueReference = Value &;
-	using ConstValueReference = const Value &;
-
-	constexpr explicit CompressedPairElement(DefaultInitTag /*unused*/) {}
-
-	constexpr explicit CompressedPairElement(ValueInitTag /*unused*/) : _value() {}
-
-	template <class ElementValue>
-	requires std::same_as<CompressedPairElement, typename std::decay<ElementValue>::type>
-	// NOLINTNEXTLINE(bugprone-forwarding-reference-overload)
-	constexpr explicit CompressedPairElement(ElementValue &&value)
-		: _value(std::forward<ElementValue>(value))
-	{
-	}
-
-	template <class... Args, size_t... Indexes>
-	constexpr CompressedPairElement(
-		std::piecewise_construct_t /*unused*/,
-		std::tuple<Args...> args,
-		TupleIndices<Indexes...> /*unused*/
-	)
-		: _value(std::forward<Args>(std::get<Indexes>(args))...)
-	{
-	}
-
-	auto get() noexcept -> ValueReference
-	{
-		return _value;
-	}
-
-	[[nodiscard]] auto get() const noexcept -> ConstValueReference
-	{
-		return _value;
-	}
-
-private:
-	Value _value;
-};
-
-template <class Value, int Idx>
-requires ValueCanBeEmptyBase<Value>
-struct CompressedPairElement<Value, Idx> : private Value
-{
-	using ValueReference = Value &;
-	using ConstValueReference = const Value &;
-
-	constexpr CompressedPairElement() = default;
-
-	constexpr explicit CompressedPairElement(DefaultInitTag /*unused*/) {}
-
-	constexpr explicit CompressedPairElement(ValueInitTag /*unused*/) : Value() {}
-
-	template <class ElementValue>
-	requires std::same_as<CompressedPairElement, typename std::decay<ElementValue>::type>
-	// NOLINTNEXTLINE(bugprone-forwarding-reference-overload)
-	constexpr explicit CompressedPairElement(ElementValue &&value)
-		: Value(std::forward<ElementValue>(value))
-	{
-	}
-
-	template <class... Args, size_t... Indexes>
-	constexpr CompressedPairElement(
-		std::piecewise_construct_t /*unused*/,
-		std::tuple<Args...> args,
-		TupleIndices<Indexes...> /*unused*/
-	)
-		: Value(std::forward<Args>(std::get<Indexes>(args))...)
-	{
-	}
-
-	auto get() noexcept -> ValueReference
-	{
-		return *this;
-	}
-
-	[[nodiscard]] auto get() const noexcept -> ConstValueReference
-	{
-		return *this;
-	}
-};
-
-template <class ValueOne, class ValueTwo>
-requires NotSameAs<ValueOne, ValueTwo>
-class CompressedPair : private CompressedPairElement<ValueOne, 0>,
-					   private CompressedPairElement<ValueTwo, 1>
-{
-public:
-	using BaseOne = CompressedPairElement<ValueOne, 0>;
-	using BaseTwo = CompressedPairElement<ValueTwo, 1>;
-
-	template <typename>
-	requires std::default_initializable<ValueOne> && std::default_initializable<ValueTwo>
-	constexpr CompressedPair() : BaseOne(ValueInitTag()), BaseTwo(ValueInitTag()) {}
-
-	template <class FirstValue, class SecondValue>
-	constexpr CompressedPair(FirstValue &&first_value, SecondValue &&second_value)
-		: BaseOne(std::forward<FirstValue>(first_value)),
-		  BaseTwo(std::forward<SecondValue>(second_value))
-	{
-	}
-
-	template <class... ArgsOne, class... ArgsTwo>
-	constexpr CompressedPair(
-		std::piecewise_construct_t piecewise_construct,
-		std::tuple<ArgsOne...> first_args,
-		std::tuple<ArgsTwo...> second_args
-	)
-		: BaseOne(
-			  piecewise_construct,
-			  std::move(first_args),
-			  typename MakeTupleIndices<sizeof...(ArgsOne)>::type()
-		  ),
-		  BaseTwo(
-			  piecewise_construct,
-			  std::move(second_args),
-			  typename MakeTupleIndices<sizeof...(ArgsTwo)>::type()
-		  )
-	{
-	}
-
-	auto first() noexcept -> typename BaseOne::ValueReference
-	{
-		return static_cast<BaseOne &>(*this).get();
-	}
-
-	[[nodiscard]] auto first() const noexcept -> typename BaseOne::ConstValueReference
-	{
-		return static_cast<BaseOne const &>(*this).get();
-	}
-
-	auto second() noexcept -> typename BaseTwo::ValueReference
-	{
-		return static_cast<BaseTwo &>(*this).get();
-	}
-
-	[[nodiscard]] auto second() const noexcept -> typename BaseTwo::ConstValueReference
-	{
-		return static_cast<BaseTwo const &>(*this).get();
-	}
-
-	constexpr static auto get_first_base(CompressedPair *pair) noexcept -> BaseOne *
-	{
-		return static_cast<BaseOne *>(pair);
-	}
-
-	constexpr static auto get_second_base(CompressedPair *pair) noexcept -> BaseTwo *
-	{
-		return static_cast<BaseTwo *>(pair);
-	}
-};
diff --git a/src/DI/concepts.hpp b/src/DI/concepts.hpp
deleted file mode 100644
index 4b2c7f9..0000000
--- a/src/DI/concepts.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "type_traits.hpp"
-
-#include <type_traits>
-
-template <typename Type>
-concept Abstract = std::is_abstract_v<Type>;
-
-template <typename Type>
-concept IsFactory = is_factory_v<Type>;
diff --git a/src/DI/container.cpp b/src/DI/container.cpp
deleted file mode 100644
index f27b1fa..0000000
--- a/src/DI/container.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "container.hpp"
-
-void Container::add(
-	BaseObjectType type,
-	const WrapperPtr<IGenericWrapper> &wrapper
-) noexcept
-{
-	_bindings.insert({ type, wrapper });
-}
diff --git a/src/DI/container.hpp b/src/DI/container.hpp
deleted file mode 100644
index d5f52b8..0000000
--- a/src/DI/container.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-
-#include "DI/interfaces/wrapper.hpp"
-
-#include "DI/concepts.hpp"
-#include "DI/factory.hpp"
-#include "DI/object_type.hpp"
-
-#include <concepts>
-#include <functional>
-#include <memory>
-#include <unordered_map>
-
-class Container;
-
-template <typename Interface>
-class BindingBuilder
-{
-public:
-	explicit BindingBuilder(Container *container) noexcept;
-
-	template <typename Impl>
-	requires Abstract<Interface> && std::derived_from<Impl, Interface>
-	void to() noexcept;
-
-	template <typename FactoryFunc>
-	requires IsFactory<Interface> && std::constructible_from<Interface, FactoryFunc>
-	void to_factory(FactoryFunc factory) noexcept;
-
-private:
-	Container *_container;
-};
-
-class Container
-{
-public:
-	Container() noexcept = default;
-
-	template <typename Type>
-	using WrapperPtr = std::shared_ptr<Type>;
-
-	template <class Interface>
-	auto bind() noexcept -> BindingBuilder<Interface>;
-
-	template <class Interface>
-	requires Abstract<Interface>
-	auto get() const noexcept -> std::unique_ptr<Interface>;
-
-	template <typename AFactory>
-	requires IsFactory<AFactory>
-	auto get() const noexcept -> AFactory;
-
-	void add(BaseObjectType type, const WrapperPtr<IGenericWrapper> &wrapper) noexcept;
-
-private:
-	std::unordered_map<BaseObjectType, WrapperPtr<IGenericWrapper>, ObjectTypeHasher>
-		_bindings;
-};
-
-#include "container.tpp"
diff --git a/src/DI/container.tpp b/src/DI/container.tpp
deleted file mode 100644
index d81a0cc..0000000
--- a/src/DI/container.tpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#pragma once
-
-#include "container.hpp"
-
-#include "function_wrapper.hpp"
-#include "object_wrapper.hpp"
-
-#include <iostream>
-
-template <typename Interface>
-BindingBuilder<Interface>::BindingBuilder(Container *container) noexcept
-	: _container(container)
-{
-}
-
-template <typename Interface>
-template <typename Impl>
-requires Abstract<Interface> && std::derived_from<Impl, Interface>
-void BindingBuilder<Interface>::to() noexcept
-{
-	using Wrapper = ObjectWrapper<Interface, Impl>;
-
-	auto wrapper = Container::WrapperPtr<Wrapper>(new Wrapper(*_container));
-
-	_container->add(
-		ObjectType<Interface>(),
-		std::dynamic_pointer_cast<IGenericWrapper>(wrapper)
-	);
-}
-
-template <typename Interface>
-template <typename FactoryFunc>
-requires IsFactory<Interface> && std::constructible_from<Interface, FactoryFunc>
-void BindingBuilder<Interface>::to_factory(FactoryFunc factory) noexcept
-{
-	using Wrapper = FunctionWrapper<Interface>;
-
-	auto wrapper = Container::WrapperPtr<Wrapper>(new Wrapper(factory));
-
-	_container->add(
-		ObjectType<Interface>(),
-		std::dynamic_pointer_cast<IGenericWrapper>(wrapper)
-	);
-}
-
-template <typename Interface>
-auto Container::bind() noexcept -> BindingBuilder<Interface>
-{
-	return BindingBuilder<Interface>(this);
-}
-
-template <typename Interface>
-requires Abstract<Interface>
-auto Container::get() const noexcept -> std::unique_ptr<Interface>
-{
-	ObjectType<Interface> interface_type;
-
-	if (_bindings.count(interface_type) == 0)
-	{
-		std::cerr
-			<< "Error: Tried to get a item from the container using unbound interface '"
-			<< interface_type.name() << "'" << std::endl;
-		exit(EXIT_FAILURE);
-	}
-
-	auto wrapper = std::dynamic_pointer_cast<IWrapper<std::unique_ptr<Interface>>>(
-		_bindings.at(interface_type)
-	);
-
-	return wrapper->get();
-}
-
-template <typename AFactory>
-requires IsFactory<AFactory>
-auto Container::get() const noexcept -> AFactory
-{
-	auto wrapper =
-		std::dynamic_pointer_cast<IWrapper<AFactory>>(_bindings.at(ObjectType<AFactory>())
-		);
-
-	return wrapper->get();
-}
diff --git a/src/DI/copyable_functor.hpp b/src/DI/copyable_functor.hpp
deleted file mode 100644
index 905da03..0000000
--- a/src/DI/copyable_functor.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#pragma once
-
-#include "DI/interfaces/copyable_functor.hpp"
-
-#include "DI/alloc_functor.hpp"
-
-#include <typeinfo>
-
-/**
- * A copyable function object.
- */
-template <class Function, class Allocator, class FunctionSignature>
-class CopyableFunctor;
-
-template <class Function, class Allocator, class Return, class... Args>
-class CopyableFunctor<Function, Allocator, Return(Args...)>
-	: public ICopyableFunctor<Return(Args...)>
-{
-public:
-	explicit CopyableFunctor(Function &&function);
-
-	explicit CopyableFunctor(const Function &function, const Allocator &allocator);
-
-	explicit CopyableFunctor(const Function &function, Allocator &&allocator);
-
-	explicit CopyableFunctor(Function &&function, Allocator &&allocator);
-
-	auto operator()(Args &&...args) -> Return override;
-
-	auto clone() const -> ICopyableFunctor<Return(Args...)> * override;
-
-	void clone(ICopyableFunctor<Return(Args...)> *functor) const override;
-
-	void destroy() noexcept override;
-
-	void destroy_deallocate() noexcept override;
-
-	[[nodiscard]] auto target(const std::type_info &type_info) const noexcept -> const
-		void * override;
-
-	[[nodiscard]] auto target_type() const noexcept -> const std::type_info & override;
-
-private:
-	AllocFunctor<Function, Allocator, Return(Args...)> _functor;
-};
-
-#include "copyable_functor.tpp"
diff --git a/src/DI/copyable_functor.tpp b/src/DI/copyable_functor.tpp
deleted file mode 100644
index d8da3bb..0000000
--- a/src/DI/copyable_functor.tpp
+++ /dev/null
@@ -1,107 +0,0 @@
-#pragma once
-
-#include "copyable_functor.hpp"
-
-#include <memory>
-#include <utility>
-
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define COPYABLE_FUNCTOR_TEMPLATE                                                        \
-	template <class Function, class Allocator, class Return, class... Args>
-
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define COPYABLE_FUNCTOR CopyableFunctor<Function, Allocator, Return(Args...)>
-
-COPYABLE_FUNCTOR_TEMPLATE
-COPYABLE_FUNCTOR::CopyableFunctor(Function &&function) : _functor(std::move(function)) {}
-
-COPYABLE_FUNCTOR_TEMPLATE
-COPYABLE_FUNCTOR::CopyableFunctor(const Function &function, const Allocator &allocator)
-	: _functor(function, allocator)
-{
-}
-
-COPYABLE_FUNCTOR_TEMPLATE
-COPYABLE_FUNCTOR::CopyableFunctor(const Function &function, Allocator &&allocator)
-	: _functor(function, std::move(allocator))
-{
-}
-
-COPYABLE_FUNCTOR_TEMPLATE
-COPYABLE_FUNCTOR::CopyableFunctor(Function &&function, Allocator &&allocator)
-	: _functor(std::move(function), std::move(allocator))
-{
-}
-
-COPYABLE_FUNCTOR_TEMPLATE
-auto COPYABLE_FUNCTOR::operator()(Args &&...args) -> Return
-{
-	return _functor(std::forward<Args>(args)...);
-}
-
-COPYABLE_FUNCTOR_TEMPLATE
-auto COPYABLE_FUNCTOR::clone() const -> ICopyableFunctor<Return(Args...)> *
-{
-	using AllocTraits = std::allocator_traits<Allocator>;
-
-	using AllocHelper = typename RebindAllocHelper<AllocTraits, CopyableFunctor>::type;
-
-	auto alloc_helper = AllocHelper(_functor.get_allocator());
-
-	using Destructor = AllocDestructor<AllocHelper>;
-
-	auto hold = std::unique_ptr<CopyableFunctor, Destructor>(
-		alloc_helper.allocate(1),
-		Destructor(alloc_helper, 1)
-	);
-
-	::new (static_cast<void *>(hold.get()))
-		CopyableFunctor(_functor.target(), Allocator(alloc_helper));
-
-	return hold.release();
-}
-
-COPYABLE_FUNCTOR_TEMPLATE
-void COPYABLE_FUNCTOR::clone(ICopyableFunctor<Return(Args...)> *functor) const
-{
-	::new (static_cast<void *>(functor))
-		CopyableFunctor(_functor.target(), _functor.get_allocator());
-}
-
-COPYABLE_FUNCTOR_TEMPLATE
-void COPYABLE_FUNCTOR::destroy() noexcept
-{
-	_functor.destroy();
-}
-
-COPYABLE_FUNCTOR_TEMPLATE
-void COPYABLE_FUNCTOR::destroy_deallocate() noexcept
-{
-	using AllocTraits = std::allocator_traits<Allocator>;
-
-	using AllocHelper = typename RebindAllocHelper<AllocTraits, CopyableFunctor>::type;
-
-	auto alloc_helper = AllocHelper(_functor.get_allocator());
-
-	_functor.destroy();
-
-	alloc_helper.deallocate(this, 1);
-}
-
-COPYABLE_FUNCTOR_TEMPLATE
-auto COPYABLE_FUNCTOR::target(const std::type_info &type_info) const noexcept -> const
-	void *
-{
-	if (type_info == typeid(Function))
-	{
-		return std::addressof(_functor.target());
-	}
-
-	return nullptr;
-}
-
-COPYABLE_FUNCTOR_TEMPLATE
-auto COPYABLE_FUNCTOR::target_type() const noexcept -> const std::type_info &
-{
-	return typeid(Function);
-}
diff --git a/src/DI/extra_concepts.hpp b/src/DI/extra_concepts.hpp
deleted file mode 100644
index 45180c6..0000000
--- a/src/DI/extra_concepts.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include <type_traits>
-
-template <typename FirstType, typename SecondType>
-concept NotSameAs = !std::is_same_v<FirstType, SecondType>;
diff --git a/src/DI/factory.hpp b/src/DI/factory.hpp
deleted file mode 100644
index 035e557..0000000
--- a/src/DI/factory.hpp
+++ /dev/null
@@ -1,192 +0,0 @@
-#pragma once
-
-#include "DI/interfaces/copyable_functor.hpp"
-
-#include "DI/alloc_functor.hpp"
-#include "DI/allocation.hpp"
-#include "DI/copyable_functor.hpp"
-#include "DI/extra_concepts.hpp"
-#include "DI/strip_signature.hpp"
-#include "DI/value_functor.hpp"
-
-#include <type_traits>
-#include <utility>
-
-template <class>
-class Factory;
-
-template <class Return>
-// NOLINTNEXTLINE(readability-identifier-naming)
-struct maybe_derive_from_unary_function
-{
-};
-
-template <class Return, class Arg>
-struct maybe_derive_from_unary_function<Return(Arg)>
-	: public std::unary_function<Arg, Return>
-{
-};
-
-template <class Return>
-// NOLINTNEXTLINE(readability-identifier-naming)
-struct maybe_derive_from_binary_function
-{
-};
-
-template <class Return, class ArgOne, class ArgTwo>
-struct maybe_derive_from_binary_function<Return(ArgOne, ArgTwo)>
-	: public std::binary_function<ArgOne, ArgTwo, Return>
-{
-};
-
-template <class Function>
-auto not_null(Function const & /*unused*/) -> bool
-{
-	return true;
-}
-
-template <class Function>
-auto not_null(Function *function_ptr) -> bool
-{
-	return function_ptr;
-}
-
-template <class Return, class Class>
-auto not_null(Return Class::*method_ptr) -> bool
-{
-	return method_ptr;
-}
-
-template <class Function>
-auto not_null(Factory<Function> const &factory) -> bool
-{
-	return !!factory;
-}
-
-template <class Type>
-// NOLINTNEXTLINE(readability-identifier-naming)
-struct uncvref
-{
-	using type =
-		typename std::remove_cv<typename std::remove_reference<Type>::type>::type;
-};
-
-template <class Type>
-// NOLINTNEXTLINE(readability-identifier-naming)
-using uncvref_t = typename uncvref<Type>::type;
-
-template <class Tp, class Up, class = void>
-// NOLINTNEXTLINE(readability-identifier-naming)
-struct is_core_convertible : public std::false_type
-{
-};
-
-template <class Tp, class Up>
-struct is_core_convertible<
-	Tp,
-	Up,
-	decltype(static_cast<void (*)(Up)>(0)(static_cast<Tp (*)()>(0)()))>
-	: public std::true_type
-{
-};
-
-template <class Tp, class Up>
-constexpr bool is_core_convertible_v = is_core_convertible<Tp, Up>::value;
-
-template <typename Function, typename Return, typename... Args>
-concept Callable = !std::is_same_v<uncvref_t<Function>, Factory<Return(Args...)>> &&
-				   std::is_invocable_v<Function, Args...> &&
-				   is_core_convertible_v<std::invoke_result_t<Function, Args...>, Return>;
-
-template <class Return, class... Args>
-class Factory<Return(Args...)> : public maybe_derive_from_unary_function<Return(Args...)>,
-								 public maybe_derive_from_binary_function<Return(Args...)>
-{
-public:
-	using Result = Return;
-
-	Factory() noexcept = default;
-
-	explicit Factory(std::nullptr_t) noexcept {}
-
-	Factory(const Factory &factory);
-
-	Factory(Factory &&factory) noexcept;
-
-	template <class Function>
-	requires Callable<Function, Return, Args...>
-	// NOLINTNEXTLINE(google-explicit-constructor)
-	Factory(Function function) : _functor(std::move(function))
-	{
-	}
-
-	auto operator=(const Factory &factory) = delete;
-
-	auto operator=(Factory &&factory) noexcept -> Factory &;
-
-	auto operator=(std::nullptr_t) noexcept -> Factory &;
-
-	~Factory();
-
-	explicit operator bool() const noexcept;
-
-	// deleted overloads close possible hole in the type system
-	template <class RhsReturn, class... RhsArgs>
-	auto operator==(const Factory<RhsReturn(RhsArgs...)> &) const -> bool = delete;
-
-	template <class RhsReturn, class... RhsArgs>
-	auto operator!=(const Factory<RhsReturn(RhsArgs...)> &) const -> bool = delete;
-
-	auto operator()(Args... args) const -> Return;
-
-	[[nodiscard]] auto target_type() const noexcept -> const std::type_info &;
-
-	template <typename Tp>
-	auto target() noexcept -> Tp *;
-
-	template <typename Tp>
-	auto target() const noexcept -> const Tp *;
-
-private:
-	using ValFunctor = ValueFunctor<Return(Args...)>;
-
-	ValFunctor _functor;
-};
-
-template <class Return, class... Args>
-Factory(Return (*)(Args...)) -> Factory<Return(Args...)>;
-
-template <
-	class Function,
-	class Stripped = strip_signature_t<decltype(&Function::operator())>>
-Factory(Function) -> Factory<Stripped>;
-
-template <class Return, class... Args>
-inline auto operator==(const Factory<Return(Args...)> &factory, std::nullptr_t) noexcept
-	-> bool
-{
-	return !factory;
-}
-
-template <class Return, class... Args>
-inline auto operator==(std::nullptr_t, const Factory<Return(Args...)> &factory) noexcept
-	-> bool
-{
-	return !factory;
-}
-
-template <class Return, class... Args>
-inline auto operator!=(const Factory<Return(Args...)> &factory, std::nullptr_t) noexcept
-	-> bool
-{
-	return static_cast<bool>(factory);
-}
-
-template <class Return, class... Args>
-inline auto operator!=(std::nullptr_t, const Factory<Return(Args...)> &factory) noexcept
-	-> bool
-{
-	return static_cast<bool>(factory);
-}
-
-#include "factory.tpp"
diff --git a/src/DI/factory.tpp b/src/DI/factory.tpp
deleted file mode 100644
index 38b9c00..0000000
--- a/src/DI/factory.tpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#pragma once
-
-#include "factory.hpp"
-
-template <class Return, class... Args>
-Factory<Return(Args...)>::Factory(const Factory &factory) : _functor(factory._functor)
-{
-}
-
-template <class Return, class... Args>
-Factory<Return(Args...)>::Factory(Factory &&factory) noexcept
-	: _functor(std::move(factory._functor))
-{
-}
-
-template <class Return, class... Args>
-auto Factory<Return(Args...)>::operator=(Factory &&factory) noexcept
-	-> Factory<Return(Args...)> &
-{
-	_functor = std::move(factory._functor);
-	return *this;
-}
-
-template <class Return, class... Args>
-auto Factory<Return(Args...)>::operator=(std::nullptr_t) noexcept
-	-> Factory<Return(Args...)> &
-{
-	_functor = nullptr;
-	return *this;
-}
-
-template <class Return, class... Args>
-Factory<Return(Args...)>::~Factory() = default;
-
-template <class Return, class... Args>
-Factory<Return(Args...)>::operator bool() const noexcept
-{
-	return static_cast<bool>(_functor);
-}
-
-template <class Return, class... Args>
-auto Factory<Return(Args...)>::operator()(Args... args) const -> Return
-{
-	return _functor(std::forward<Args>(args)...);
-}
-
-template <class Return, class... Args>
-auto Factory<Return(Args...)>::target_type() const noexcept -> const std::type_info &
-{
-	return _functor.target_type();
-}
-
-template <class Return, class... Args>
-template <typename Tp>
-auto Factory<Return(Args...)>::target() noexcept -> Tp *
-{
-	return static_cast<Tp *>(_functor.template target<Tp>());
-}
-
-template <class Return, class... Args>
-template <typename Tp>
-auto Factory<Return(Args...)>::target() const noexcept -> const Tp *
-{
-	return _functor.template target<Tp>();
-}
diff --git a/src/DI/function_wrapper.hpp b/src/DI/function_wrapper.hpp
deleted file mode 100644
index b8d0cab..0000000
--- a/src/DI/function_wrapper.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "DI/container.hpp"
-#include "DI/interfaces/wrapper.hpp"
-
-#include <memory>
-
-template <class Interface>
-class FunctionWrapper : public IWrapper<Interface>
-{
-public:
-	explicit FunctionWrapper(Interface func) noexcept;
-
-	[[nodiscard]] auto get() const noexcept -> Interface override;
-
-private:
-	const Interface _func;
-};
-
-#include "function_wrapper.tpp"
diff --git a/src/DI/function_wrapper.tpp b/src/DI/function_wrapper.tpp
deleted file mode 100644
index c7afc3d..0000000
--- a/src/DI/function_wrapper.tpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include <utility>
-
-#include "function_wrapper.hpp"
-
-template <class Interface>
-FunctionWrapper<Interface>::FunctionWrapper(Interface func) noexcept
-	: _func(std::move(func))
-{
-}
-
-template <class Interface>
-auto FunctionWrapper<Interface>::get() const noexcept -> Interface
-{
-	return _func;
-}
diff --git a/src/DI/interfaces/copyable_functor.hpp b/src/DI/interfaces/copyable_functor.hpp
deleted file mode 100644
index 46b7588..0000000
--- a/src/DI/interfaces/copyable_functor.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-#include <typeinfo>
-
-/**
- * A copyable function object.
- */
-template <class Function>
-class ICopyableFunctor;
-
-template <class Return, class... Args>
-class ICopyableFunctor<Return(Args...)>
-{
-public:
-	ICopyableFunctor() = default;
-
-	ICopyableFunctor(const ICopyableFunctor &) = delete;
-
-	ICopyableFunctor(ICopyableFunctor &&) = delete;
-
-	virtual ~ICopyableFunctor() = default;
-
-	[[nodiscard]] virtual auto clone() const -> ICopyableFunctor * = 0;
-
-	virtual void clone(ICopyableFunctor *) const = 0;
-
-	virtual void destroy() noexcept = 0;
-
-	virtual void destroy_deallocate() noexcept = 0;
-
-	virtual auto operator()(Args &&...) -> Return = 0;
-
-	auto operator=(const ICopyableFunctor &) = delete;
-
-	auto operator=(ICopyableFunctor &&) = delete;
-
-	[[nodiscard]] virtual auto target(const std::type_info &) const noexcept -> const
-		void * = 0;
-
-	[[nodiscard]] virtual auto target_type() const noexcept -> const std::type_info & = 0;
-};
diff --git a/src/DI/interfaces/wrapper.hpp b/src/DI/interfaces/wrapper.hpp
deleted file mode 100644
index e22ea7f..0000000
--- a/src/DI/interfaces/wrapper.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include <memory>
-
-// NOLINTNEXTLINE(cppcoreguidelines-special-member-functions)
-class IGenericWrapper
-{
-public:
-	virtual ~IGenericWrapper() noexcept = default;
-};
-
-template <class Interface>
-class IWrapper : public IGenericWrapper
-{
-public:
-	[[nodiscard]] virtual auto get() const noexcept -> Interface = 0;
-};
diff --git a/src/DI/object_type.cpp b/src/DI/object_type.cpp
deleted file mode 100644
index d7116e8..0000000
--- a/src/DI/object_type.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "object_type.hpp"
-
-BaseObjectType::BaseObjectType(const std::type_info &type_info) noexcept
-	: _type_info(type_info)
-{
-}
-
-auto BaseObjectType::operator==(const BaseObjectType &object_type) const noexcept -> bool
-{
-	return hash() == object_type.hash();
-}
-
-auto BaseObjectType::hash() const noexcept -> std::size_t
-{
-	return _type_info.hash_code();
-}
-
-auto BaseObjectType::name() const noexcept -> std::string_view
-{
-	return { _type_info.name() };
-}
-
-auto ObjectTypeHasher::operator()(const BaseObjectType &object_type) const noexcept
-	-> std::size_t
-{
-	return object_type.hash();
-}
diff --git a/src/DI/object_type.hpp b/src/DI/object_type.hpp
deleted file mode 100644
index 5107dbf..0000000
--- a/src/DI/object_type.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include <string_view>
-#include <typeinfo>
-
-class BaseObjectType
-{
-public:
-	explicit BaseObjectType(const std::type_info &type_info) noexcept;
-
-	auto operator==(const BaseObjectType &object_type) const noexcept -> bool;
-
-	[[nodiscard]] auto hash() const noexcept -> std::size_t;
-
-	[[nodiscard]] auto name() const noexcept -> std::string_view;
-
-private:
-	const std::type_info &_type_info;
-};
-
-template <class Object>
-class ObjectType : public BaseObjectType
-{
-public:
-	ObjectType() noexcept : BaseObjectType(typeid(Object)) {}
-};
-
-class ObjectTypeHasher
-{
-public:
-	auto operator()(const BaseObjectType &object_type) const noexcept -> std::size_t;
-};
diff --git a/src/DI/object_wrapper.hpp b/src/DI/object_wrapper.hpp
deleted file mode 100644
index 6433bc2..0000000
--- a/src/DI/object_wrapper.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "DI/container.hpp"
-#include "DI/interfaces/wrapper.hpp"
-
-#include <memory>
-
-template <class Interface, class ObjectImpl>
-class ObjectWrapper : public IWrapper<std::unique_ptr<Interface>>
-{
-public:
-	explicit ObjectWrapper(const Container &container) noexcept : _container(container) {}
-
-	[[nodiscard]] auto get() const noexcept -> std::unique_ptr<Interface> override;
-
-private:
-	const Container &_container;
-};
-
-#include "object_wrapper.tpp"
diff --git a/src/DI/object_wrapper.tpp b/src/DI/object_wrapper.tpp
deleted file mode 100644
index 1811db8..0000000
--- a/src/DI/object_wrapper.tpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "object_wrapper.hpp"
-
-template <class Interface, class ObjectImpl>
-auto ObjectWrapper<Interface, ObjectImpl>::get() const noexcept
-	-> std::unique_ptr<Interface>
-{
-	return ObjectImpl::resolve(_container);
-}
diff --git a/src/DI/strip_signature.hpp b/src/DI/strip_signature.hpp
deleted file mode 100644
index 9d20a87..0000000
--- a/src/DI/strip_signature.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-#pragma once
-
-template <class Function>
-struct strip_signature;
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...)>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) const>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) volatile>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) const volatile>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) &>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) const &>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) volatile &>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) const volatile &>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) noexcept>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) const noexcept>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) volatile noexcept>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) const volatile noexcept>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) &noexcept>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) const &noexcept>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) volatile &noexcept>
-{
-	using type = Return(Args...);
-};
-
-template <class Return, class Class, class... Args>
-struct strip_signature<Return (Class::*)(Args...) const volatile &noexcept>
-{
-	using type = Return(Args...);
-};
-
-template <class Function>
-using strip_signature_t = typename strip_signature<Function>::type;
diff --git a/src/DI/type_traits.hpp b/src/DI/type_traits.hpp
deleted file mode 100644
index 6847c4f..0000000
--- a/src/DI/type_traits.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "DI/factory.hpp"
-
-#include <type_traits>
-
-template <typename NotAFunction>
-struct is_factory : public std::false_type // NOLINT(readability-identifier-naming)
-{
-};
-
-template <typename Return, typename... Args>
-struct is_factory<Factory<Return(Args...)>> : public std::true_type
-{
-};
-
-template <typename PossiblyFunction>
-inline constexpr bool is_factory_v = is_factory<PossiblyFunction>::value;
diff --git a/src/DI/value_functor.hpp b/src/DI/value_functor.hpp
deleted file mode 100644
index 1553af9..0000000
--- a/src/DI/value_functor.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#pragma once
-
-#include "DI/interfaces/copyable_functor.hpp"
-
-#include "DI/copyable_functor.hpp"
-#include "DI/extra_concepts.hpp"
-
-#include <memory>
-#include <type_traits>
-
-/**
- * Creates a value-type from a copyable functor.
- */
-template <class Function>
-class ValueFunctor;
-
-template <class Return, class... Args>
-class ValueFunctor<Return(Args...)>
-{
-	using TargetFunctor = ICopyableFunctor<Return(Args...)>;
-
-public:
-	ValueFunctor() noexcept;
-
-	template <class Function>
-	requires NotSameAs<std::decay_t<Function>, ValueFunctor>
-	// NOLINTNEXTLINE(bugprone-forwarding-reference-overload)
-	explicit ValueFunctor(Function &&function)
-		: ValueFunctor(std::forward<Function>(function), std::allocator<Function>())
-	{
-	}
-
-	template <class Function, class Allocator>
-	ValueFunctor(Function &&function, const Allocator &allocator);
-
-	ValueFunctor(const ValueFunctor &val_functor);
-
-	ValueFunctor(ValueFunctor &&val_functor) noexcept;
-
-	~ValueFunctor();
-
-	auto operator=(const ValueFunctor &val_functor) noexcept = delete;
-
-	auto operator=(ValueFunctor &&val_functor) noexcept -> ValueFunctor &;
-
-	auto operator=(std::nullptr_t) -> ValueFunctor &;
-
-	auto operator()(Args &&...args) const -> Return;
-
-	explicit operator bool() const noexcept;
-
-	[[nodiscard]] auto target_type() const noexcept -> const std::type_info &;
-
-	template <typename Target>
-	auto target() const noexcept -> const Target *;
-
-private:
-	typename std::aligned_storage<3 * sizeof(void *)>::type _buf{};
-
-	TargetFunctor *_functor;
-
-	static auto _as_copyable_functor(void *function_ptr) -> TargetFunctor *;
-};
-
-#include "value_functor.tpp"
diff --git a/src/DI/value_functor.tpp b/src/DI/value_functor.tpp
deleted file mode 100644
index a41d1c2..0000000
--- a/src/DI/value_functor.tpp
+++ /dev/null
@@ -1,191 +0,0 @@
-#pragma once
-
-#include "value_functor.hpp"
-
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define VALUE_FUNCTOR_TEMPLATE template <class Return, class... Args>
-
-// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
-#define VALUE_FUNCTOR ValueFunctor<Return(Args...)>
-
-VALUE_FUNCTOR_TEMPLATE
-VALUE_FUNCTOR::ValueFunctor() noexcept : _functor(nullptr) {}
-
-VALUE_FUNCTOR_TEMPLATE
-template <class Function, class Allocator>
-VALUE_FUNCTOR::ValueFunctor(Function &&function, const Allocator &allocator)
-	: _functor(nullptr)
-{
-	using AllocTraits = std::allocator_traits<Allocator>;
-
-	using Functor = CopyableFunctor<Function, Allocator, Return(Args...)>;
-
-	using FunctorAlloc = typename RebindAllocHelper<AllocTraits, Functor>::type;
-
-	if (not_null(function))
-	{
-		auto functor_alloc = FunctorAlloc(allocator);
-
-		if (sizeof(Functor) <= sizeof(_buf) &&
-			std::is_nothrow_copy_constructible<Function>::value &&
-			std::is_nothrow_copy_constructible<FunctorAlloc>::value)
-		{
-			// NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
-			_functor = ::new (static_cast<void *>(&_buf))
-				Functor(std::forward<Function>(function), Allocator(functor_alloc));
-		}
-		else
-		{
-			using Destructor = AllocDestructor<FunctorAlloc>;
-
-			auto hold = std::unique_ptr<TargetFunctor, Destructor>(
-				functor_alloc.allocate(1),
-				Destructor(functor_alloc, 1)
-			);
-
-			::new (static_cast<void *>(hold.get()))
-				Functor(std::forward<Function>(function), Allocator(allocator));
-
-			_functor = hold.release();
-		}
-	}
-}
-
-VALUE_FUNCTOR_TEMPLATE
-VALUE_FUNCTOR::ValueFunctor(const ValueFunctor &val_functor)
-{
-	if (val_functor._functor == nullptr)
-	{
-		_functor = nullptr;
-	}
-	else if (static_cast<void *>(val_functor._functor) == &val_functor._buf)
-	{
-		_functor = _as_copyable_functor(&_buf);
-		val_functor._functor->clone(_functor);
-	}
-	else
-	{
-		_functor = val_functor._functor->clone();
-	}
-}
-
-VALUE_FUNCTOR_TEMPLATE
-VALUE_FUNCTOR::ValueFunctor(ValueFunctor &&val_functor) noexcept
-{
-	if (val_functor._functor == nullptr)
-	{
-		_functor = nullptr;
-	}
-	else if (static_cast<void *>(val_functor._functor) == &val_functor._buf)
-	{
-		_functor = _as_copyable_functor(&_buf);
-		val_functor._functor->clone(_functor);
-	}
-	else
-	{
-		_functor = val_functor._functor;
-		val_functor._functor = nullptr;
-	}
-}
-
-VALUE_FUNCTOR_TEMPLATE
-VALUE_FUNCTOR::~ValueFunctor()
-{
-	if (static_cast<void *>(_functor) == &_buf)
-	{
-		_functor->destroy();
-	}
-	else if (_functor)
-	{
-		_functor->destroy_deallocate();
-	}
-}
-
-VALUE_FUNCTOR_TEMPLATE
-auto VALUE_FUNCTOR::operator=(ValueFunctor &&val_functor) noexcept -> ValueFunctor &
-{
-	*this = nullptr;
-
-	if (val_functor._functor == nullptr)
-	{
-		_functor = nullptr;
-	}
-	else if (static_cast<void *>(val_functor._functor) == &val_functor._buf)
-	{
-		_functor = _as_copyable_functor(&_buf);
-		val_functor._functor->clone(_functor);
-	}
-	else
-	{
-		_functor = val_functor._functor;
-		val_functor._functor = nullptr;
-	}
-
-	return *this;
-}
-
-VALUE_FUNCTOR_TEMPLATE
-auto VALUE_FUNCTOR::operator=(std::nullptr_t) -> ValueFunctor &
-{
-	TargetFunctor *old_functor = _functor;
-
-	_functor = nullptr;
-
-	if (static_cast<void *>(old_functor) == &_buf)
-	{
-		old_functor->destroy();
-	}
-	else if (old_functor)
-	{
-		old_functor->destroy_deallocate();
-	}
-
-	return *this;
-}
-
-VALUE_FUNCTOR_TEMPLATE
-auto VALUE_FUNCTOR::operator()(Args &&...args) const -> Return
-{
-	if (_functor == nullptr)
-	{
-		std::abort();
-	}
-
-	return (*_functor)(std::forward<Args>(args)...);
-}
-
-VALUE_FUNCTOR_TEMPLATE
-VALUE_FUNCTOR::operator bool() const noexcept
-{
-	return _functor != nullptr;
-}
-
-VALUE_FUNCTOR_TEMPLATE
-auto VALUE_FUNCTOR::target_type() const noexcept -> const std::type_info &
-{
-	if (_functor == nullptr)
-	{
-		return typeid(void);
-	}
-
-	return _functor->target_type();
-}
-
-VALUE_FUNCTOR_TEMPLATE
-template <typename Target>
-auto VALUE_FUNCTOR::target() const noexcept -> const Target *
-{
-	if (_functor == nullptr)
-	{
-		return nullptr;
-	}
-
-	return static_cast<const Target *>(_functor->target(typeid(Target)));
-}
-
-VALUE_FUNCTOR_TEMPLATE
-auto VALUE_FUNCTOR::_as_copyable_functor(void *function_ptr) -> TargetFunctor *
-{
-	// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-	return reinterpret_cast<TargetFunctor *>(function_ptr);
-}
diff --git a/src/argument_parser.hpp b/src/argument_parser.hpp
index 25243a3..fee5960 100644
--- a/src/argument_parser.hpp
+++ b/src/argument_parser.hpp
@@ -1,16 +1,18 @@
 #pragma once
 
-#include "DI/auto_wirable.hpp"
 #include "interfaces/argument_parser.hpp"
 #include "interfaces/randomization.hpp"
 
+#include <yacppdic/auto_wirable.hpp>
+
 #include <getopt.h>
 #include <string_view>
 #include <vector>
 
 class ArgumentParser
 	: public IArgumentParser,
-	  public AutoWirable<IArgumentParser, ArgumentParser, IRandomNumberGeneratorFactory>
+	  public yacppdic::
+		  AutoWirable<IArgumentParser, ArgumentParser, IRandomNumberGeneratorFactory>
 {
 public:
 	explicit ArgumentParser(IRandomNumberGeneratorFactory random_number_generator_factory
diff --git a/src/bootstrap.cpp b/src/bootstrap.cpp
index f36bc6a..52d4ab8 100644
--- a/src/bootstrap.cpp
+++ b/src/bootstrap.cpp
@@ -31,15 +31,13 @@
 #include "randomization/generator.hpp"
 #include "randomization/seed_generator.hpp"
 
-#include "DI/factory.hpp"
-
 #include <memory>
 #include <random>
 #include <string_view>
 
-auto bootstrap() noexcept -> Container
+auto bootstrap() noexcept -> yacppdic::Container
 {
-	auto container = Container();
+	auto container = yacppdic::Container();
 
 	container.bind<IArgumentParser>().to<ArgumentParser>();
 	container.bind<IInputHandler>().to<InputHandler>();
diff --git a/src/bootstrap.hpp b/src/bootstrap.hpp
index 5e559c5..3fd3288 100644
--- a/src/bootstrap.hpp
+++ b/src/bootstrap.hpp
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "DI/container.hpp"
+#include <yacppdic/container.hpp>
 
-auto bootstrap() noexcept -> Container;
+auto bootstrap() noexcept -> yacppdic::Container;
diff --git a/src/engine/engine.hpp b/src/engine/engine.hpp
index c13245f..cf162d9 100644
--- a/src/engine/engine.hpp
+++ b/src/engine/engine.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "DI/auto_wirable.hpp"
 #include "interfaces/command.hpp"
 #include "interfaces/cursor.hpp"
 #include "interfaces/engine.hpp"
@@ -9,11 +8,13 @@
 #include "interfaces/scene.hpp"
 #include "interfaces/window.hpp"
 
+#include <yacppdic/auto_wirable.hpp>
+
 #include <memory>
 #include <unordered_map>
 
 class CLIGameEngine : public ICLIGameEngine,
-					  public AutoWirable<
+					  public yacppdic::AutoWirable<
 						  ICLIGameEngine,
 						  CLIGameEngine,
 						  IGameFactory,
diff --git a/src/engine/graphics/window.hpp b/src/engine/graphics/window.hpp
index 69c04c3..9284e5e 100644
--- a/src/engine/graphics/window.hpp
+++ b/src/engine/graphics/window.hpp
@@ -1,11 +1,12 @@
 #pragma once
 
-#include "DI/auto_wirable.hpp"
 #include "interfaces/window.hpp"
 
 #include "engine/data/bounds.hpp"
 
-class Window : public IWindow, public AutoWirable<IWindow, Window>
+#include <yacppdic/auto_wirable.hpp>
+
+class Window : public IWindow, public yacppdic::AutoWirable<IWindow, Window>
 {
 public:
 	Window() noexcept = default;
diff --git a/src/engine/user/cursor.hpp b/src/engine/user/cursor.hpp
index 9d614f1..080321e 100644
--- a/src/engine/user/cursor.hpp
+++ b/src/engine/user/cursor.hpp
@@ -1,11 +1,12 @@
 #pragma once
 
-#include "DI/auto_wirable.hpp"
 #include "interfaces/cursor.hpp"
 
 #include "engine/data/vector2.hpp"
 
 #include <fmt/core.h>
+#include <yacppdic/auto_wirable.hpp>
+
 #include <memory>
 #include <string_view>
 #include <unordered_map>
@@ -30,7 +31,7 @@ const std::unordered_map<Vector2, std::string_view, Vector2Hasher>
 							 { Vector2::right(), MOVE_CURSOR_RIGHT } };
 
 class CursorController : public ICursorController,
-						 public AutoWirable<ICursorController, CursorController>
+						 public yacppdic::AutoWirable<ICursorController, CursorController>
 {
 public:
 	CursorController() noexcept;
diff --git a/src/engine/user/input.hpp b/src/engine/user/input.hpp
index 6a7bf26..c88809d 100644
--- a/src/engine/user/input.hpp
+++ b/src/engine/user/input.hpp
@@ -1,16 +1,18 @@
 #pragma once
 
-#include "DI/auto_wirable.hpp"
 #include "interfaces/input.hpp"
 #include "interfaces/subscriber.hpp"
 
+#include <yacppdic/auto_wirable.hpp>
+
 #include <array>
 #include <climits>
 #include <memory>
 #include <termios.h>
 #include <vector>
 
-class InputHandler : public IInputHandler, public AutoWirable<IInputHandler, InputHandler>
+class InputHandler : public IInputHandler,
+					 public yacppdic::AutoWirable<IInputHandler, InputHandler>
 {
 public:
 	InputHandler() noexcept = default;
diff --git a/src/interfaces/game.hpp b/src/interfaces/game.hpp
index 6d247d9..dee2218 100644
--- a/src/interfaces/game.hpp
+++ b/src/interfaces/game.hpp
@@ -5,7 +5,7 @@
 #include "interfaces/scene.hpp"
 #include "interfaces/window.hpp"
 
-#include "DI/factory.hpp"
+#include <yacppdic/factory.hpp>
 
 #include <memory>
 #include <unordered_map>
@@ -32,7 +32,7 @@ using IGameFactory = std::unique_ptr<IGame> (*)(
 	const std::shared_ptr<ICursorController> &cursor_controller);
 	*/
 
-using IGameFactory = Factory<std::unique_ptr<IGame>(
+using IGameFactory = yacppdic::Factory<std::unique_ptr<IGame>(
 	const std::shared_ptr<IWindow> &window,
 	const std::shared_ptr<IScene> &scene,
 	const std::shared_ptr<ICursorController> &cursor_controller
diff --git a/src/interfaces/generation_tracker.hpp b/src/interfaces/generation_tracker.hpp
index fd2c130..ca2e36b 100644
--- a/src/interfaces/generation_tracker.hpp
+++ b/src/interfaces/generation_tracker.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DI/factory.hpp"
+#include <yacppdic/factory.hpp>
 
 #include <cstdint>
 #include <memory>
@@ -19,4 +19,4 @@ public:
 };
 
 using IGenerationTrackerFactory =
-	Factory<std::unique_ptr<IGenerationTracker>(bool is_paused)>;
+	yacppdic::Factory<std::unique_ptr<IGenerationTracker>(bool is_paused)>;
diff --git a/src/interfaces/matrix.hpp b/src/interfaces/matrix.hpp
index 7fea003..5a01943 100644
--- a/src/interfaces/matrix.hpp
+++ b/src/interfaces/matrix.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
-#include "DI/factory.hpp"
 #include "engine/data/bounds.hpp"
 #include "engine/data/vector2.hpp"
 #include "engine/matrix_iterator.hpp"
 
+#include <yacppdic/factory.hpp>
+
 #include <memory>
 
 template <typename Element>
@@ -39,4 +40,5 @@ public:
 };
 
 template <typename Element>
-using IMatrixFactory = Factory<std::unique_ptr<IMatrix<Element>>(const Bounds &bounds)>;
+using IMatrixFactory =
+	yacppdic::Factory<std::unique_ptr<IMatrix<Element>>(const Bounds &bounds)>;
diff --git a/src/interfaces/randomization.hpp b/src/interfaces/randomization.hpp
index 26426e3..06f7d49 100644
--- a/src/interfaces/randomization.hpp
+++ b/src/interfaces/randomization.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DI/factory.hpp"
+#include <yacppdic/factory.hpp>
 
 #include <memory>
 
@@ -30,4 +30,4 @@ public:
 };
 
 using IRandomNumberGeneratorFactory =
-	Factory<std::unique_ptr<IRandomNumberGenerator>(const uint32_t &seed)>;
+	yacppdic::Factory<std::unique_ptr<IRandomNumberGenerator>(const uint32_t &seed)>;
diff --git a/src/interfaces/scene.hpp b/src/interfaces/scene.hpp
index 88cb3b1..105b173 100644
--- a/src/interfaces/scene.hpp
+++ b/src/interfaces/scene.hpp
@@ -4,7 +4,7 @@
 #include "interfaces/matrix.hpp"
 #include "interfaces/window.hpp"
 
-#include "DI/factory.hpp"
+#include <yacppdic/factory.hpp>
 
 #include <memory>
 
@@ -22,7 +22,7 @@ public:
 		-> const std::shared_ptr<IMatrix<std::string_view>> & = 0;
 };
 
-using ISceneFactory = Factory<std::unique_ptr<IScene>(
+using ISceneFactory = yacppdic::Factory<std::unique_ptr<IScene>(
 	const std::shared_ptr<ICursorController> &cursor_controller,
 	const std::shared_ptr<IWindow> &window
 )>;
diff --git a/src/interfaces/status_updater.hpp b/src/interfaces/status_updater.hpp
index 83b2bf2..4b2ceb1 100644
--- a/src/interfaces/status_updater.hpp
+++ b/src/interfaces/status_updater.hpp
@@ -4,9 +4,10 @@
 #include "interfaces/statusline.hpp"
 #include "interfaces/subscriber.hpp"
 
-#include "DI/factory.hpp"
 #include "engine/data/vector2.hpp"
 
+#include <yacppdic/factory.hpp>
+
 #include <memory>
 
 // NOLINTNEXTLINE(cppcoreguidelines-special-member-functions)
@@ -16,7 +17,7 @@ public:
 	void update(const Vector2 &context) noexcept override = 0;
 };
 
-using IStatusUpdaterFactory = Factory<std::unique_ptr<IStatusUpdater>(
+using IStatusUpdaterFactory = yacppdic::Factory<std::unique_ptr<IStatusUpdater>(
 	const std::shared_ptr<IStatusLine> &statusline,
 	const std::shared_ptr<IGenerationTracker> &generation_tracker
 )>;
diff --git a/src/interfaces/statusline.hpp b/src/interfaces/statusline.hpp
index c104fad..0da295e 100644
--- a/src/interfaces/statusline.hpp
+++ b/src/interfaces/statusline.hpp
@@ -3,7 +3,7 @@
 #include "interfaces/cursor.hpp"
 #include "interfaces/window.hpp"
 
-#include "DI/factory.hpp"
+#include <yacppdic/factory.hpp>
 
 #include <string_view>
 
@@ -27,7 +27,7 @@ public:
 	) noexcept = 0;
 };
 
-using IStatusLineFactory = Factory<std::unique_ptr<IStatusLine>(
+using IStatusLineFactory = yacppdic::Factory<std::unique_ptr<IStatusLine>(
 	const std::shared_ptr<ICursorController> &cursor_controller,
 	const std::shared_ptr<IWindow> &window
 )>;
diff --git a/src/randomization/seed_generator.hpp b/src/randomization/seed_generator.hpp
index 71fd089..3584966 100644
--- a/src/randomization/seed_generator.hpp
+++ b/src/randomization/seed_generator.hpp
@@ -1,12 +1,13 @@
 #pragma once
 
-#include "DI/auto_wirable.hpp"
 #include "interfaces/randomization.hpp"
 
+#include <yacppdic/auto_wirable.hpp>
+
 #include <random>
 
 class SeedGenerator : public ISeedGenerator,
-					  public AutoWirable<ISeedGenerator, SeedGenerator>
+					  public yacppdic::AutoWirable<ISeedGenerator, SeedGenerator>
 {
 public:
 	SeedGenerator() noexcept = default;
-- 
cgit v1.2.3-18-g5258