diff --git a/external/ImGui/include/imgui_memory_editor.h b/external/ImGui/include/imgui_memory_editor.h
index 9ff0f68bd..ea6634a26 100644
--- a/external/ImGui/include/imgui_memory_editor.h
+++ b/external/ImGui/include/imgui_memory_editor.h
@@ -46,9 +46,9 @@
 
 #include <stdio.h>      // sprintf, scanf
 #include <stdint.h>     // uint8_t, etc.
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 #ifdef _MSC_VER
 #define _PRISizeT   "I"
diff --git a/include/helpers/plugin_handler.hpp b/include/helpers/plugin_handler.hpp
index 0242b7f09..3751c5f57 100644
--- a/include/helpers/plugin_handler.hpp
+++ b/include/helpers/plugin_handler.hpp
@@ -2,8 +2,8 @@
 
 #include <hex.hpp>
 
-#include "views/view.hpp"
-#include "providers/provider.hpp"
+#include <hex/views/view.hpp>
+#include <hex/providers/provider.hpp>
 
 #include <string_view>
 
diff --git a/include/helpers/project_file_handler.hpp b/include/helpers/project_file_handler.hpp
index d90e2d864..7b3a621d3 100644
--- a/include/helpers/project_file_handler.hpp
+++ b/include/helpers/project_file_handler.hpp
@@ -5,7 +5,7 @@
 #include <string_view>
 
 #include "patches.hpp"
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 namespace hex {
 
diff --git a/include/providers/file_provider.hpp b/include/providers/file_provider.hpp
index f45e16e7b..31e18666d 100644
--- a/include/providers/file_provider.hpp
+++ b/include/providers/file_provider.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 
 #include <string_view>
 
diff --git a/include/views/view_bookmarks.hpp b/include/views/view_bookmarks.hpp
index b49454cb5..7fa63bb17 100644
--- a/include/views/view_bookmarks.hpp
+++ b/include/views/view_bookmarks.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 #include <vector>
 #include <list>
 
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 namespace hex {
 
diff --git a/include/views/view_command_palette.hpp b/include/views/view_command_palette.hpp
index 89fc67584..2f568eacc 100644
--- a/include/views/view_command_palette.hpp
+++ b/include/views/view_command_palette.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <hex.hpp>
+#include <hex/views/view.hpp>
 
-#include "imgui.h"
-#include "views/view.hpp"
-#include "lang/pattern_data.hpp"
+#include <imgui.h>
+#include <hex/lang/pattern_data.hpp>
 
 #include <vector>
 #include <tuple>
diff --git a/include/views/view_data_inspector.hpp b/include/views/view_data_inspector.hpp
index 54b4deaaa..d478dcc1a 100644
--- a/include/views/view_data_inspector.hpp
+++ b/include/views/view_data_inspector.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
-#include <helpers/content_registry.hpp>
+#include <hex/api/content_registry.hpp>
 
 #include <bit>
 #include <cstdio>
diff --git a/include/views/view_disassembler.hpp b/include/views/view_disassembler.hpp
index 16be20672..054082e63 100644
--- a/include/views/view_disassembler.hpp
+++ b/include/views/view_disassembler.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
+#include <hex/views/view.hpp>
+
 #include "helpers/disassembler.hpp"
-#include "views/view.hpp"
 
 #include <capstone/capstone.h>
 
diff --git a/include/views/view_hashes.hpp b/include/views/view_hashes.hpp
index b0bfb6d61..43dd6a474 100644
--- a/include/views/view_hashes.hpp
+++ b/include/views/view_hashes.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 #include <cstdio>
 
diff --git a/include/views/view_help.hpp b/include/views/view_help.hpp
index 3bfaa93cd..53eeb7dc5 100644
--- a/include/views/view_help.hpp
+++ b/include/views/view_help.hpp
@@ -2,9 +2,9 @@
 
 #include <hex.hpp>
 
-#include "imgui.h"
-#include "views/view.hpp"
-#include "lang/pattern_data.hpp"
+#include <imgui.h>
+#include <hex/views/view.hpp>
+#include <hex/lang/pattern_data.hpp>
 
 #include <vector>
 #include <tuple>
diff --git a/include/views/view_hexeditor.hpp b/include/views/view_hexeditor.hpp
index fb9959670..e44185e0e 100644
--- a/include/views/view_hexeditor.hpp
+++ b/include/views/view_hexeditor.hpp
@@ -1,17 +1,17 @@
 #pragma once
 
-#include "helpers/utils.hpp"
-#include "views/view.hpp"
+#include <hex/helpers/utils.hpp>
+#include <hex/views/view.hpp>
 
-#include "imgui_memory_editor.h"
-#include "ImGuiFileBrowser.h"
+#include <imgui_memory_editor.h>
+#include <ImGuiFileBrowser.h>
 
 #include <list>
 #include <tuple>
 #include <random>
 #include <vector>
 
-#include "lang/pattern_data.hpp"
+#include <hex/lang/pattern_data.hpp>
 
 namespace hex {
 
diff --git a/include/views/view_information.hpp b/include/views/view_information.hpp
index a463fc2b5..91aca6cdc 100644
--- a/include/views/view_information.hpp
+++ b/include/views/view_information.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 #include <array>
 #include <cstdio>
diff --git a/include/views/view_patches.hpp b/include/views/view_patches.hpp
index 2e4f364ce..31e05a60d 100644
--- a/include/views/view_patches.hpp
+++ b/include/views/view_patches.hpp
@@ -2,8 +2,8 @@
 
 #include <hex.hpp>
 
-#include "imgui.h"
-#include "views/view.hpp"
+#include <imgui.h>
+#include <hex/views/view.hpp>
 
 #include <optional>
 
diff --git a/include/views/view_pattern.hpp b/include/views/view_pattern.hpp
index b3a33f7b3..59924cf9b 100644
--- a/include/views/view_pattern.hpp
+++ b/include/views/view_pattern.hpp
@@ -1,17 +1,17 @@
 #pragma once
 
-#include "views/view.hpp"
-#include "lang/pattern_data.hpp"
-#include "lang/evaluator.hpp"
+#include <hex/views/view.hpp>
+#include <hex/lang/pattern_data.hpp>
+#include <hex/lang/evaluator.hpp>
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 
 #include <cstring>
 #include <filesystem>
 #include <thread>
 
-#include "ImGuiFileBrowser.h"
-#include "TextEditor.h"
+#include <ImGuiFileBrowser.h>
+#include <TextEditor.h>
 
 namespace hex {
 
diff --git a/include/views/view_pattern_data.hpp b/include/views/view_pattern_data.hpp
index 8535b0010..489453773 100644
--- a/include/views/view_pattern_data.hpp
+++ b/include/views/view_pattern_data.hpp
@@ -2,9 +2,9 @@
 
 #include <hex.hpp>
 
-#include "imgui.h"
-#include "views/view.hpp"
-#include "lang/pattern_data.hpp"
+#include <imgui.h>
+#include <hex/views/view.hpp>
+#include <hex/lang/pattern_data.hpp>
 
 #include <vector>
 #include <tuple>
diff --git a/include/views/view_settings.hpp b/include/views/view_settings.hpp
index 65cf61ec9..ca5ae3634 100644
--- a/include/views/view_settings.hpp
+++ b/include/views/view_settings.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 #include <cstdio>
 #include <string>
diff --git a/include/views/view_strings.hpp b/include/views/view_strings.hpp
index d41f42597..25e6fe524 100644
--- a/include/views/view_strings.hpp
+++ b/include/views/view_strings.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
 #include <cstdio>
 #include <string>
diff --git a/include/views/view_tools.hpp b/include/views/view_tools.hpp
index 6162894c1..b94d32a9d 100644
--- a/include/views/view_tools.hpp
+++ b/include/views/view_tools.hpp
@@ -2,8 +2,8 @@
 
 #include <hex.hpp>
 
-#include "imgui.h"
-#include "views/view.hpp"
+#include <imgui.h>
+#include <hex/views/view.hpp>
 #include "helpers/math_evaluator.hpp"
 
 #include <array>
diff --git a/include/window.hpp b/include/window.hpp
index f19272cff..e8add37e1 100644
--- a/include/window.hpp
+++ b/include/window.hpp
@@ -4,8 +4,8 @@
 #include <memory>
 #include <vector>
 
-#include "helpers/utils.hpp"
-#include "views/view.hpp"
+#include <hex/helpers/utils.hpp>
+#include <hex/views/view.hpp>
 
 struct GLFWwindow;
 struct ImGuiSettingsHandler;
diff --git a/plugins/example/source/plugin_example.cpp b/plugins/example/source/plugin_example.cpp
index 309f3d62f..9eb586170 100644
--- a/plugins/example/source/plugin_example.cpp
+++ b/plugins/example/source/plugin_example.cpp
@@ -1,6 +1,6 @@
-#include <plugin.hpp>
+#include <hex/plugin.hpp>
 
-#include <views/view.hpp>
+#include <hex/views/view.hpp>
 
 class ViewExample : public hex::View {
 public:
diff --git a/plugins/libimhex/CMakeLists.txt b/plugins/libimhex/CMakeLists.txt
index faaae90fe..ab7e36038 100644
--- a/plugins/libimhex/CMakeLists.txt
+++ b/plugins/libimhex/CMakeLists.txt
@@ -16,9 +16,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 set(CMAKE_SHARED_LIBRARY_PREFIX "")
 
 add_library(libimhex SHARED
-        source/helpers/event.cpp
+        source/api/event.cpp
+        source/api/content_registry.cpp
         source/helpers/utils.cpp
-        source/helpers/content_registry.cpp
         source/helpers/shared_data.cpp
 
         source/lang/preprocessor.cpp
diff --git a/plugins/libimhex/include/helpers/content_registry.hpp b/plugins/libimhex/include/hex/api/content_registry.hpp
similarity index 100%
rename from plugins/libimhex/include/helpers/content_registry.hpp
rename to plugins/libimhex/include/hex/api/content_registry.hpp
diff --git a/plugins/libimhex/include/helpers/event.hpp b/plugins/libimhex/include/hex/api/event.hpp
similarity index 100%
rename from plugins/libimhex/include/helpers/event.hpp
rename to plugins/libimhex/include/hex/api/event.hpp
diff --git a/plugins/libimhex/include/helpers/shared_data.hpp b/plugins/libimhex/include/hex/helpers/shared_data.hpp
similarity index 95%
rename from plugins/libimhex/include/helpers/shared_data.hpp
rename to plugins/libimhex/include/hex/helpers/shared_data.hpp
index 15e668f6b..fa2a6b494 100644
--- a/plugins/libimhex/include/helpers/shared_data.hpp
+++ b/plugins/libimhex/include/hex/helpers/shared_data.hpp
@@ -5,9 +5,9 @@
 #include <vector>
 #include <map>
 
-#include <helpers/content_registry.hpp>
-#include <helpers/event.hpp>
-#include <views/view.hpp>
+#include <hex/api/content_registry.hpp>
+#include <hex/api/event.hpp>
+#include <hex/views/view.hpp>
 
 #include <imgui.h>
 #include <nlohmann/json.hpp>
diff --git a/plugins/libimhex/include/helpers/utils.hpp b/plugins/libimhex/include/hex/helpers/utils.hpp
similarity index 100%
rename from plugins/libimhex/include/helpers/utils.hpp
rename to plugins/libimhex/include/hex/helpers/utils.hpp
diff --git a/plugins/libimhex/include/lang/ast_node.hpp b/plugins/libimhex/include/hex/lang/ast_node.hpp
similarity index 100%
rename from plugins/libimhex/include/lang/ast_node.hpp
rename to plugins/libimhex/include/hex/lang/ast_node.hpp
diff --git a/plugins/libimhex/include/lang/evaluator.hpp b/plugins/libimhex/include/hex/lang/evaluator.hpp
similarity index 96%
rename from plugins/libimhex/include/lang/evaluator.hpp
rename to plugins/libimhex/include/hex/lang/evaluator.hpp
index 86f30a475..863ac8092 100644
--- a/plugins/libimhex/include/lang/evaluator.hpp
+++ b/plugins/libimhex/include/hex/lang/evaluator.hpp
@@ -2,10 +2,10 @@
 
 #include <hex.hpp>
 
-#include "providers/provider.hpp"
-#include "helpers/utils.hpp"
-#include "lang/pattern_data.hpp"
-#include "ast_node.hpp"
+#include <hex/providers/provider.hpp>
+#include <hex/helpers/utils.hpp>
+#include <hex/lang/pattern_data.hpp>
+#include <hex/lang/ast_node.hpp>
 
 #include <bit>
 #include <string>
diff --git a/plugins/libimhex/include/lang/lexer.hpp b/plugins/libimhex/include/hex/lang/lexer.hpp
similarity index 100%
rename from plugins/libimhex/include/lang/lexer.hpp
rename to plugins/libimhex/include/hex/lang/lexer.hpp
diff --git a/plugins/libimhex/include/lang/parser.hpp b/plugins/libimhex/include/hex/lang/parser.hpp
similarity index 99%
rename from plugins/libimhex/include/lang/parser.hpp
rename to plugins/libimhex/include/hex/lang/parser.hpp
index 05f85bf99..b3dbbc9e8 100644
--- a/plugins/libimhex/include/lang/parser.hpp
+++ b/plugins/libimhex/include/hex/lang/parser.hpp
@@ -5,7 +5,7 @@
 #include "token.hpp"
 #include "ast_node.hpp"
 
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 #include <unordered_map>
 #include <stdexcept>
diff --git a/plugins/libimhex/include/lang/pattern_data.hpp b/plugins/libimhex/include/hex/lang/pattern_data.hpp
similarity index 99%
rename from plugins/libimhex/include/lang/pattern_data.hpp
rename to plugins/libimhex/include/hex/lang/pattern_data.hpp
index 7c66e7e61..b8ab1185a 100644
--- a/plugins/libimhex/include/lang/pattern_data.hpp
+++ b/plugins/libimhex/include/hex/lang/pattern_data.hpp
@@ -4,10 +4,10 @@
 
 #include <imgui.h>
 
-#include "providers/provider.hpp"
-#include "helpers/utils.hpp"
-#include "lang/token.hpp"
-#include "views/view.hpp"
+#include <hex/providers/provider.hpp>
+#include <hex/helpers/utils.hpp>
+#include <hex/lang/token.hpp>
+#include <hex/views/view.hpp>
 
 #include <cstring>
 #include <random>
diff --git a/plugins/libimhex/include/lang/preprocessor.hpp b/plugins/libimhex/include/hex/lang/preprocessor.hpp
similarity index 100%
rename from plugins/libimhex/include/lang/preprocessor.hpp
rename to plugins/libimhex/include/hex/lang/preprocessor.hpp
diff --git a/plugins/libimhex/include/lang/token.hpp b/plugins/libimhex/include/hex/lang/token.hpp
similarity index 99%
rename from plugins/libimhex/include/lang/token.hpp
rename to plugins/libimhex/include/hex/lang/token.hpp
index e59e62064..642078989 100644
--- a/plugins/libimhex/include/lang/token.hpp
+++ b/plugins/libimhex/include/hex/lang/token.hpp
@@ -2,7 +2,7 @@
 
 #include <hex.hpp>
 
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 #include <utility>
 #include <string>
diff --git a/plugins/libimhex/include/lang/validator.hpp b/plugins/libimhex/include/hex/lang/validator.hpp
similarity index 100%
rename from plugins/libimhex/include/lang/validator.hpp
rename to plugins/libimhex/include/hex/lang/validator.hpp
diff --git a/plugins/libimhex/include/plugin.hpp b/plugins/libimhex/include/hex/plugin.hpp
similarity index 73%
rename from plugins/libimhex/include/plugin.hpp
rename to plugins/libimhex/include/hex/plugin.hpp
index dd8b5dd82..073ee2e56 100644
--- a/plugins/libimhex/include/plugin.hpp
+++ b/plugins/libimhex/include/hex/plugin.hpp
@@ -4,10 +4,10 @@
 #include <imgui.h>
 
 #include <hex.hpp>
-#include <views/view.hpp>
-#include <providers/provider.hpp>
-#include <helpers/shared_data.hpp>
-#include <helpers/content_registry.hpp>
+#include <hex/api/content_registry.hpp>
+#include <hex/views/view.hpp>
+#include <hex/providers/provider.hpp>
+#include <hex/helpers/shared_data.hpp>
 
 #define IMHEX_PLUGIN_SETUP      namespace hex::plugin::internal {               \
                                     void initializePlugin();                    \
diff --git a/plugins/libimhex/include/providers/provider.hpp b/plugins/libimhex/include/hex/providers/provider.hpp
similarity index 97%
rename from plugins/libimhex/include/providers/provider.hpp
rename to plugins/libimhex/include/hex/providers/provider.hpp
index ce73c3825..6ed500626 100644
--- a/plugins/libimhex/include/providers/provider.hpp
+++ b/plugins/libimhex/include/hex/providers/provider.hpp
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include <helpers/shared_data.hpp>
+#include <hex/helpers/shared_data.hpp>
 
 namespace hex::prv {
 
diff --git a/plugins/libimhex/include/views/view.hpp b/plugins/libimhex/include/hex/views/view.hpp
similarity index 96%
rename from plugins/libimhex/include/views/view.hpp
rename to plugins/libimhex/include/hex/views/view.hpp
index 21f54464d..9e5a9d023 100644
--- a/plugins/libimhex/include/views/view.hpp
+++ b/plugins/libimhex/include/hex/views/view.hpp
@@ -2,9 +2,9 @@
 
 #include <hex.hpp>
 
-#include "imgui.h"
+#include <imgui.h>
 
-#include "helpers/event.hpp"
+#include <hex/api/event.hpp>
 
 #include <functional>
 #include <string>
diff --git a/plugins/libimhex/source/helpers/content_registry.cpp b/plugins/libimhex/source/api/content_registry.cpp
similarity index 98%
rename from plugins/libimhex/source/helpers/content_registry.cpp
rename to plugins/libimhex/source/api/content_registry.cpp
index 68238c74b..0834bf4d4 100644
--- a/plugins/libimhex/source/helpers/content_registry.cpp
+++ b/plugins/libimhex/source/api/content_registry.cpp
@@ -1,6 +1,6 @@
-#include <helpers/content_registry.hpp>
+#include <hex/api/content_registry.hpp>
 
-#include <helpers/shared_data.hpp>
+#include <hex/helpers/shared_data.hpp>
 
 #include <filesystem>
 #include <fstream>
diff --git a/plugins/libimhex/source/helpers/event.cpp b/plugins/libimhex/source/api/event.cpp
similarity index 92%
rename from plugins/libimhex/source/helpers/event.cpp
rename to plugins/libimhex/source/api/event.cpp
index dcac31631..33a5661ed 100644
--- a/plugins/libimhex/source/helpers/event.cpp
+++ b/plugins/libimhex/source/api/event.cpp
@@ -1,6 +1,6 @@
-#include "helpers/event.hpp"
+#include <hex/api/event.hpp>
 
-#include <helpers/shared_data.hpp>
+#include <hex/helpers/shared_data.hpp>
 
 namespace hex {
 
diff --git a/plugins/libimhex/source/helpers/shared_data.cpp b/plugins/libimhex/source/helpers/shared_data.cpp
index 20fcbfae9..2328ec7b8 100644
--- a/plugins/libimhex/source/helpers/shared_data.cpp
+++ b/plugins/libimhex/source/helpers/shared_data.cpp
@@ -1,4 +1,4 @@
-#include <helpers/shared_data.hpp>
+#include <hex/helpers/shared_data.hpp>
 
 namespace hex {
 
diff --git a/plugins/libimhex/source/helpers/utils.cpp b/plugins/libimhex/source/helpers/utils.cpp
index e9f872d4a..676d09b03 100644
--- a/plugins/libimhex/source/helpers/utils.cpp
+++ b/plugins/libimhex/source/helpers/utils.cpp
@@ -1,4 +1,4 @@
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 #include <cstdio>
 #include <codecvt>
diff --git a/plugins/libimhex/source/lang/builtin_functions.cpp b/plugins/libimhex/source/lang/builtin_functions.cpp
index 6f7db7003..06bc4f9b0 100644
--- a/plugins/libimhex/source/lang/builtin_functions.cpp
+++ b/plugins/libimhex/source/lang/builtin_functions.cpp
@@ -1,5 +1,5 @@
-#include "lang/evaluator.hpp"
-#include "helpers/content_registry.hpp"
+#include <hex/lang/evaluator.hpp>
+#include <hex/api/content_registry.hpp>
 
 namespace hex::lang {
 
diff --git a/plugins/libimhex/source/lang/evaluator.cpp b/plugins/libimhex/source/lang/evaluator.cpp
index 941ea3e77..01157bcd6 100644
--- a/plugins/libimhex/source/lang/evaluator.cpp
+++ b/plugins/libimhex/source/lang/evaluator.cpp
@@ -1,8 +1,8 @@
-#include "lang/evaluator.hpp"
+#include <hex/lang/evaluator.hpp>
 
-#include "lang/token.hpp"
-#include "helpers/utils.hpp"
-#include "helpers/content_registry.hpp"
+#include <hex/lang/token.hpp>
+#include <hex/helpers/utils.hpp>
+#include <hex/api/content_registry.hpp>
 
 #include <bit>
 #include <algorithm>
diff --git a/plugins/libimhex/source/lang/lexer.cpp b/plugins/libimhex/source/lang/lexer.cpp
index 53d7668d4..43b6120d3 100644
--- a/plugins/libimhex/source/lang/lexer.cpp
+++ b/plugins/libimhex/source/lang/lexer.cpp
@@ -1,4 +1,4 @@
-#include "lang/lexer.hpp"
+#include <hex/lang/lexer.hpp>
 
 #include <algorithm>
 #include <functional>
diff --git a/plugins/libimhex/source/lang/parser.cpp b/plugins/libimhex/source/lang/parser.cpp
index da0a61300..a47d4dc0a 100644
--- a/plugins/libimhex/source/lang/parser.cpp
+++ b/plugins/libimhex/source/lang/parser.cpp
@@ -1,4 +1,4 @@
-#include "lang/parser.hpp"
+#include <hex/lang/parser.hpp>
 
 #include <optional>
 #include <variant>
diff --git a/plugins/libimhex/source/lang/preprocessor.cpp b/plugins/libimhex/source/lang/preprocessor.cpp
index bcb975663..2d2678acf 100644
--- a/plugins/libimhex/source/lang/preprocessor.cpp
+++ b/plugins/libimhex/source/lang/preprocessor.cpp
@@ -1,4 +1,4 @@
-#include "lang/preprocessor.hpp"
+#include <hex/lang/preprocessor.hpp>
 
 namespace hex::lang {
 
diff --git a/plugins/libimhex/source/lang/validator.cpp b/plugins/libimhex/source/lang/validator.cpp
index f5c5eb506..784952cde 100644
--- a/plugins/libimhex/source/lang/validator.cpp
+++ b/plugins/libimhex/source/lang/validator.cpp
@@ -1,9 +1,9 @@
-#include "lang/validator.hpp"
+#include <hex/lang/validator.hpp>
 
 #include <unordered_set>
 #include <string>
 
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 namespace hex::lang {
 
diff --git a/plugins/libimhex/source/providers/provider.cpp b/plugins/libimhex/source/providers/provider.cpp
index 65701e00d..74203fbba 100644
--- a/plugins/libimhex/source/providers/provider.cpp
+++ b/plugins/libimhex/source/providers/provider.cpp
@@ -1,4 +1,4 @@
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 
 #include <hex.hpp>
 
diff --git a/plugins/libimhex/source/views/view.cpp b/plugins/libimhex/source/views/view.cpp
index 3dea249fb..6bbe3dd41 100644
--- a/plugins/libimhex/source/views/view.cpp
+++ b/plugins/libimhex/source/views/view.cpp
@@ -1,12 +1,12 @@
-#include "views/view.hpp"
+#include <hex/views/view.hpp>
 
-#include "imgui.h"
+#include <imgui.h>
 
 #include <functional>
 #include <string>
 #include <vector>
 
-#include <helpers/shared_data.hpp>
+#include <hex/helpers/shared_data.hpp>
 
 namespace hex {
 
diff --git a/source/helpers/crypto.cpp b/source/helpers/crypto.cpp
index 7bf3c58a9..e634572bb 100644
--- a/source/helpers/crypto.cpp
+++ b/source/helpers/crypto.cpp
@@ -1,6 +1,6 @@
 #include "helpers/crypto.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 
 #include <openssl/md4.h>
 #include <openssl/md5.h>
diff --git a/source/helpers/loader_script_handler.cpp b/source/helpers/loader_script_handler.cpp
index a717dcf64..4fdd0a4c7 100644
--- a/source/helpers/loader_script_handler.cpp
+++ b/source/helpers/loader_script_handler.cpp
@@ -1,8 +1,8 @@
 #include "helpers/loader_script_handler.hpp"
 
-#include "views/view.hpp"
-#include "helpers/utils.hpp"
-#include "providers/provider.hpp"
+#include <hex/views/view.hpp>
+#include <hex/helpers/utils.hpp>
+#include <hex/providers/provider.hpp>
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
diff --git a/source/helpers/patches.cpp b/source/helpers/patches.cpp
index 4fcd31e73..35bbe4293 100644
--- a/source/helpers/patches.cpp
+++ b/source/helpers/patches.cpp
@@ -4,7 +4,7 @@
 #include <string_view>
 #include <type_traits>
 
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 namespace hex {
 
diff --git a/source/main.cpp b/source/main.cpp
index f45d999ab..f27c2eada 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -1,10 +1,10 @@
-#include "helpers/utils.hpp"
 #include "window.hpp"
 
-#include <helpers/content_registry.hpp>
-#include <providers/provider.hpp>
+#include <hex/api/content_registry.hpp>
+#include <hex/providers/provider.hpp>
+#include <hex/lang/pattern_data.hpp>
+#include <hex/helpers/utils.hpp>
 
-#include "lang/pattern_data.hpp"
 #include "views/view_hexeditor.hpp"
 #include "views/view_pattern.hpp"
 #include "views/view_pattern_data.hpp"
@@ -20,34 +20,35 @@
 #include "views/view_command_palette.hpp"
 #include "views/view_settings.hpp"
 
-
 #include <vector>
 
 int main(int argc, char **argv) {
-    hex::Window window(argc, argv);
+    using namespace hex;
+
+    Window window(argc, argv);
 
     // Shared Data
-    std::vector<hex::lang::PatternData*> patternData;
-    std::list<hex::Bookmark> bookmarks;
+    std::vector<lang::PatternData*> patternData;
+    std::list<Bookmark> bookmarks;
 
     // Create views
-    hex::ContentRegistry::Views::add<hex::ViewHexEditor>(patternData, bookmarks);
-    hex::ContentRegistry::Views::add<hex::ViewPattern>(patternData);
-    hex::ContentRegistry::Views::add<hex::ViewPatternData>(patternData);
-    hex::ContentRegistry::Views::add<hex::ViewDataInspector>();
-    hex::ContentRegistry::Views::add<hex::ViewHashes>();
-    hex::ContentRegistry::Views::add<hex::ViewInformation>();
-    hex::ContentRegistry::Views::add<hex::ViewStrings>();
-    hex::ContentRegistry::Views::add<hex::ViewDisassembler>();
-    hex::ContentRegistry::Views::add<hex::ViewBookmarks>(bookmarks);
-    hex::ContentRegistry::Views::add<hex::ViewPatches>();
-    hex::ContentRegistry::Views::add<hex::ViewTools>();
-    hex::ContentRegistry::Views::add<hex::ViewCommandPalette>();
-    hex::ContentRegistry::Views::add<hex::ViewHelp>();
-    hex::ContentRegistry::Views::add<hex::ViewSettings>();
+    ContentRegistry::Views::add<ViewHexEditor>(patternData, bookmarks);
+    ContentRegistry::Views::add<ViewPattern>(patternData);
+    ContentRegistry::Views::add<ViewPatternData>(patternData);
+    ContentRegistry::Views::add<ViewDataInspector>();
+    ContentRegistry::Views::add<ViewHashes>();
+    ContentRegistry::Views::add<ViewInformation>();
+    ContentRegistry::Views::add<ViewStrings>();
+    ContentRegistry::Views::add<ViewDisassembler>();
+    ContentRegistry::Views::add<ViewBookmarks>(bookmarks);
+    ContentRegistry::Views::add<ViewPatches>();
+    ContentRegistry::Views::add<ViewTools>();
+    ContentRegistry::Views::add<ViewCommandPalette>();
+    ContentRegistry::Views::add<ViewHelp>();
+    ContentRegistry::Views::add<ViewSettings>();
 
     if (argc > 1)
-        hex::View::postEvent(hex::Events::FileDropped, argv[1]);
+        View::postEvent(Events::FileDropped, argv[1]);
 
     window.initPlugins();
     window.loop();
diff --git a/source/views/view_bookmarks.cpp b/source/views/view_bookmarks.cpp
index ac311c8b3..13c0cd10f 100644
--- a/source/views/view_bookmarks.cpp
+++ b/source/views/view_bookmarks.cpp
@@ -1,6 +1,6 @@
 #include "views/view_bookmarks.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 #include "helpers/project_file_handler.hpp"
 
 #include <cstring>
diff --git a/source/views/view_data_inspector.cpp b/source/views/view_data_inspector.cpp
index dd4b06d9b..babb2fe6e 100644
--- a/source/views/view_data_inspector.cpp
+++ b/source/views/view_data_inspector.cpp
@@ -1,7 +1,7 @@
 #include "views/view_data_inspector.hpp"
 
-#include "providers/provider.hpp"
-#include "helpers/utils.hpp"
+#include <hex/providers/provider.hpp>
+#include <hex/helpers/utils.hpp>
 
 #include <cstring>
 
diff --git a/source/views/view_disassembler.cpp b/source/views/view_disassembler.cpp
index e0e8e66a6..24dd12f2b 100644
--- a/source/views/view_disassembler.cpp
+++ b/source/views/view_disassembler.cpp
@@ -1,7 +1,7 @@
 #include "views/view_disassembler.hpp"
 
-#include "providers/provider.hpp"
-#include "helpers/utils.hpp"
+#include <hex/providers/provider.hpp>
+#include <hex/helpers/utils.hpp>
 
 #include <cstring>
 
diff --git a/source/views/view_hashes.cpp b/source/views/view_hashes.cpp
index b52590686..1700b8b2e 100644
--- a/source/views/view_hashes.cpp
+++ b/source/views/view_hashes.cpp
@@ -1,12 +1,12 @@
 #include "views/view_hashes.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
+#include <hex/helpers/utils.hpp>
 
 #include "helpers/crypto.hpp"
 
 #include <vector>
 
-#include "helpers/utils.hpp"
 
 namespace hex {
 
diff --git a/source/views/view_hexeditor.cpp b/source/views/view_hexeditor.cpp
index fd438221d..9906340bb 100644
--- a/source/views/view_hexeditor.cpp
+++ b/source/views/view_hexeditor.cpp
@@ -1,6 +1,6 @@
 #include "views/view_hexeditor.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 #include "providers/file_provider.hpp"
 
 #include <GLFW/glfw3.h>
diff --git a/source/views/view_information.cpp b/source/views/view_information.cpp
index df4b95ab9..7d34a9784 100644
--- a/source/views/view_information.cpp
+++ b/source/views/view_information.cpp
@@ -1,8 +1,7 @@
 #include "views/view_information.hpp"
 
-#include "providers/provider.hpp"
-
-#include "helpers/utils.hpp"
+#include <hex/providers/provider.hpp>
+#include <hex/helpers/utils.hpp>
 
 #include <cstring>
 #include <cmath>
diff --git a/source/views/view_patches.cpp b/source/views/view_patches.cpp
index bd9f1222e..fec397472 100644
--- a/source/views/view_patches.cpp
+++ b/source/views/view_patches.cpp
@@ -1,8 +1,8 @@
 #include "views/view_patches.hpp"
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
 
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 #include "helpers/project_file_handler.hpp"
 
 #include <string>
diff --git a/source/views/view_pattern.cpp b/source/views/view_pattern.cpp
index 05a677008..f2c98aeec 100644
--- a/source/views/view_pattern.cpp
+++ b/source/views/view_pattern.cpp
@@ -1,13 +1,13 @@
 #include "views/view_pattern.hpp"
 
-#include "lang/preprocessor.hpp"
-#include "lang/parser.hpp"
-#include "lang/lexer.hpp"
-#include "lang/validator.hpp"
-#include "lang/evaluator.hpp"
+#include <hex/lang/preprocessor.hpp>
+#include <hex/lang/parser.hpp>
+#include <hex/lang/lexer.hpp>
+#include <hex/lang/validator.hpp>
+#include <hex/lang/evaluator.hpp>
 
 #include "helpers/project_file_handler.hpp"
-#include "helpers/utils.hpp"
+#include <hex/helpers/utils.hpp>
 
 #include <magic.h>
 
diff --git a/source/views/view_pattern_data.cpp b/source/views/view_pattern_data.cpp
index 014e73042..3c4deab17 100644
--- a/source/views/view_pattern_data.cpp
+++ b/source/views/view_pattern_data.cpp
@@ -1,7 +1,7 @@
 #include "views/view_pattern_data.hpp"
 
-#include "providers/provider.hpp"
-#include "lang/pattern_data.hpp"
+#include <hex/providers/provider.hpp>
+#include <hex/lang/pattern_data.hpp>
 
 namespace hex {
 
diff --git a/source/views/view_settings.cpp b/source/views/view_settings.cpp
index c9729908a..9d4cba7ea 100644
--- a/source/views/view_settings.cpp
+++ b/source/views/view_settings.cpp
@@ -1,6 +1,6 @@
 #include "views/view_settings.hpp"
 
-#include "helpers/content_registry.hpp"
+#include <hex/api/content_registry.hpp>
 
 namespace hex {
 
diff --git a/source/views/view_strings.cpp b/source/views/view_strings.cpp
index 62e6b1f7f..30ec41c6e 100644
--- a/source/views/view_strings.cpp
+++ b/source/views/view_strings.cpp
@@ -1,7 +1,7 @@
 #include "views/view_strings.hpp"
 
-#include "providers/provider.hpp"
-#include "helpers/utils.hpp"
+#include <hex/providers/provider.hpp>
+#include <hex/helpers/utils.hpp>
 
 #include <cstring>
 
diff --git a/source/views/view_tools.cpp b/source/views/view_tools.cpp
index d5e4447c6..22b0262a4 100644
--- a/source/views/view_tools.cpp
+++ b/source/views/view_tools.cpp
@@ -4,9 +4,10 @@
 #include <regex>
 #include <optional>
 
-#include "providers/provider.hpp"
+#include <hex/providers/provider.hpp>
+#include <hex/helpers/utils.hpp>
+
 #include "helpers/plugin_handler.hpp"
-#include "helpers/utils.hpp"
 
 #include <llvm/Demangle/Demangle.h>
 
diff --git a/source/window.cpp b/source/window.cpp
index 433f3a1bc..22a52b716 100644
--- a/source/window.cpp
+++ b/source/window.cpp
@@ -1,18 +1,18 @@
 #include "window.hpp"
 
 #include <hex.hpp>
+#include <hex/api/content_registry.hpp>
 
 #include <iostream>
 #include <numeric>
 
-#include "imgui.h"
-#include "imgui_internal.h"
-#include "imgui_impl_glfw.h"
-#include "imgui_impl_opengl3.h"
-#include "imgui_freetype.h"
+#include <imgui.h>
+#include <imgui_internal.h>
+#include <imgui_impl_glfw.h>
+#include <imgui_impl_opengl3.h>
+#include <imgui_freetype.h>
 
 #include "helpers/plugin_handler.hpp"
-#include "helpers/content_registry.hpp"
 
 #include <glad/glad.h>
 #include <GLFW/glfw3.h>