diff --git a/src/platform/elf.hpp b/src/binary/elf.hpp
similarity index 97%
rename from src/platform/elf.hpp
rename to src/binary/elf.hpp
index 420e5ab..6bccb32 100644
--- a/src/platform/elf.hpp
+++ b/src/binary/elf.hpp
@@ -1,8 +1,8 @@
 #ifndef ELF_HPP
 #define ELF_HPP
 
-#include "common.hpp"
-#include "utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #if IS_LINUX
 #include <array>
diff --git a/src/platform/mach-o.hpp b/src/binary/mach-o.hpp
similarity index 99%
rename from src/platform/mach-o.hpp
rename to src/binary/mach-o.hpp
index e563646..2dfc348 100644
--- a/src/platform/mach-o.hpp
+++ b/src/binary/mach-o.hpp
@@ -1,8 +1,8 @@
 #ifndef MACHO_HPP
 #define MACHO_HPP
 
-#include "common.hpp"
-#include "utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #if IS_APPLE
 
diff --git a/src/platform/object.hpp b/src/binary/object.hpp
similarity index 99%
rename from src/platform/object.hpp
rename to src/binary/object.hpp
index aaec42d..4520e02 100644
--- a/src/platform/object.hpp
+++ b/src/binary/object.hpp
@@ -1,8 +1,8 @@
 #ifndef OBJECT_HPP
 #define OBJECT_HPP
 
-#include "common.hpp"
-#include "utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #include <string>
 #include <vector>
diff --git a/src/platform/pe.hpp b/src/binary/pe.hpp
similarity index 96%
rename from src/platform/pe.hpp
rename to src/binary/pe.hpp
index 86046d1..590d970 100644
--- a/src/platform/pe.hpp
+++ b/src/binary/pe.hpp
@@ -1,9 +1,9 @@
 #ifndef PE_HPP
 #define PE_HPP
 
-#include "common.hpp"
-#include "error.hpp"
-#include "utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/error.hpp"
+#include "../utils/utils.hpp"
 
 #if IS_WINDOWS
 #include <array>
diff --git a/src/cpptrace.cpp b/src/cpptrace.cpp
index b547cb6..662c29b 100644
--- a/src/cpptrace.cpp
+++ b/src/cpptrace.cpp
@@ -15,10 +15,10 @@
 #include "symbols/symbols.hpp"
 #include "unwind/unwind.hpp"
 #include "demangle/demangle.hpp"
-#include "platform/common.hpp"
-#include "platform/exception_type.hpp"
-#include "platform/object.hpp"
-#include "platform/utils.hpp"
+#include "utils/exception_type.hpp"
+#include "utils/common.hpp"
+#include "utils/utils.hpp"
+#include "binary/object.hpp"
 
 #define ESC     "\033["
 #define RESET   ESC "0m"
diff --git a/src/symbols/symbols.hpp b/src/symbols/symbols.hpp
index a8f69e6..060c93f 100644
--- a/src/symbols/symbols.hpp
+++ b/src/symbols/symbols.hpp
@@ -6,7 +6,7 @@
 #include <memory>
 #include <vector>
 
