Rename common to base.

131 files changed, 199 insertions, 201 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9cb01e47..959f2dd1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,5 @@
-add_subdirectory(common)
-
+add_subdirectory(base)
 add_subdirectory(platform)
-
 add_subdirectory(ui)
 add_subdirectory(parse)
 add_subdirectory(toml)
diff --git a/src/ThemeBuilder/components/Editor.h b/src/ThemeBuilder/components/Editor.h
index 29809c82..2e1db741 100644
--- a/src/ThemeBuilder/components/Editor.h
+++ b/src/ThemeBuilder/components/Editor.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 #include "cru/ui/components/Component.h"
 
 namespace cru::theme_builder::components {
diff --git a/src/ThemeBuilder/components/HeadBodyEditor.h b/src/ThemeBuilder/components/HeadBodyEditor.h
index 8119724f..1fcf2f63 100644
--- a/src/ThemeBuilder/components/HeadBodyEditor.h
+++ b/src/ThemeBuilder/components/HeadBodyEditor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Editor.h"
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 #include "cru/ui/controls/Container.h"
 #include "cru/ui/controls/FlexLayout.h"
 #include "cru/ui/controls/IconButton.h"
diff --git a/src/ThemeBuilder/components/StyleRuleSetEditor.cpp b/src/ThemeBuilder/components/StyleRuleSetEditor.cpp
index 8cf5af6d..a1c19e08 100644
--- a/src/ThemeBuilder/components/StyleRuleSetEditor.cpp
+++ b/src/ThemeBuilder/components/StyleRuleSetEditor.cpp
@@ -1,6 +1,6 @@
 #include "StyleRuleSetEditor.h"
-#include "cru/common/Exception.h"
-#include "cru/common/String.h"
+#include "cru/base/Exception.h"
+#include "cru/base/String.h"
 #include "cru/ui/DeleteLater.h"
 #include "cru/ui/ThemeManager.h"
 #include "cru/ui/controls/FlexLayout.h"
diff --git a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp
index 64370981..57e72a0f 100644
--- a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp
@@ -1,5 +1,5 @@
 #include "CheckedConditionEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/style/Condition.h"
 
 namespace cru::theme_builder::components::conditions {
diff --git a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h
index 7cf14912..b6e740f1 100644
--- a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../properties/CheckBoxPropertyEditor.h"
 #include "ConditionEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/style/Condition.h"
 
 namespace cru::theme_builder::components::conditions {
diff --git a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp
index a8d5cc87..bf0b1d98 100644
--- a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp
@@ -1,5 +1,5 @@
 #include "ClickStateConditionEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/helper/ClickDetector.h"
 #include "cru/ui/style/Condition.h"
 
diff --git a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h
index 454a1346..2ea4fcf4 100644
--- a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "../properties/SelectPropertyEditor.h"
 #include "ConditionEditor.h"
-#include "cru/common/ClonablePtr.h"
-#include "cru/common/Event.h"
+#include "cru/base/ClonablePtr.h"
+#include "cru/base/Event.h"
 #include "cru/ui/style/Condition.h"
 
 namespace cru::theme_builder::components::conditions {
diff --git a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp
index 69b8ed02..8be3aa0f 100644
--- a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp
@@ -4,7 +4,7 @@
 #include "ConditionEditor.h"
 #include "FocusConditionEditor.h"
 #include "NoConditionEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/platform/Color.h"
 #include "cru/ui/Base.h"
 #include "cru/ui/ThemeManager.h"
diff --git a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h
index e1398514..2948df36 100644
--- a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "ConditionEditor.h"
-#include "cru/common/ClonablePtr.h"
-#include "cru/common/Event.h"
+#include "cru/base/ClonablePtr.h"
+#include "cru/base/Event.h"
 #include "cru/ui/components/Component.h"
 #include "cru/ui/components/PopupButton.h"
 #include "cru/ui/controls/Button.h"
diff --git a/src/ThemeBuilder/components/conditions/ConditionEditor.cpp b/src/ThemeBuilder/components/conditions/ConditionEditor.cpp
index 5b79c639..421bb028 100644
--- a/src/ThemeBuilder/components/conditions/ConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/ConditionEditor.cpp
@@ -5,7 +5,7 @@
 #include "CompoundConditionEditor.h"
 #include "FocusConditionEditor.h"
 #include "NoConditionEditor.h"
-#include "cru/common/Exception.h"
+#include "cru/base/Exception.h"
 #include "cru/ui/controls/FlexLayout.h"
 
 namespace cru::theme_builder::components::conditions {
diff --git a/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp b/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp
index 1fb99d64..78c99b5c 100644
--- a/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp
@@ -1,5 +1,5 @@
 #include "FocusConditionEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/style/Condition.h"
 
 namespace cru::theme_builder::components::conditions {
diff --git a/src/ThemeBuilder/components/conditions/FocusConditionEditor.h b/src/ThemeBuilder/components/conditions/FocusConditionEditor.h
index 1faf4d7d..d5478653 100644
--- a/src/ThemeBuilder/components/conditions/FocusConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/FocusConditionEditor.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../properties/CheckBoxPropertyEditor.h"
 #include "ConditionEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/style/Condition.h"
 
 namespace cru::theme_builder::components::conditions {
diff --git a/src/ThemeBuilder/components/conditions/NoConditionEditor.h b/src/ThemeBuilder/components/conditions/NoConditionEditor.h
index 19616319..b38806b5 100644
--- a/src/ThemeBuilder/components/conditions/NoConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/NoConditionEditor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "ConditionEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/style/Condition.h"
 
 namespace cru::theme_builder::components::conditions {
diff --git a/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp b/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp
index d1f4afce..ad338e78 100644
--- a/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp
+++ b/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp
@@ -1,5 +1,5 @@
 #include "MeasureLengthPropertyEditor.h"
-#include "cru/common/Format.h"
+#include "cru/base/Format.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/render/MeasureRequirement.h"
 
diff --git a/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp b/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp
index 6d4277aa..d8487209 100644
--- a/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp
+++ b/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp
@@ -1,5 +1,5 @@
 #include "PointPropertyEditor.h"
-#include "cru/common/Format.h"
+#include "cru/base/Format.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/mapper/PointMapper.h"
 
diff --git a/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp b/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp
index 81eb66d3..1329a08a 100644
--- a/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp
@@ -1,5 +1,5 @@
 #include "BorderStylerEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/platform/graphics/Brush.h"
 #include "cru/platform/graphics/Factory.h"
 #include "cru/platform/gui/UiApplication.h"
diff --git a/src/ThemeBuilder/components/stylers/BorderStylerEditor.h b/src/ThemeBuilder/components/stylers/BorderStylerEditor.h
index 539262d6..c9435ee9 100644
--- a/src/ThemeBuilder/components/stylers/BorderStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/BorderStylerEditor.h
@@ -4,7 +4,7 @@
 #include "../properties/OptionalPropertyEditor.h"
 #include "../properties/ThicknessPropertyEditor.h"
 #include "StylerEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 
 namespace cru::theme_builder::components::stylers {
 class BorderStylerEditor : public StylerEditor {
diff --git a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp
index 6b8a5033..c8b2a871 100644
--- a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp
@@ -6,7 +6,7 @@
 #include "MarginStylerEditor.h"
 #include "PaddingStylerEditor.h"
 #include "PreferredSizeStylerEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/ThemeManager.h"
 #include "cru/ui/style/Styler.h"
 
diff --git a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h
index 57150e83..91d2bff5 100644
--- a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "StylerEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/DeleteLater.h"
 #include "cru/ui/components/PopupButton.h"
 #include "cru/ui/controls/FlexLayout.h"
diff --git a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h
index 8385b7c3..ec51c041 100644
--- a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h
@@ -2,7 +2,7 @@
 #include "../Editor.h"
 #include "../properties/ColorPropertyEditor.h"
 #include "StylerEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/style/Styler.h"
 
 namespace cru::theme_builder::components::stylers {
diff --git a/src/ThemeBuilder/components/stylers/FontStylerEditor.h b/src/ThemeBuilder/components/stylers/FontStylerEditor.h
index ccd12113..847b0e2a 100644
--- a/src/ThemeBuilder/components/stylers/FontStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/FontStylerEditor.h
@@ -2,7 +2,7 @@
 #include "../Editor.h"
 #include "../properties/FontPropertyEditor.h"
 #include "StylerEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/style/Styler.h"
 
 namespace cru::theme_builder::components::stylers {
diff --git a/src/ThemeBuilder/components/stylers/MarginStylerEditor.h b/src/ThemeBuilder/components/stylers/MarginStylerEditor.h
index 9de6f1a2..9a1ca750 100644
--- a/src/ThemeBuilder/components/stylers/MarginStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/MarginStylerEditor.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../properties/ThicknessPropertyEditor.h"
 #include "StylerEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/style/Styler.h"
 
 namespace cru::theme_builder::components::stylers {
diff --git a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h
index b78d310b..69565cad 100644
--- a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../properties/ThicknessPropertyEditor.h"
 #include "StylerEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/style/Styler.h"
 
 namespace cru::theme_builder::components::stylers {
diff --git a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h
index 4a64da10..36fdc3d6 100644
--- a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../properties/MeasureLengthPropertyEditor.h"
 #include "StylerEditor.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/style/Styler.h"
 
 namespace cru::theme_builder::components::stylers {
diff --git a/src/ThemeBuilder/main.cpp b/src/ThemeBuilder/main.cpp
index 0c5b2159..4f4ffe4a 100644
--- a/src/ThemeBuilder/main.cpp
+++ b/src/ThemeBuilder/main.cpp
@@ -1,5 +1,5 @@
 #include "components/MainWindow.h"
-#include "cru/common/io/Resource.h"
+#include "cru/base/io/Resource.h"
 #include "cru/platform/bootstrap/Bootstrap.h"
 #include "cru/ui/ThemeManager.h"
 #include "cru/ui/ThemeResourceDictionary.h"
diff --git a/src/common/Base.cpp b/src/base/Base.cpp
index ba4077b4..1704f8a9 100644
--- a/src/common/Base.cpp
+++ b/src/base/Base.cpp
@@ -1,4 +1,4 @@
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 
 #include <exception>
 
diff --git a/src/common/Buffer.cpp b/src/base/Buffer.cpp
index 7b4248c7..1213364a 100644
--- a/src/common/Buffer.cpp
+++ b/src/base/Buffer.cpp
@@ -1,5 +1,5 @@
-#include "cru/common/Buffer.h"
-#include "cru/common/Exception.h"
+#include "cru/base/Buffer.h"
+#include "cru/base/Exception.h"
 
 #include <cstring>
 
diff --git a/src/common/CMakeLists.txt b/src/base/CMakeLists.txt
index 19feddba..19feddba 100644
--- a/src/common/CMakeLists.txt
+++ b/src/base/CMakeLists.txt
diff --git a/src/common/Exception.cpp b/src/base/Exception.cpp
index 4110ad56..19938970 100644
--- a/src/common/Exception.cpp
+++ b/src/base/Exception.cpp
@@ -1,6 +1,6 @@
-#include "cru/common/Exception.h"
+#include "cru/base/Exception.h"
 
-#include "cru/common/Format.h"
+#include "cru/base/Format.h"
 
 #include <cerrno>
 
diff --git a/src/common/Format.cpp b/src/base/Format.cpp
index d58c90b7..cba4137f 100644
--- a/src/common/Format.cpp
+++ b/src/base/Format.cpp
@@ -1,4 +1,4 @@
-#include "cru/common/Format.h"
+#include "cru/base/Format.h"
 
 namespace cru {
 namespace details {
diff --git a/src/common/PropertyTree.cpp b/src/base/PropertyTree.cpp
index b587becb..8303a706 100644
--- a/src/common/PropertyTree.cpp
+++ b/src/base/PropertyTree.cpp
@@ -1,6 +1,6 @@
-#include "cru/common/PropertyTree.h"
+#include "cru/base/PropertyTree.h"
 #include <unordered_map>
-#include "cru/common/Exception.h"
+#include "cru/base/Exception.h"
 
 namespace cru {
 String PropertySubTreeRef::CombineKey(StringView left, StringView right) {
diff --git a/src/common/String.cpp b/src/base/String.cpp
index 27712f01..47b64373 100644
--- a/src/common/String.cpp
+++ b/src/base/String.cpp
@@ -1,9 +1,9 @@
-#include "cru/common/String.h"
+#include "cru/base/String.h"
 
-#include "cru/common/Buffer.h"
-#include "cru/common/Exception.h"
-#include "cru/common/StringToNumberConverter.h"
-#include "cru/common/StringUtil.h"
+#include "cru/base/Buffer.h"
+#include "cru/base/Exception.h"
+#include "cru/base/StringToNumberConverter.h"
+#include "cru/base/StringUtil.h"
 
 #include <double-conversion/double-conversion.h>
 #include <double-conversion/string-to-double.h>
diff --git a/src/common/StringToNumberConverter.cpp b/src/base/StringToNumberConverter.cpp
index 7a926d3d..65aec48e 100644
--- a/src/common/StringToNumberConverter.cpp
+++ b/src/base/StringToNumberConverter.cpp
@@ -1,5 +1,5 @@
-#include "cru/common/StringToNumberConverter.h"
-#include "cru/common/Exception.h"
+#include "cru/base/StringToNumberConverter.h"
+#include "cru/base/Exception.h"
 
 namespace cru {
 bool StringToIntegerConverter::CheckParams() const {
diff --git a/src/common/StringUtil.cpp b/src/base/StringUtil.cpp
index f584fd4e..9053f384 100644
--- a/src/common/StringUtil.cpp
+++ b/src/base/StringUtil.cpp
@@ -1,6 +1,6 @@
-#include "cru/common/StringUtil.h"
-#include "cru/common/Base.h"
-#include "cru/common/Exception.h"
+#include "cru/base/StringUtil.h"
+#include "cru/base/Base.h"
+#include "cru/base/Exception.h"
 
 namespace cru {
 using details::ExtractBits;
diff --git a/src/common/SubProcess.cpp b/src/base/SubProcess.cpp
index 33926f39..1133b848 100644
--- a/src/common/SubProcess.cpp
+++ b/src/base/SubProcess.cpp
@@ -1,9 +1,9 @@
-#include "cru/common/SubProcess.h"
+#include "cru/base/SubProcess.h"
 
 #include <thread>
 
 #ifdef CRU_PLATFORM_UNIX
-#include "cru/common/platform/unix/PosixSpawnSubProcess.h"
+#include "cru/base/platform/unix/PosixSpawnSubProcess.h"
 #endif
 
 namespace cru {
diff --git a/src/common/io/AutoReadStream.cpp b/src/base/io/AutoReadStream.cpp
index 18bc18da..c24f61d1 100644
--- a/src/common/io/AutoReadStream.cpp
+++ b/src/base/io/AutoReadStream.cpp
@@ -1,5 +1,5 @@
-#include "cru/common/io/AutoReadStream.h"
-#include "cru/common/io/Stream.h"
+#include "cru/base/io/AutoReadStream.h"
+#include "cru/base/io/Stream.h"
 
 #include <thread>
 
diff --git a/src/common/io/BufferStream.cpp b/src/base/io/BufferStream.cpp
index 73e5719b..e81731e8 100644
--- a/src/common/io/BufferStream.cpp
+++ b/src/base/io/BufferStream.cpp
@@ -1,5 +1,5 @@
-#include "cru/common/io/BufferStream.h"
-#include "cru/common/io/Stream.h"
+#include "cru/base/io/BufferStream.h"
+#include "cru/base/io/Stream.h"
 
 namespace cru::io {
 BufferStream::BufferStream(const BufferStreamOptions& options)
diff --git a/src/common/io/CFileStream.cpp b/src/base/io/CFileStream.cpp
index 01456437..d5acc707 100644
--- a/src/common/io/CFileStream.cpp
+++ b/src/base/io/CFileStream.cpp
@@ -1,6 +1,6 @@
-#include "cru/common/io/CFileStream.h"
-#include "cru/common/Exception.h"
-#include "cru/common/io/Stream.h"
+#include "cru/base/io/CFileStream.h"
+#include "cru/base/Exception.h"
+#include "cru/base/io/Stream.h"
 
 #include <cstdio>
 
diff --git a/src/common/io/MemoryStream.cpp b/src/base/io/MemoryStream.cpp
index 4b33d780..4c650f3e 100644
--- a/src/common/io/MemoryStream.cpp
+++ b/src/base/io/MemoryStream.cpp
@@ -1,8 +1,8 @@
-#include "cru/common/io/MemoryStream.h"
+#include "cru/base/io/MemoryStream.h"
 
 #include <cstring>
-#include "cru/common/Exception.h"
-#include "cru/common/io/Stream.h"
+#include "cru/base/Exception.h"
+#include "cru/base/io/Stream.h"
 
 namespace cru::io {
 MemoryStream::MemoryStream(
diff --git a/src/common/io/OpenFileFlag.cpp b/src/base/io/OpenFileFlag.cpp
index 6b9957fe..47069b29 100644
--- a/src/common/io/OpenFileFlag.cpp
+++ b/src/base/io/OpenFileFlag.cpp
@@ -1,4 +1,4 @@
-#include "cru/common/io/OpenFileFlag.h"
+#include "cru/base/io/OpenFileFlag.h"
 
 namespace cru::io {
 bool CheckOpenFileFlag(OpenFileFlag flags) {
diff --git a/src/common/io/ProxyStream.cpp b/src/base/io/ProxyStream.cpp
index c2e64056..de66169e 100644
--- a/src/common/io/ProxyStream.cpp
+++ b/src/base/io/ProxyStream.cpp
@@ -1,5 +1,5 @@
-#include "cru/common/io/ProxyStream.h"
-#include "cru/common/io/Stream.h"
+#include "cru/base/io/ProxyStream.h"
+#include "cru/base/io/Stream.h"
 
 namespace cru::io {
 ProxyStream::ProxyStream(ProxyStreamHandlers handlers)
diff --git a/src/common/io/Resource.cpp b/src/base/io/Resource.cpp
index b847e1cf..d369b5f5 100644
--- a/src/common/io/Resource.cpp
+++ b/src/base/io/Resource.cpp
@@ -1,6 +1,6 @@
-#include "cru/common/io/Resource.h"
-#include "cru/common/Exception.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/io/Resource.h"
+#include "cru/base/Exception.h"
+#include "cru/base/log/Logger.h"
 
 #if defined(CRU_PLATFORM_OSX)
 #include <CoreFoundation/CoreFoundation.h>
diff --git a/src/common/io/Stream.cpp b/src/base/io/Stream.cpp
index 6b0a513c..d65bac46 100644
--- a/src/common/io/Stream.cpp
+++ b/src/base/io/Stream.cpp
@@ -1,6 +1,6 @@
-#include "cru/common/io/Stream.h"
-#include "cru/common/Exception.h"
-#include "cru/common/Format.h"
+#include "cru/base/io/Stream.h"
+#include "cru/base/Exception.h"
+#include "cru/base/Format.h"
 
 #include <utility>
 
diff --git a/src/common/log/Logger.cpp b/src/base/log/Logger.cpp
index 4b07ed87..86c65dbc 100644
--- a/src/common/log/Logger.cpp
+++ b/src/base/log/Logger.cpp
@@ -1,11 +1,11 @@
-#include "cru/common/log/Logger.h"
-#include "cru/common/log/StdioLogTarget.h"
+#include "cru/base/log/Logger.h"
+#include "cru/base/log/StdioLogTarget.h"
 
 #include <ctime>
 #include <algorithm>
 
 #ifdef CRU_PLATFORM_WINDOWS
-#include "cru/common/platform/win/DebugLogTarget.h"
+#include "cru/base/platform/win/DebugLogTarget.h"
 #endif
 
 namespace cru::log {
diff --git a/src/common/log/StdioLogTarget.cpp b/src/base/log/StdioLogTarget.cpp
index 7f99dbd1..64ddcacc 100644
--- a/src/common/log/StdioLogTarget.cpp
+++ b/src/base/log/StdioLogTarget.cpp
@@ -1,4 +1,4 @@
-#include "cru/common/log/StdioLogTarget.h"
+#include "cru/base/log/StdioLogTarget.h"
 
 #include <iostream>
 
diff --git a/src/base/platform/Exception.cpp b/src/base/platform/Exception.cpp
new file mode 100644
index 00000000..b5e8c5b9
--- /dev/null
+++ b/src/base/platform/Exception.cpp
@@ -0,0 +1 @@
+#include "cru/base/platform/Exception.h"
diff --git a/src/common/platform/osx/Convert.cpp b/src/base/platform/osx/Convert.cpp
index 4792df1f..1a6deb8f 100644
--- a/src/common/platform/osx/Convert.cpp
+++ b/src/base/platform/osx/Convert.cpp
@@ -1,4 +1,4 @@
-#include "cru/common/platform/osx/Convert.h"
+#include "cru/base/platform/osx/Convert.h"
 
 namespace cru::platform::osx {
 CFStringRef Convert(const String& string) {
diff --git a/src/base/platform/osx/Exception.cpp b/src/base/platform/osx/Exception.cpp
new file mode 100644
index 00000000..a60448dd
--- /dev/null
+++ b/src/base/platform/osx/Exception.cpp
@@ -0,0 +1 @@
+#include "cru/base/platform//osx/Exception.h"
diff --git a/src/common/platform/unix/PosixSpawnSubProcess.cpp b/src/base/platform/unix/PosixSpawnSubProcess.cpp
index b5d68845..75d48cc2 100644
--- a/src/common/platform/unix/PosixSpawnSubProcess.cpp
+++ b/src/base/platform/unix/PosixSpawnSubProcess.cpp
@@ -1,10 +1,10 @@
-#include "cru/common/platform/unix/PosixSpawnSubProcess.h"
-#include "cru/common/Exception.h"
-#include "cru/common/Format.h"
-#include "cru/common/Guard.h"
-#include "cru/common/String.h"
-#include "cru/common/SubProcess.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/platform/unix/PosixSpawnSubProcess.h"
+#include "cru/base/Exception.h"
+#include "cru/base/Format.h"
+#include "cru/base/Guard.h"
+#include "cru/base/String.h"
+#include "cru/base/SubProcess.h"
+#include "cru/base/log/Logger.h"
 
 #include <signal.h>
 #include <spawn.h>
diff --git a/src/common/platform/unix/UnixFileStream.cpp b/src/base/platform/unix/UnixFileStream.cpp
index 804e24f0..c53bbbaa 100644
--- a/src/common/platform/unix/UnixFileStream.cpp
+++ b/src/base/platform/unix/UnixFileStream.cpp
@@ -1,8 +1,8 @@
-#include "cru/common/platform/unix/UnixFileStream.h"
-#include "cru/common/Exception.h"
-#include "cru/common/Format.h"
-#include "cru/common/io/Stream.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/platform/unix/UnixFileStream.h"
+#include "cru/base/Exception.h"
+#include "cru/base/Format.h"
+#include "cru/base/io/Stream.h"
+#include "cru/base/log/Logger.h"
 
 #include <fcntl.h>
 #include <sys/fcntl.h>
diff --git a/src/common/platform/unix/UnixPipe.cpp b/src/base/platform/unix/UnixPipe.cpp
index f30c599e..747efe94 100644
--- a/src/common/platform/unix/UnixPipe.cpp
+++ b/src/base/platform/unix/UnixPipe.cpp
@@ -1,6 +1,6 @@
-#include "cru/common/platform/unix/UnixPipe.h"
-#include "cru/common/Exception.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/platform/unix/UnixPipe.h"
+#include "cru/base/Exception.h"
+#include "cru/base/log/Logger.h"
 
 #include <fcntl.h>
 #include <sys/fcntl.h>
diff --git a/src/base/platform/web/WebException.cpp b/src/base/platform/web/WebException.cpp
new file mode 100644
index 00000000..f473bb5b
--- /dev/null
+++ b/src/base/platform/web/WebException.cpp
@@ -0,0 +1 @@
+#include "cru/base/platform/web/WebException.h"
diff --git a/src/common/platform/win/BridgeComStream.cpp b/src/base/platform/win/BridgeComStream.cpp
index 4c83fd45..c6987ab2 100644
--- a/src/common/platform/win/BridgeComStream.cpp
+++ b/src/base/platform/win/BridgeComStream.cpp
@@ -1,5 +1,5 @@
 #include "BrigdeComStream.h"
-#include "cru/common/io/Stream.h"
+#include "cru/base/io/Stream.h"
 
 namespace cru::platform::win {
 BridgeComStream::BridgeComStream(io::Stream *stream)
diff --git a/src/common/platform/win/BrigdeComStream.h b/src/base/platform/win/BrigdeComStream.h
index 7c8a79d1..1621b567 100644
--- a/src/common/platform/win/BrigdeComStream.h
+++ b/src/base/platform/win/BrigdeComStream.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "cru/common/platform/win/WinPreConfig.h"
+#include "cru/base/platform/win/WinPreConfig.h"
 
-#include "cru/common/io/Stream.h"
+#include "cru/base/io/Stream.h"
 
 #include <objidlbase.h>
 
diff --git a/src/common/platform/win/ComAutoInit.cpp b/src/base/platform/win/ComAutoInit.cpp
index 55a53a8d..548a7bea 100644
--- a/src/common/platform/win/ComAutoInit.cpp
+++ b/src/base/platform/win/ComAutoInit.cpp
@@ -1,5 +1,5 @@
-#include "cru/common/platform/win/ComAutoInit.h"
-#include "cru/common/platform/win/Exception.h"
+#include "cru/base/platform/win/ComAutoInit.h"
+#include "cru/base/platform/win/Exception.h"
 
 #include <combaseapi.h>
 
diff --git a/src/common/platform/win/DebugLogTarget.cpp b/src/base/platform/win/DebugLogTarget.cpp
index 92d26449..89bd3d19 100644
--- a/src/common/platform/win/DebugLogTarget.cpp
+++ b/src/base/platform/win/DebugLogTarget.cpp
@@ -1,4 +1,4 @@
-#include "cru/common/platform/win/DebugLogTarget.h"
+#include "cru/base/platform/win/DebugLogTarget.h"
 
 namespace cru::platform::win {
 void WinDebugLogTarget::Write(::cru::log::LogLevel level, StringView s) {
diff --git a/src/common/platform/win/Exception.cpp b/src/base/platform/win/Exception.cpp
index a20e8a31..5ff6146b 100644
--- a/src/common/platform/win/Exception.cpp
+++ b/src/base/platform/win/Exception.cpp
@@ -1,5 +1,5 @@
-#include "cru/common/platform/win/Exception.h"
-#include "cru/common/Format.h"
+#include "cru/base/platform/win/Exception.h"
+#include "cru/base/Format.h"
 
 #include <optional>
 
diff --git a/src/common/platform/win/StreamConvert.cpp b/src/base/platform/win/StreamConvert.cpp
index d547caa5..f7a0537c 100644
--- a/src/common/platform/win/StreamConvert.cpp
+++ b/src/base/platform/win/StreamConvert.cpp
@@ -1,12 +1,12 @@
-#include "cru/common/platform/win/StreamConvert.h"
+#include "cru/base/platform/win/StreamConvert.h"
 #include "BrigdeComStream.h"
 #include "Win32FileStreamPrivate.h"
-#include "cru/common/Exception.h"
-#include "cru/common/io/MemoryStream.h"
-#include "cru/common/io/OpenFileFlag.h"
-#include "cru/common/platform/win/ComAutoInit.h"
-#include "cru/common/platform/win/Exception.h"
-#include "cru/common/platform/win/Win32FileStream.h"
+#include "cru/base/Exception.h"
+#include "cru/base/io/MemoryStream.h"
+#include "cru/base/io/OpenFileFlag.h"
+#include "cru/base/platform/win/ComAutoInit.h"
+#include "cru/base/platform/win/Exception.h"
+#include "cru/base/platform/win/Win32FileStream.h"
 
 #include <shlwapi.h>
 #include <winnt.h>
diff --git a/src/common/platform/win/Win32FileStream.cpp b/src/base/platform/win/Win32FileStream.cpp
index a118dc02..54e6ae45 100644
--- a/src/common/platform/win/Win32FileStream.cpp
+++ b/src/base/platform/win/Win32FileStream.cpp
@@ -1,8 +1,8 @@
-#include "cru/common/platform/win/Win32FileStream.h"
+#include "cru/base/platform/win/Win32FileStream.h"
 
 #include "Win32FileStreamPrivate.h"
-#include "cru/common/io/OpenFileFlag.h"
-#include "cru/common/platform/win/Exception.h"
+#include "cru/base/io/OpenFileFlag.h"
+#include "cru/base/platform/win/Exception.h"
 
 #include <Windows.h>
 #include <coml2api.h>
diff --git a/src/common/platform/win/Win32FileStreamPrivate.h b/src/base/platform/win/Win32FileStreamPrivate.h
index 24492f8d..718f8d9a 100644
--- a/src/common/platform/win/Win32FileStreamPrivate.h
+++ b/src/base/platform/win/Win32FileStreamPrivate.h
@@ -1,4 +1,4 @@
-#include "cru/common/platform/win/WinPreConfig.h"
+#include "cru/base/platform/win/WinPreConfig.h"
 
 #include <objidl.h>
 
diff --git a/src/common/platform/Exception.cpp b/src/common/platform/Exception.cpp
deleted file mode 100644
index 1c5db390..00000000
--- a/src/common/platform/Exception.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "cru/common/platform/Exception.h"
diff --git a/src/common/platform/osx/Exception.cpp b/src/common/platform/osx/Exception.cpp
deleted file mode 100644
index e03faa4c..00000000
--- a/src/common/platform/osx/Exception.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "cru/common/platform//osx/Exception.h"
diff --git a/src/common/platform/web/WebException.cpp b/src/common/platform/web/WebException.cpp
deleted file mode 100644
index 30f9d1f0..00000000
--- a/src/common/platform/web/WebException.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "cru/common/platform/web/WebException.h"
diff --git a/src/parse/Grammar.cpp b/src/parse/Grammar.cpp
index 17978adc..12617de3 100644
--- a/src/parse/Grammar.cpp
+++ b/src/parse/Grammar.cpp
@@ -1,7 +1,7 @@
 #include "cru/parse/Grammar.h"
-#include "cru/common/String.h"
+#include "cru/base/String.h"
 #include "cru/parse/Symbol.h"
-#include "cru/common/Format.h"
+#include "cru/base/Format.h"
 
 #include <algorithm>
 #include <iterator>
diff --git a/src/platform/Exception.cpp b/src/platform/Exception.cpp
index 7aef3b7f..948345e0 100644
--- a/src/platform/Exception.cpp
+++ b/src/platform/Exception.cpp
@@ -1,5 +1,5 @@
 #include "cru/platform/Exception.h"
-#include "cru/common/Format.h"
+#include "cru/base/Format.h"
 
 #include <optional>
 
diff --git a/src/platform/graphics/Geometry.cpp b/src/platform/graphics/Geometry.cpp
index 0c98b456..25dfba6e 100644
--- a/src/platform/graphics/Geometry.cpp
+++ b/src/platform/graphics/Geometry.cpp
@@ -1,6 +1,6 @@
 #include "cru/platform/graphics/Geometry.h"
 
-#include "cru/common/Exception.h"
+#include "cru/base/Exception.h"
 #include "cru/platform/Exception.h"
 #include "cru/platform/graphics/Factory.h"
 
diff --git a/src/platform/graphics/cairo/CairoImageFactory.cpp b/src/platform/graphics/cairo/CairoImageFactory.cpp
index 99994226..912226d9 100644
--- a/src/platform/graphics/cairo/CairoImageFactory.cpp
+++ b/src/platform/graphics/cairo/CairoImageFactory.cpp
@@ -1,5 +1,5 @@
 #include "cru/platform/graphics/cairo/CairoImageFactory.h"
-#include "cru/common/Exception.h"
+#include "cru/base/Exception.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/graphics/cairo/CairoImage.h"
 #include "cru/platform/graphics/cairo/CairoResource.h"
diff --git a/src/platform/graphics/cairo/CairoPainter.cpp b/src/platform/graphics/cairo/CairoPainter.cpp
index 00c8187c..b9ab50c4 100644
--- a/src/platform/graphics/cairo/CairoPainter.cpp
+++ b/src/platform/graphics/cairo/CairoPainter.cpp
@@ -1,5 +1,5 @@
 #include "cru/platform/graphics/cairo/CairoPainter.h"
-#include "cru/common/Exception.h"
+#include "cru/base/Exception.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/Exception.h"
 #include "cru/platform/graphics/cairo/Base.h"
diff --git a/src/platform/graphics/cairo/PangoTextLayout.cpp b/src/platform/graphics/cairo/PangoTextLayout.cpp
index 25e84707..1033ce9e 100644
--- a/src/platform/graphics/cairo/PangoTextLayout.cpp
+++ b/src/platform/graphics/cairo/PangoTextLayout.cpp
@@ -1,5 +1,5 @@
 #include "cru/platform/graphics/cairo/PangoTextLayout.h"
-#include "cru/common/StringUtil.h"
+#include "cru/base/StringUtil.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/GraphicsBase.h"
 #include "cru/platform/graphics/Base.h"
diff --git a/src/platform/graphics/direct2d/Factory.cpp b/src/platform/graphics/direct2d/Factory.cpp
index c35c53cf..cf65c2a5 100644
--- a/src/platform/graphics/direct2d/Factory.cpp
+++ b/src/platform/graphics/direct2d/Factory.cpp
@@ -1,6 +1,6 @@
 #include "cru/platform/graphics/direct2d/Factory.h"
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/graphics/direct2d/Brush.h"
 #include "cru/platform/graphics/direct2d/Exception.h"
 #include "cru/platform/graphics/direct2d/Font.h"
diff --git a/src/platform/graphics/direct2d/Font.cpp b/src/platform/graphics/direct2d/Font.cpp
index afbc9049..b1c03751 100644
--- a/src/platform/graphics/direct2d/Font.cpp
+++ b/src/platform/graphics/direct2d/Font.cpp
@@ -1,6 +1,6 @@
 #include "cru/platform/graphics/direct2d/Font.h"
 
-#include "cru/common/Format.h"
+#include "cru/base/Format.h"
 #include "cru/platform/graphics/direct2d/Exception.h"
 #include "cru/platform/graphics/direct2d/Factory.h"
 
diff --git a/src/platform/graphics/direct2d/Geometry.cpp b/src/platform/graphics/direct2d/Geometry.cpp
index b84a901e..a2377400 100644
--- a/src/platform/graphics/direct2d/Geometry.cpp
+++ b/src/platform/graphics/direct2d/Geometry.cpp
@@ -1,6 +1,6 @@
 #include "cru/platform/graphics/direct2d/Geometry.h"
 
-#include "cru/common/platform/win/Exception.h"
+#include "cru/base/platform/win/Exception.h"
 #include "cru/platform/graphics/direct2d/ConvertUtil.h"
 #include "cru/platform/graphics/direct2d/Exception.h"
 #include "cru/platform/graphics/direct2d/Factory.h"
diff --git a/src/platform/graphics/direct2d/Image.cpp b/src/platform/graphics/direct2d/Image.cpp
index 78cccd6a..2f60b373 100644
--- a/src/platform/graphics/direct2d/Image.cpp
+++ b/src/platform/graphics/direct2d/Image.cpp
@@ -1,6 +1,6 @@
 #include "cru/platform/graphics/direct2d/Image.h"
 #include <d2d1_1.h>
-#include "cru/common/platform/win/Exception.h"
+#include "cru/base/platform/win/Exception.h"
 #include "cru/platform/graphics/direct2d/ConvertUtil.h"
 #include "cru/platform/graphics/direct2d/Exception.h"
 #include "cru/platform/graphics/direct2d/Factory.h"
diff --git a/src/platform/graphics/direct2d/ImageFactory.cpp b/src/platform/graphics/direct2d/ImageFactory.cpp
index 7cbc0ad4..113f70c8 100644
--- a/src/platform/graphics/direct2d/ImageFactory.cpp
+++ b/src/platform/graphics/direct2d/ImageFactory.cpp
@@ -1,6 +1,6 @@
 #include "cru/platform/graphics/direct2d/ImageFactory.h"
-#include "cru/common/platform/win/Exception.h"
-#include "cru/common/platform/win/StreamConvert.h"
+#include "cru/base/platform/win/Exception.h"
+#include "cru/base/platform/win/StreamConvert.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/graphics/direct2d/Exception.h"
 #include "cru/platform/graphics/direct2d/Factory.h"
diff --git a/src/platform/graphics/direct2d/Painter.cpp b/src/platform/graphics/direct2d/Painter.cpp
index dea3ba03..95b0bb4e 100644
--- a/src/platform/graphics/direct2d/Painter.cpp
+++ b/src/platform/graphics/direct2d/Painter.cpp
@@ -1,6 +1,6 @@
 #include "cru/platform/graphics/direct2d/Painter.h"
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/graphics/direct2d/Brush.h"
 #include "cru/platform/graphics/direct2d/ConvertUtil.h"
diff --git a/src/platform/graphics/direct2d/TextLayout.cpp b/src/platform/graphics/direct2d/TextLayout.cpp
index 5bc392de..06bbcaa6 100644
--- a/src/platform/graphics/direct2d/TextLayout.cpp
+++ b/src/platform/graphics/direct2d/TextLayout.cpp
@@ -1,7 +1,7 @@
 #include "cru/platform/graphics/direct2d/TextLayout.h"
 #include <dwrite.h>
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/graphics/direct2d/Exception.h"
 #include "cru/platform/graphics/direct2d/Factory.h"
diff --git a/src/platform/graphics/quartz/Brush.cpp b/src/platform/graphics/quartz/Brush.cpp
index 2aa31bd8..ea740eb3 100644
--- a/src/platform/graphics/quartz/Brush.cpp
+++ b/src/platform/graphics/quartz/Brush.cpp
@@ -1,6 +1,6 @@
 #include "cru/platform/graphics/quartz/Brush.h"
-#include "cru/common/String.h"
-#include "cru/common/Format.h"
+#include "cru/base/String.h"
+#include "cru/base/Format.h"
 
 namespace cru::platform::graphics::quartz {
 QuartzSolidColorBrush::QuartzSolidColorBrush(IGraphicsFactory* graphics_factory,
diff --git a/src/platform/graphics/quartz/Image.cpp b/src/platform/graphics/quartz/Image.cpp
index 3fa40937..966ce6be 100644
--- a/src/platform/graphics/quartz/Image.cpp
+++ b/src/platform/graphics/quartz/Image.cpp
@@ -1,5 +1,5 @@
 #include "cru/platform/graphics/quartz/Image.h"
-#include "cru/common/Exception.h"
+#include "cru/base/Exception.h"
 #include "cru/platform/graphics/quartz/Convert.h"
 #include "cru/platform/graphics/quartz/Painter.h"
 
diff --git a/src/platform/graphics/quartz/ImageFactory.cpp b/src/platform/graphics/quartz/ImageFactory.cpp
index a48b4b86..0557afa9 100644
--- a/src/platform/graphics/quartz/ImageFactory.cpp
+++ b/src/platform/graphics/quartz/ImageFactory.cpp
@@ -1,6 +1,6 @@
 #include "cru/platform/graphics/quartz/ImageFactory.h"
-#include "cru/common/Exception.h"
-#include "cru/common/platform/osx/Convert.h"
+#include "cru/base/Exception.h"
+#include "cru/base/platform/osx/Convert.h"
 #include "cru/platform/graphics/quartz/Convert.h"
 #include "cru/platform/graphics/quartz/Image.h"
 #include "cru/platform/Check.h"
diff --git a/src/platform/graphics/quartz/TextLayout.cpp b/src/platform/graphics/quartz/TextLayout.cpp
index 24fd71ef..9e18ac85 100644
--- a/src/platform/graphics/quartz/TextLayout.cpp
+++ b/src/platform/graphics/quartz/TextLayout.cpp
@@ -1,7 +1,7 @@
 #include "cru/platform/graphics/quartz/TextLayout.h"
-#include "cru/common/Base.h"
-#include "cru/common/Format.h"
-#include "cru/common/StringUtil.h"
+#include "cru/base/Base.h"
+#include "cru/base/Format.h"
+#include "cru/base/StringUtil.h"
 #include "cru/platform/osx/Convert.h"
 #include "cru/platform/graphics/quartz/Convert.h"
 #include "cru/platform/graphics/quartz/Resource.h"
diff --git a/src/platform/gui/osx/Clipboard.mm b/src/platform/gui/osx/Clipboard.mm
index 068771c8..5d498d0e 100644
--- a/src/platform/gui/osx/Clipboard.mm
+++ b/src/platform/gui/osx/Clipboard.mm
@@ -1,7 +1,7 @@
 #include "cru/platform/gui/osx/Clipboard.h"
 #include "ClipboardPrivate.h"
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/osx/Convert.h"
 
 #include <memory>
diff --git a/src/platform/gui/osx/ClipboardPrivate.h b/src/platform/gui/osx/ClipboardPrivate.h
index e00c59dc..766026b6 100644
--- a/src/platform/gui/osx/ClipboardPrivate.h
+++ b/src/platform/gui/osx/ClipboardPrivate.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/gui/osx/Clipboard.h"
 
 #include <AppKit/AppKit.h>
diff --git a/src/platform/gui/osx/InputMethod.mm b/src/platform/gui/osx/InputMethod.mm
index 50ff80de..af2d1ec2 100644
--- a/src/platform/gui/osx/InputMethod.mm
+++ b/src/platform/gui/osx/InputMethod.mm
@@ -3,7 +3,7 @@
 #import <AppKit/AppKit.h>
 #include "InputMethodPrivate.h"
 #include "WindowPrivate.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/osx/Convert.h"
 #include "cru/platform/gui/osx/Window.h"
 
diff --git a/src/platform/gui/osx/Menu.mm b/src/platform/gui/osx/Menu.mm
index 568a5208..e74ec23b 100644
--- a/src/platform/gui/osx/Menu.mm
+++ b/src/platform/gui/osx/Menu.mm
@@ -2,7 +2,7 @@
 #import "MenuPrivate.h"
 
 #include "KeyboardPrivate.h"
-#include "cru/common/platform/osx/Convert.h"
+#include "cru/base/platform/osx/Convert.h"
 
 #import <AppKit/NSApplication.h>
 
diff --git a/src/platform/gui/osx/UiApplication.mm b/src/platform/gui/osx/UiApplication.mm
index ef62af58..fd6e8ef0 100644
--- a/src/platform/gui/osx/UiApplication.mm
+++ b/src/platform/gui/osx/UiApplication.mm
@@ -1,8 +1,8 @@
 #include "cru/platform/gui/osx/UiApplication.h"
 
 #include "ClipboardPrivate.h"
-#include "cru/common/log/Logger.h"
-#include "cru/common/platform/osx/Convert.h"
+#include "cru/base/log/Logger.h"
+#include "cru/base/platform/osx/Convert.h"
 #include "cru/platform/graphics/quartz/Factory.h"
 #include "cru/platform/gui/osx/Clipboard.h"
 #include "cru/platform/gui/osx/Cursor.h"
diff --git a/src/platform/gui/osx/Window.mm b/src/platform/gui/osx/Window.mm
index d6bee564..8c059a12 100644
--- a/src/platform/gui/osx/Window.mm
+++ b/src/platform/gui/osx/Window.mm
@@ -3,8 +3,8 @@
 
 #include "CursorPrivate.h"
 #include "InputMethodPrivate.h"
-#include "cru/common/Range.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/Range.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/graphics/NullPainter.h"
 #include "cru/platform/graphics/quartz/Convert.h"
diff --git a/src/platform/gui/osx/WindowPrivate.h b/src/platform/gui/osx/WindowPrivate.h
index 00e15084..478ce4e5 100644
--- a/src/platform/gui/osx/WindowPrivate.h
+++ b/src/platform/gui/osx/WindowPrivate.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "cru/platform/gui/osx/Window.h"
 
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 #include "cru/platform/gui/TimerHelper.h"
 #include "cru/platform/gui/Window.h"
 #include "cru/platform/gui/osx/Cursor.h"
diff --git a/src/platform/gui/win/Clipboard.cpp b/src/platform/gui/win/Clipboard.cpp
index 26850d3d..a0914a0b 100644
--- a/src/platform/gui/win/Clipboard.cpp
+++ b/src/platform/gui/win/Clipboard.cpp
@@ -1,5 +1,5 @@
 #include "cru/platform/gui/win/Clipboard.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/gui/win/GodWindow.h"
 #include "cru/platform/gui/win/UiApplication.h"
 
diff --git a/src/platform/gui/win/Cursor.cpp b/src/platform/gui/win/Cursor.cpp
index c2efff1b..d7692c2d 100644
--- a/src/platform/gui/win/Cursor.cpp
+++ b/src/platform/gui/win/Cursor.cpp
@@ -1,6 +1,6 @@
 #include "cru/platform/gui/win/Cursor.h"
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/gui/win/Exception.h"
 
 #include <stdexcept>
diff --git a/src/platform/gui/win/GodWindow.cpp b/src/platform/gui/win/GodWindow.cpp
index 4a062369..364688e5 100644
--- a/src/platform/gui/win/GodWindow.cpp
+++ b/src/platform/gui/win/GodWindow.cpp
@@ -1,6 +1,6 @@
 #include "cru/platform/gui/win/GodWindow.h"
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/gui/win/Exception.h"
 #include "cru/platform/gui/win/UiApplication.h"
 #include "cru/platform/gui/win/WindowClass.h"
diff --git a/src/platform/gui/win/InputMethod.cpp b/src/platform/gui/win/InputMethod.cpp
index 4c5b3b8c..44b5681d 100644
--- a/src/platform/gui/win/InputMethod.cpp
+++ b/src/platform/gui/win/InputMethod.cpp
@@ -1,7 +1,7 @@
 #include "cru/platform/gui/win/InputMethod.h"
 
-#include "cru/common/StringUtil.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/StringUtil.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/gui/DebugFlags.h"
 #include "cru/platform/gui/win/Exception.h"
diff --git a/src/platform/gui/win/TimerManager.h b/src/platform/gui/win/TimerManager.h
index 21c00690..b3f4aa38 100644
--- a/src/platform/gui/win/TimerManager.h
+++ b/src/platform/gui/win/TimerManager.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 #include "cru/platform/win/WinPreConfig.h"
 
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/gui/win/GodWindow.h"
 #include "cru/platform/gui/win/WindowNativeMessageEventArgs.h"
 
diff --git a/src/platform/gui/win/UiApplication.cpp b/src/platform/gui/win/UiApplication.cpp
index 94d6b9c5..5be1a5d2 100644
--- a/src/platform/gui/win/UiApplication.cpp
+++ b/src/platform/gui/win/UiApplication.cpp
@@ -2,7 +2,7 @@
 
 #include "TimerManager.h"
 #include "WindowManager.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/graphics/direct2d/Factory.h"
 #include "cru/platform/gui/win/Base.h"
diff --git a/src/platform/gui/win/Window.cpp b/src/platform/gui/win/Window.cpp
index 79ae02e2..47ca93f8 100644
--- a/src/platform/gui/win/Window.cpp
+++ b/src/platform/gui/win/Window.cpp
@@ -1,7 +1,7 @@
 #include "cru/platform/gui/win/Window.h"
 
 #include "WindowManager.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/graphics/NullPainter.h"
 #include "cru/platform/gui/Base.h"
diff --git a/src/platform/gui/win/WindowManager.h b/src/platform/gui/win/WindowManager.h
index afc4a5f5..062f2002 100644
--- a/src/platform/gui/win/WindowManager.h
+++ b/src/platform/gui/win/WindowManager.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "cru/platform/win/WinPreConfig.h"
 
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 
 #include <map>
 #include <memory>
diff --git a/src/ui/ThemeManager.cpp b/src/ui/ThemeManager.cpp
index 7358637e..c1b2167e 100644
--- a/src/ui/ThemeManager.cpp
+++ b/src/ui/ThemeManager.cpp
@@ -1,8 +1,8 @@
 #include "cru/ui/ThemeManager.h"
 
 #include "Helper.h"
-#include "cru/common/StringUtil.h"
-#include "cru/common/io/Resource.h"
+#include "cru/base/StringUtil.h"
+#include "cru/base/io/Resource.h"
 #include "cru/platform/graphics/Brush.h"
 #include "cru/platform/graphics/Factory.h"
 #include "cru/platform/gui/UiApplication.h"
diff --git a/src/ui/ThemeResourceDictionary.cpp b/src/ui/ThemeResourceDictionary.cpp
index 86a19083..c5986962 100644
--- a/src/ui/ThemeResourceDictionary.cpp
+++ b/src/ui/ThemeResourceDictionary.cpp
@@ -1,6 +1,6 @@
 #include "cru/ui/ThemeResourceDictionary.h"
-#include "cru/common/io/CFileStream.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/io/CFileStream.h"
+#include "cru/base/log/Logger.h"
 #include "cru/xml/XmlNode.h"
 #include "cru/xml/XmlParser.h"
 
diff --git a/src/ui/components/Input.cpp b/src/ui/components/Input.cpp
index daca68c4..b308ed51 100644
--- a/src/ui/components/Input.cpp
+++ b/src/ui/components/Input.cpp
@@ -1,7 +1,7 @@
 #include "cru/ui/components/Input.h"
 #include <cmath>
 #include <optional>
-#include "cru/common/StringToNumberConverter.h"
+#include "cru/base/StringToNumberConverter.h"
 #include "cru/ui/controls/Control.h"
 
 namespace cru::ui::components {
diff --git a/src/ui/controls/Control.cpp b/src/ui/controls/Control.cpp
index 3b0d4be3..17633e3d 100644
--- a/src/ui/controls/Control.cpp
+++ b/src/ui/controls/Control.cpp
@@ -1,6 +1,6 @@
 #include "cru/ui/controls/Control.h"
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/gui/Cursor.h"
 #include "cru/platform/gui/UiApplication.h"
 #include "cru/ui/host/WindowHost.h"
diff --git a/src/ui/controls/RootControl.cpp b/src/ui/controls/RootControl.cpp
index 2d23bb36..1bb2e7ee 100644
--- a/src/ui/controls/RootControl.cpp
+++ b/src/ui/controls/RootControl.cpp
@@ -1,6 +1,6 @@
 #include "cru/ui/controls/RootControl.h"
 
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/gui/Base.h"
 #include "cru/platform/gui/Window.h"
 #include "cru/ui/Base.h"
diff --git a/src/ui/controls/TextHostControlService.cpp b/src/ui/controls/TextHostControlService.cpp
index 36703986..3e885bd3 100644
--- a/src/ui/controls/TextHostControlService.cpp
+++ b/src/ui/controls/TextHostControlService.cpp
@@ -1,10 +1,10 @@
 #include "cru/ui/controls/TextHostControlService.h"
 
 #include "../Helper.h"
-#include "cru/common/Base.h"
-#include "cru/common/String.h"
-#include "cru/common/StringUtil.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/Base.h"
+#include "cru/base/String.h"
+#include "cru/base/StringUtil.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/graphics/Font.h"
 #include "cru/platform/gui/Base.h"
 #include "cru/platform/gui/Clipboard.h"
diff --git a/src/ui/document/TextDocumentElement.cpp b/src/ui/document/TextDocumentElement.cpp
index ab79823d..1ba39849 100644
--- a/src/ui/document/TextDocumentElement.cpp
+++ b/src/ui/document/TextDocumentElement.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/document/TextDocumentElement.h"
-#include "cru/common/String.h"
+#include "cru/base/String.h"
 #include "cru/ui/document/DocumentElement.h"
 #include "cru/ui/document/DocumentElementType.h"
 
diff --git a/src/ui/helper/ClickDetector.cpp b/src/ui/helper/ClickDetector.cpp
index f76f8af4..de39f14e 100644
--- a/src/ui/helper/ClickDetector.cpp
+++ b/src/ui/helper/ClickDetector.cpp
@@ -1,6 +1,6 @@
 #include "cru/ui/helper/ClickDetector.h"
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/ui/DebugFlags.h"
 #include "cru/ui/controls/Control.h"
 #include "cru/ui/host/WindowHost.h"
diff --git a/src/ui/helper/ShortcutHub.cpp b/src/ui/helper/ShortcutHub.cpp
index 8fbf0b8d..30a563ed 100644
--- a/src/ui/helper/ShortcutHub.cpp
+++ b/src/ui/helper/ShortcutHub.cpp
@@ -1,6 +1,6 @@
 #include "cru/ui/helper/ShortcutHub.h"
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/ui/DebugFlags.h"
 #include "cru/ui/controls/Control.h"
 
diff --git a/src/ui/host/RoutedEventDispatch.h b/src/ui/host/RoutedEventDispatch.h
index 5d1c8ce5..207e1ee6 100644
--- a/src/ui/host/RoutedEventDispatch.h
+++ b/src/ui/host/RoutedEventDispatch.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "cru/common/SelfResolvable.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/SelfResolvable.h"
+#include "cru/base/log/Logger.h"
 #include "cru/ui/DebugFlags.h"
 #include "cru/ui/controls/Control.h"
 #include "cru/ui/host/WindowHost.h"
diff --git a/src/ui/host/WindowHost.cpp b/src/ui/host/WindowHost.cpp
index 283224b1..616803b6 100644
--- a/src/ui/host/WindowHost.cpp
+++ b/src/ui/host/WindowHost.cpp
@@ -1,8 +1,8 @@
 #include "cru/ui/host/WindowHost.h"
 
 #include "RoutedEventDispatch.h"
-#include "cru/common/Base.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/Base.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/graphics/Painter.h"
 #include "cru/platform/gui/InputMethod.h"
 #include "cru/platform/gui/UiApplication.h"
diff --git a/src/ui/mapper/BorderStyleMapper.cpp b/src/ui/mapper/BorderStyleMapper.cpp
index 462a07a1..a51651bd 100644
--- a/src/ui/mapper/BorderStyleMapper.cpp
+++ b/src/ui/mapper/BorderStyleMapper.cpp
@@ -1,6 +1,6 @@
 #include "cru/ui/mapper/BorderStyleMapper.h"
 #include "../Helper.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/graphics/Brush.h"
 #include "cru/platform/graphics/Factory.h"
 #include "cru/ui/mapper/MapperRegistry.h"
diff --git a/src/ui/mapper/CursorMapper.cpp b/src/ui/mapper/CursorMapper.cpp
index 7de422e8..ed3c91ec 100644
--- a/src/ui/mapper/CursorMapper.cpp
+++ b/src/ui/mapper/CursorMapper.cpp
@@ -1,6 +1,6 @@
 #include "cru/ui/mapper/CursorMapper.h"
 #include "../Helper.h"
-#include "cru/common/Exception.h"
+#include "cru/base/Exception.h"
 #include "cru/platform/gui/Cursor.h"
 #include "cru/platform/gui/UiApplication.h"
 
diff --git a/src/ui/mapper/style/AndConditionMapper.cpp b/src/ui/mapper/style/AndConditionMapper.cpp
index dd8784d5..d57c4927 100644
--- a/src/ui/mapper/style/AndConditionMapper.cpp
+++ b/src/ui/mapper/style/AndConditionMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/AndConditionMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/mapper/style/IConditionMapper.h"
 #include "cru/ui/style/Condition.h"
diff --git a/src/ui/mapper/style/BorderStylerMapper.cpp b/src/ui/mapper/style/BorderStylerMapper.cpp
index 95dd28ee..e6e33053 100644
--- a/src/ui/mapper/style/BorderStylerMapper.cpp
+++ b/src/ui/mapper/style/BorderStylerMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/BorderStylerMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/style/ApplyBorderStyleInfo.h"
 #include "cru/ui/style/Styler.h"
diff --git a/src/ui/mapper/style/CheckedConditionMapper.cpp b/src/ui/mapper/style/CheckedConditionMapper.cpp
index f61a3d44..74e0a3c5 100644
--- a/src/ui/mapper/style/CheckedConditionMapper.cpp
+++ b/src/ui/mapper/style/CheckedConditionMapper.cpp
@@ -1,4 +1,4 @@
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/mapper/style/CheckedConditionMapper.h"
 #include "cru/ui/style/Condition.h"
 #include "cru/xml/XmlNode.h"
diff --git a/src/ui/mapper/style/ClickStateConditionMapper.cpp b/src/ui/mapper/style/ClickStateConditionMapper.cpp
index 5b25de2c..d6b403c9 100644
--- a/src/ui/mapper/style/ClickStateConditionMapper.cpp
+++ b/src/ui/mapper/style/ClickStateConditionMapper.cpp
@@ -1,6 +1,6 @@
 #include "cru/ui/mapper/style/ClickStateConditionMapper.h"
-#include "cru/common/ClonablePtr.h"
-#include "cru/common/Exception.h"
+#include "cru/base/ClonablePtr.h"
+#include "cru/base/Exception.h"
 #include "cru/ui/helper/ClickDetector.h"
 #include "cru/ui/style/Condition.h"
 
diff --git a/src/ui/mapper/style/ContentBrushStylerMapper.cpp b/src/ui/mapper/style/ContentBrushStylerMapper.cpp
index e83f4988..b3571374 100644
--- a/src/ui/mapper/style/ContentBrushStylerMapper.cpp
+++ b/src/ui/mapper/style/ContentBrushStylerMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/ContentBrushStylerMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/platform/graphics/Brush.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/style/Styler.h"
diff --git a/src/ui/mapper/style/CursorStylerMapper.cpp b/src/ui/mapper/style/CursorStylerMapper.cpp
index 6798798c..3b060c25 100644
--- a/src/ui/mapper/style/CursorStylerMapper.cpp
+++ b/src/ui/mapper/style/CursorStylerMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/CursorStylerMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/platform/gui/Cursor.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/style/Styler.h"
diff --git a/src/ui/mapper/style/FocusConditionMapper.cpp b/src/ui/mapper/style/FocusConditionMapper.cpp
index b9e89e2e..dfefb921 100644
--- a/src/ui/mapper/style/FocusConditionMapper.cpp
+++ b/src/ui/mapper/style/FocusConditionMapper.cpp
@@ -1,4 +1,4 @@
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/mapper/style/FocusConditionMapper.h"
 #include "cru/ui/style/Condition.h"
 #include "cru/xml/XmlNode.h"
diff --git a/src/ui/mapper/style/FontStylerMapper.cpp b/src/ui/mapper/style/FontStylerMapper.cpp
index 884832ee..3b1817ac 100644
--- a/src/ui/mapper/style/FontStylerMapper.cpp
+++ b/src/ui/mapper/style/FontStylerMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/FontStylerMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 
 namespace cru::ui::mapper::style {
diff --git a/src/ui/mapper/style/HoverConditionMapper.cpp b/src/ui/mapper/style/HoverConditionMapper.cpp
index 97767b14..0110edd9 100644
--- a/src/ui/mapper/style/HoverConditionMapper.cpp
+++ b/src/ui/mapper/style/HoverConditionMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/HoverConditionMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/style/Condition.h"
 
 namespace cru::ui::mapper::style {
diff --git a/src/ui/mapper/style/NoConditionMapper.cpp b/src/ui/mapper/style/NoConditionMapper.cpp
index 397162f1..a36e70d2 100644
--- a/src/ui/mapper/style/NoConditionMapper.cpp
+++ b/src/ui/mapper/style/NoConditionMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/NoConditionMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
diff --git a/src/ui/mapper/style/OrConditionMapper.cpp b/src/ui/mapper/style/OrConditionMapper.cpp
index 7b932dbc..521c57ae 100644
--- a/src/ui/mapper/style/OrConditionMapper.cpp
+++ b/src/ui/mapper/style/OrConditionMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/OrConditionMapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/mapper/style/IConditionMapper.h"
 #include "cru/ui/style/Condition.h"
diff --git a/src/ui/mapper/style/StyleRuleMapper.cpp b/src/ui/mapper/style/StyleRuleMapper.cpp
index 2ab13c90..2eb5b0a2 100644
--- a/src/ui/mapper/style/StyleRuleMapper.cpp
+++ b/src/ui/mapper/style/StyleRuleMapper.cpp
@@ -1,7 +1,7 @@
 #include "cru/ui/mapper/style/StyleRuleMapper.h"
-#include "cru/common/ClonablePtr.h"
-#include "cru/common/Exception.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/ClonablePtr.h"
+#include "cru/base/Exception.h"
+#include "cru/base/log/Logger.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/mapper/style/IConditionMapper.h"
 #include "cru/ui/mapper/style/IStylerMapper.h"
diff --git a/src/ui/render/BorderRenderObject.cpp b/src/ui/render/BorderRenderObject.cpp
index 1392af1e..81a1aa60 100644
--- a/src/ui/render/BorderRenderObject.cpp
+++ b/src/ui/render/BorderRenderObject.cpp
@@ -1,7 +1,7 @@
 #include "cru/ui/render/BorderRenderObject.h"
 
 #include "../Helper.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/graphics/Factory.h"
 #include "cru/platform/graphics/Geometry.h"
 #include "cru/platform/graphics/Painter.h"
diff --git a/src/ui/render/FlexLayoutRenderObject.cpp b/src/ui/render/FlexLayoutRenderObject.cpp
index 988e7590..7bbf9d57 100644
--- a/src/ui/render/FlexLayoutRenderObject.cpp
+++ b/src/ui/render/FlexLayoutRenderObject.cpp
@@ -1,6 +1,6 @@
 #include "cru/ui/render/FlexLayoutRenderObject.h"
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/ui/render/LayoutHelper.h"
 
 #include <algorithm>
diff --git a/src/ui/render/LayoutHelper.cpp b/src/ui/render/LayoutHelper.cpp
index a9121321..bbd3c116 100644
--- a/src/ui/render/LayoutHelper.cpp
+++ b/src/ui/render/LayoutHelper.cpp
@@ -1,6 +1,6 @@
 #include "cru/ui/render/LayoutHelper.h"
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 
 namespace cru::ui::render {
 float CalculateAnchorByAlignment(Alignment alignment, float start_point,
diff --git a/src/ui/render/RenderObject.cpp b/src/ui/render/RenderObject.cpp
index a370f749..64411036 100644
--- a/src/ui/render/RenderObject.cpp
+++ b/src/ui/render/RenderObject.cpp
@@ -1,7 +1,7 @@
 #include "cru/ui/render/RenderObject.h"
 
-#include "cru/common/Exception.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/Exception.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/GraphicsBase.h"
 #include "cru/ui/DebugFlags.h"
 #include "cru/ui/controls/Control.h"
diff --git a/src/ui/render/ScrollBar.cpp b/src/ui/render/ScrollBar.cpp
index 3e578d37..326f7504 100644
--- a/src/ui/render/ScrollBar.cpp
+++ b/src/ui/render/ScrollBar.cpp
@@ -1,7 +1,7 @@
 #include "cru/ui/render/ScrollBar.h"
 
 #include "../Helper.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/GraphicsBase.h"
 #include "cru/platform/graphics/Factory.h"
 #include "cru/platform/graphics/Geometry.h"
diff --git a/src/ui/render/StackLayoutRenderObject.cpp b/src/ui/render/StackLayoutRenderObject.cpp
index 9ca9bf02..d71c5749 100644
--- a/src/ui/render/StackLayoutRenderObject.cpp
+++ b/src/ui/render/StackLayoutRenderObject.cpp
@@ -1,6 +1,6 @@
 #include "cru/ui/render/StackLayoutRenderObject.h"
 
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/ui/render/LayoutHelper.h"
 #include "cru/ui/render/MeasureRequirement.h"
 
diff --git a/src/ui/render/TextRenderObject.cpp b/src/ui/render/TextRenderObject.cpp
index 135c2d02..14e45080 100644
--- a/src/ui/render/TextRenderObject.cpp
+++ b/src/ui/render/TextRenderObject.cpp
@@ -1,7 +1,7 @@
 #include "cru/ui/render/TextRenderObject.h"
 
 #include "../Helper.h"
-#include "cru/common/log/Logger.h"
+#include "cru/base/log/Logger.h"
 #include "cru/platform/graphics/Factory.h"
 #include "cru/platform/graphics/Painter.h"
 #include "cru/platform/graphics/TextLayout.h"
diff --git a/src/ui/style/Condition.cpp b/src/ui/style/Condition.cpp
index f7cdf7fd..a0de03dc 100644
--- a/src/ui/style/Condition.cpp
+++ b/src/ui/style/Condition.cpp
@@ -1,8 +1,8 @@
 #include "cru/ui/style/Condition.h"
 #include <memory>
 
-#include "cru/common/ClonablePtr.h"
-#include "cru/common/Event.h"
+#include "cru/base/ClonablePtr.h"
+#include "cru/base/Event.h"
 #include "cru/ui/controls/Control.h"
 #include "cru/ui/controls/ICheckableControl.h"
 #include "cru/ui/controls/IClickableControl.h"
diff --git a/src/ui/style/StyleRuleSet.cpp b/src/ui/style/StyleRuleSet.cpp
index 7b6454ec..ab3a2d01 100644
--- a/src/ui/style/StyleRuleSet.cpp
+++ b/src/ui/style/StyleRuleSet.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/style/StyleRuleSet.h"
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 #include "cru/ui/controls/Control.h"
 #include "cru/ui/model/IListChangeNotify.h"
 
diff --git a/src/ui/style/Styler.cpp b/src/ui/style/Styler.cpp
index 3d7ff1f9..a4e3ac25 100644
--- a/src/ui/style/Styler.cpp
+++ b/src/ui/style/Styler.cpp
@@ -1,7 +1,7 @@
 #include "cru/ui/style/Styler.h"
 
 #include "../Helper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/platform/gui/Cursor.h"
 #include "cru/platform/gui/UiApplication.h"
 #include "cru/ui/controls/Control.h"