-#include "../platform/object.hpp"
+#include "../binary/object.hpp"
 
 namespace cpptrace {
 namespace detail {
diff --git a/src/symbols/symbols_core.cpp b/src/symbols/symbols_core.cpp
index bed16fa..c5ce566 100644
--- a/src/symbols/symbols_core.cpp
+++ b/src/symbols/symbols_core.cpp
@@ -3,8 +3,8 @@
 #include <vector>
 #include <unordered_map>
 
-#include "../platform/common.hpp"
-#include "../platform/object.hpp"
+#include "../utils/common.hpp"
+#include "../binary/object.hpp"
 
 namespace cpptrace {
 namespace detail {
diff --git a/src/symbols/symbols_with_addr2line.cpp b/src/symbols/symbols_with_addr2line.cpp
index 4db3e8c..ec5ab88 100644
--- a/src/symbols/symbols_with_addr2line.cpp
+++ b/src/symbols/symbols_with_addr2line.cpp
@@ -2,8 +2,8 @@
 
 #include <cpptrace/cpptrace.hpp>
 #include "symbols.hpp"
-#include "../platform/common.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #include <cstdint>
 #include <cstdio>
diff --git a/src/symbols/symbols_with_libdwarf.cpp b/src/symbols/symbols_with_libdwarf.cpp
index 62dffe4..e83f205 100644
--- a/src/symbols/symbols_with_libdwarf.cpp
+++ b/src/symbols/symbols_with_libdwarf.cpp
@@ -2,12 +2,12 @@
 
 #include <cpptrace/cpptrace.hpp>
 #include "symbols.hpp"
-#include "../platform/common.hpp"
-#include "../platform/dwarf.hpp"
-#include "../platform/error.hpp"
-#include "../platform/object.hpp"
-#include "../platform/program_name.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/dwarf.hpp"
+#include "../utils/error.hpp"
+#include "../binary/object.hpp"
+#include "../utils/program_name.hpp"
+#include "../utils/utils.hpp"
 
 #include <algorithm>
 #include <cstdint>
diff --git a/src/unwind/unwind.hpp b/src/unwind/unwind.hpp
index f468d2b..ae57504 100644
--- a/src/unwind/unwind.hpp
+++ b/src/unwind/unwind.hpp
@@ -1,8 +1,8 @@
 #ifndef UNWIND_HPP
 #define UNWIND_HPP
 
-#include "../platform/common.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #include <cstddef>
 #include <vector>
diff --git a/src/unwind/unwind_with_dbghelp.cpp b/src/unwind/unwind_with_dbghelp.cpp
index 41aeb04..d5cbbd1 100644
--- a/src/unwind/unwind_with_dbghelp.cpp
+++ b/src/unwind/unwind_with_dbghelp.cpp
@@ -2,8 +2,8 @@
 
 #include <cpptrace/cpptrace.hpp>
 #include "unwind.hpp"
-#include "../platform/common.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 #include "../platform/dbghelp_syminit_manager.hpp"
 
 #include <algorithm>
diff --git a/src/unwind/unwind_with_execinfo.cpp b/src/unwind/unwind_with_execinfo.cpp
index 2797e2d..629d571 100644
--- a/src/unwind/unwind_with_execinfo.cpp
+++ b/src/unwind/unwind_with_execinfo.cpp
@@ -1,8 +1,8 @@
 #ifdef CPPTRACE_UNWIND_WITH_EXECINFO
 
 #include "unwind.hpp"
-#include "../platform/common.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #include <algorithm>
 #include <climits>
diff --git a/src/unwind/unwind_with_libunwind.cpp b/src/unwind/unwind_with_libunwind.cpp
index de38490..ed12af3 100644
--- a/src/unwind/unwind_with_libunwind.cpp
+++ b/src/unwind/unwind_with_libunwind.cpp
@@ -1,9 +1,9 @@
 #ifdef CPPTRACE_UNWIND_WITH_LIBUNWIND
 
 #include "unwind.hpp"
-#include "../platform/common.hpp"
-#include "../platform/error.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../error.hpp"
+#include "../utils/utils.hpp"
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/unwind/unwind_with_unwind.cpp b/src/unwind/unwind_with_unwind.cpp
index c402bf8..48bf29f 100644
--- a/src/unwind/unwind_with_unwind.cpp
+++ b/src/unwind/unwind_with_unwind.cpp
@@ -1,9 +1,9 @@
 #ifdef CPPTRACE_UNWIND_WITH_UNWIND
 
 #include "unwind.hpp"
-#include "../platform/common.hpp"
-#include "../platform/error.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/error.hpp"
+#include "../utils/utils.hpp"
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/unwind/unwind_with_winapi.cpp b/src/unwind/unwind_with_winapi.cpp
index c6c7150..d10f6d9 100644
--- a/src/unwind/unwind_with_winapi.cpp
+++ b/src/unwind/unwind_with_winapi.cpp
@@ -2,8 +2,8 @@
 
 #include <cpptrace/cpptrace.hpp>
 #include "unwind.hpp"
-#include "../platform/common.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #include <algorithm>
 #include <cstdint>
diff --git a/src/platform/common.hpp b/src/utils/common.hpp
similarity index 100%
rename from src/platform/common.hpp
rename to src/utils/common.hpp
diff --git a/src/platform/dbghelp_syminit_manager.hpp b/src/utils/dbghelp_syminit_manager.hpp
similarity index 94%
rename from src/platform/dbghelp_syminit_manager.hpp
rename to src/utils/dbghelp_syminit_manager.hpp
index c3eaeed..0f421ae 100644
--- a/src/platform/dbghelp_syminit_manager.hpp
+++ b/src/utils/dbghelp_syminit_manager.hpp
@@ -1,8 +1,8 @@
 #ifndef DBGHELP_SYMINIT_MANAGER_HPP
 #define DBGHELP_SYMINIT_MANAGER_HPP
 
-#include "common.hpp"
-#include "utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #include <mutex>
 #include <unordered_set>
diff --git a/src/platform/dwarf.hpp b/src/utils/dwarf.hpp
similarity index 99%
rename from src/platform/dwarf.hpp
rename to src/utils/dwarf.hpp
index 7ea6886..61a8ea5 100644
--- a/src/platform/dwarf.hpp
+++ b/src/utils/dwarf.hpp
@@ -2,8 +2,8 @@
 #define DWARF_HPP
 
 #include <cpptrace/cpptrace.hpp>
-#include "../platform/error.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/error.hpp"
+#include "../utils/utils.hpp"
 
 #include <functional>
 #include <stdexcept>
diff --git a/src/platform/error.hpp b/src/utils/error.hpp
similarity index 100%
rename from src/platform/error.hpp
rename to src/utils/error.hpp
diff --git a/src/platform/exception_type.hpp b/src/utils/exception_type.hpp
similarity index 100%
rename from src/platform/exception_type.hpp
rename to src/utils/exception_type.hpp
diff --git a/src/platform/program_name.hpp b/src/utils/program_name.hpp
similarity index 100%
rename from src/platform/program_name.hpp
rename to src/utils/program_name.hpp
diff --git a/src/platform/utils.hpp b/src/utils/utils.hpp
similarity index 99%
rename from src/platform/utils.hpp
rename to src/utils/utils.hpp
index 5097d8f..bd5e316 100644
--- a/src/platform/utils.hpp
+++ b/src/utils/utils.hpp
@@ -18,7 +18,6 @@
 
 #include "common.hpp"
 #include "error.hpp"
-#include "utils.hpp"
 
 #if IS_WINDOWS
  #include <windows.h>