Rename common to base.

119 files changed, 104 insertions, 104 deletions

diff --git a/include/cru/common/Base.h b/include/cru/base/Base.h
index 8a6a7634..8a6a7634 100644
--- a/include/cru/common/Base.h
+++ b/include/cru/base/Base.h
diff --git a/include/cru/common/Bitmask.h b/include/cru/base/Bitmask.h
index 9b6b8957..9b6b8957 100644
--- a/include/cru/common/Bitmask.h
+++ b/include/cru/base/Bitmask.h
diff --git a/include/cru/common/Buffer.h b/include/cru/base/Buffer.h
index bc2e2a26..bc2e2a26 100644
--- a/include/cru/common/Buffer.h
+++ b/include/cru/base/Buffer.h
diff --git a/include/cru/common/ClonablePtr.h b/include/cru/base/ClonablePtr.h
index a2a88758..a2a88758 100644
--- a/include/cru/common/ClonablePtr.h
+++ b/include/cru/base/ClonablePtr.h
diff --git a/include/cru/common/Event.h b/include/cru/base/Event.h
index 18d2c570..18d2c570 100644
--- a/include/cru/common/Event.h
+++ b/include/cru/base/Event.h
diff --git a/include/cru/common/Event2.h b/include/cru/base/Event2.h
index 62fb366d..891b314f 100644
--- a/include/cru/common/Event2.h
+++ b/include/cru/base/Event2.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <cru/common/Bitmask.h>
-#include <cru/common/SelfResolvable.h>
+#include <cru/base/Bitmask.h>
+#include <cru/base/SelfResolvable.h>
 
 #include <cstddef>
 #include <functional>
diff --git a/include/cru/common/Exception.h b/include/cru/base/Exception.h
index 609fd2c9..609fd2c9 100644
--- a/include/cru/common/Exception.h
+++ b/include/cru/base/Exception.h
diff --git a/include/cru/common/Format.h b/include/cru/base/Format.h
index d5c5ed99..d5c5ed99 100644
--- a/include/cru/common/Format.h
+++ b/include/cru/base/Format.h
diff --git a/include/cru/common/Guard.h b/include/cru/base/Guard.h
index 5a9f9c5d..5a9f9c5d 100644
--- a/include/cru/common/Guard.h
+++ b/include/cru/base/Guard.h
diff --git a/include/cru/common/HandlerRegistry.h b/include/cru/base/HandlerRegistry.h
index e405d1fd..e405d1fd 100644
--- a/include/cru/common/HandlerRegistry.h
+++ b/include/cru/base/HandlerRegistry.h
diff --git a/include/cru/common/PreConfig.h b/include/cru/base/PreConfig.h
index 3f26c589..3f26c589 100644
--- a/include/cru/common/PreConfig.h
+++ b/include/cru/base/PreConfig.h
diff --git a/include/cru/common/PropertyTree.h b/include/cru/base/PropertyTree.h
index 54e185b9..54e185b9 100644
--- a/include/cru/common/PropertyTree.h
+++ b/include/cru/base/PropertyTree.h
diff --git a/include/cru/common/Range.h b/include/cru/base/Range.h
index edc2ec55..edc2ec55 100644
--- a/include/cru/common/Range.h
+++ b/include/cru/base/Range.h
diff --git a/include/cru/common/SelfResolvable.h b/include/cru/base/SelfResolvable.h
index 84fa54f6..84fa54f6 100644
--- a/include/cru/common/SelfResolvable.h
+++ b/include/cru/base/SelfResolvable.h
diff --git a/include/cru/common/String.h b/include/cru/base/String.h
index 21a3db51..21a3db51 100644
--- a/include/cru/common/String.h
+++ b/include/cru/base/String.h
diff --git a/include/cru/common/StringToNumberConverter.h b/include/cru/base/StringToNumberConverter.h
index 758b26c8..758b26c8 100644
--- a/include/cru/common/StringToNumberConverter.h
+++ b/include/cru/base/StringToNumberConverter.h
diff --git a/include/cru/common/StringUtil.h b/include/cru/base/StringUtil.h
index 8f085283..8f085283 100644
--- a/include/cru/common/StringUtil.h
+++ b/include/cru/base/StringUtil.h
diff --git a/include/cru/common/SubProcess.h b/include/cru/base/SubProcess.h
index fbe8ad2b..fbe8ad2b 100644
--- a/include/cru/common/SubProcess.h
+++ b/include/cru/base/SubProcess.h
diff --git a/include/cru/common/concurrent/ConcurrentQueue.h b/include/cru/base/concurrent/ConcurrentQueue.h
index e311d5f9..e311d5f9 100644
--- a/include/cru/common/concurrent/ConcurrentQueue.h
+++ b/include/cru/base/concurrent/ConcurrentQueue.h
diff --git a/include/cru/common/io/AutoReadStream.h b/include/cru/base/io/AutoReadStream.h
index 759d5026..759d5026 100644
--- a/include/cru/common/io/AutoReadStream.h
+++ b/include/cru/base/io/AutoReadStream.h
diff --git a/include/cru/common/io/BufferStream.h b/include/cru/base/io/BufferStream.h
index 5ebff546..5ebff546 100644
--- a/include/cru/common/io/BufferStream.h
+++ b/include/cru/base/io/BufferStream.h
diff --git a/include/cru/common/io/CFileStream.h b/include/cru/base/io/CFileStream.h
index 0b58bdc9..0b58bdc9 100644
--- a/include/cru/common/io/CFileStream.h
+++ b/include/cru/base/io/CFileStream.h
diff --git a/include/cru/common/io/MemoryStream.h b/include/cru/base/io/MemoryStream.h
index a1f90c3b..a1f90c3b 100644
--- a/include/cru/common/io/MemoryStream.h
+++ b/include/cru/base/io/MemoryStream.h
diff --git a/include/cru/common/io/OpenFileFlag.h b/include/cru/base/io/OpenFileFlag.h
index 4a5789fb..4a5789fb 100644
--- a/include/cru/common/io/OpenFileFlag.h
+++ b/include/cru/base/io/OpenFileFlag.h
diff --git a/include/cru/common/io/ProxyStream.h b/include/cru/base/io/ProxyStream.h
index 42ec9dfd..42ec9dfd 100644
--- a/include/cru/common/io/ProxyStream.h
+++ b/include/cru/base/io/ProxyStream.h
diff --git a/include/cru/common/io/Resource.h b/include/cru/base/io/Resource.h
index 1d5313a6..1d5313a6 100644
--- a/include/cru/common/io/Resource.h
+++ b/include/cru/base/io/Resource.h
diff --git a/include/cru/common/io/Stream.h b/include/cru/base/io/Stream.h
index e0b61627..e0b61627 100644
--- a/include/cru/common/io/Stream.h
+++ b/include/cru/base/io/Stream.h
diff --git a/include/cru/common/log/Logger.h b/include/cru/base/log/Logger.h
index 25735e14..25735e14 100644
--- a/include/cru/common/log/Logger.h
+++ b/include/cru/base/log/Logger.h
diff --git a/include/cru/common/log/StdioLogTarget.h b/include/cru/base/log/StdioLogTarget.h
index 4123766b..4123766b 100644
--- a/include/cru/common/log/StdioLogTarget.h
+++ b/include/cru/base/log/StdioLogTarget.h
diff --git a/include/cru/common/platform/Exception.h b/include/cru/base/platform/Exception.h
index 74dd6ad4..74dd6ad4 100644
--- a/include/cru/common/platform/Exception.h
+++ b/include/cru/base/platform/Exception.h
diff --git a/include/cru/common/platform/osx/Convert.h b/include/cru/base/platform/osx/Convert.h
index 395cbbae..395cbbae 100644
--- a/include/cru/common/platform/osx/Convert.h
+++ b/include/cru/base/platform/osx/Convert.h
diff --git a/include/cru/common/platform/osx/Exception.h b/include/cru/base/platform/osx/Exception.h
index 5ab14ebd..5ab14ebd 100644
--- a/include/cru/common/platform/osx/Exception.h
+++ b/include/cru/base/platform/osx/Exception.h
diff --git a/include/cru/common/platform/unix/PosixSpawnSubProcess.h b/include/cru/base/platform/unix/PosixSpawnSubProcess.h
index ee4e912a..ee4e912a 100644
--- a/include/cru/common/platform/unix/PosixSpawnSubProcess.h
+++ b/include/cru/base/platform/unix/PosixSpawnSubProcess.h
diff --git a/include/cru/common/platform/unix/UnixFileStream.h b/include/cru/base/platform/unix/UnixFileStream.h
index 8021f21a..8021f21a 100644
--- a/include/cru/common/platform/unix/UnixFileStream.h
+++ b/include/cru/base/platform/unix/UnixFileStream.h
diff --git a/include/cru/common/platform/unix/UnixPipe.h b/include/cru/base/platform/unix/UnixPipe.h
index cf35fb11..cf35fb11 100644
--- a/include/cru/common/platform/unix/UnixPipe.h
+++ b/include/cru/base/platform/unix/UnixPipe.h
diff --git a/include/cru/common/platform/web/WebException.h b/include/cru/base/platform/web/WebException.h
index d98b8943..d98b8943 100644
--- a/include/cru/common/platform/web/WebException.h
+++ b/include/cru/base/platform/web/WebException.h
diff --git a/include/cru/common/platform/win/ComAutoInit.h b/include/cru/base/platform/win/ComAutoInit.h
index cc968e4b..569085c8 100644
--- a/include/cru/common/platform/win/ComAutoInit.h
+++ b/include/cru/base/platform/win/ComAutoInit.h
@@ -4,7 +4,7 @@
 #ifdef CRU_PLATFORM_WINDOWS
 
 #include "WinPreConfig.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 
 namespace cru::platform::win {
 class CRU_BASE_API ComAutoInit {
diff --git a/include/cru/common/platform/win/DebugLogTarget.h b/include/cru/base/platform/win/DebugLogTarget.h
index 8257f637..8257f637 100644
--- a/include/cru/common/platform/win/DebugLogTarget.h
+++ b/include/cru/base/platform/win/DebugLogTarget.h
diff --git a/include/cru/common/platform/win/Exception.h b/include/cru/base/platform/win/Exception.h
index 3e63b191..3e63b191 100644
--- a/include/cru/common/platform/win/Exception.h
+++ b/include/cru/base/platform/win/Exception.h
diff --git a/include/cru/common/platform/win/StreamConvert.h b/include/cru/base/platform/win/StreamConvert.h
index 3499604a..3499604a 100644
--- a/include/cru/common/platform/win/StreamConvert.h
+++ b/include/cru/base/platform/win/StreamConvert.h
diff --git a/include/cru/common/platform/win/Win32FileStream.h b/include/cru/base/platform/win/Win32FileStream.h
index 06656466..06656466 100644
--- a/include/cru/common/platform/win/Win32FileStream.h
+++ b/include/cru/base/platform/win/Win32FileStream.h
diff --git a/include/cru/common/platform/win/WinPreConfig.h b/include/cru/base/platform/win/WinPreConfig.h
index c2284df3..c2284df3 100644
--- a/include/cru/common/platform/win/WinPreConfig.h
+++ b/include/cru/base/platform/win/WinPreConfig.h
diff --git a/include/cru/parse/Production.h b/include/cru/parse/Production.h
index d5ababe6..07bd2962 100644
--- a/include/cru/parse/Production.h
+++ b/include/cru/parse/Production.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/common/String.h"
+#include "cru/base/String.h"
 
 #include "Nonterminal.h"
 #include "Terminal.h"
diff --git a/include/cru/parse/Symbol.h b/include/cru/parse/Symbol.h
index e7bd4808..0252b3b7 100644
--- a/include/cru/parse/Symbol.h
+++ b/include/cru/parse/Symbol.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Base.h"
 
-#include "cru/common/String.h"
+#include "cru/base/String.h"
 
 namespace cru::parse {
 class Grammar;
diff --git a/include/cru/parse/TokenType.h b/include/cru/parse/TokenType.h
index cb6f6159..4e8545b1 100644
--- a/include/cru/parse/TokenType.h
+++ b/include/cru/parse/TokenType.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "Base.h"
 
-#include "cru/common/Base.h"
-#include "cru/common/String.h"
+#include "cru/base/Base.h"
+#include "cru/base/String.h"
 
 namespace cru::parse {
 class CRU_PARSE_API TokenType : public Object {
diff --git a/include/cru/platform/Check.h b/include/cru/platform/Check.h
index 453521cc..270150e8 100644
--- a/include/cru/platform/Check.h
+++ b/include/cru/platform/Check.h
@@ -2,7 +2,7 @@
 #include "Exception.h"
 #include "Resource.h"
 
-#include "cru/common/String.h"
+#include "cru/base/String.h"
 
 #include <memory>
 #include <type_traits>
diff --git a/include/cru/platform/Color.h b/include/cru/platform/Color.h
index 2b38138a..d993bd43 100644
--- a/include/cru/platform/Color.h
+++ b/include/cru/platform/Color.h
@@ -1,9 +1,9 @@
 #pragma once
 #include "Base.h"
 
-#include "cru/common/Base.h"
-#include "cru/common/Format.h"
-#include "cru/common/String.h"
+#include "cru/base/Base.h"
+#include "cru/base/Format.h"
+#include "cru/base/String.h"
 
 #include <cstdint>
 #include <optional>
diff --git a/include/cru/platform/Exception.h b/include/cru/platform/Exception.h
index a957c95a..2771d4d7 100644
--- a/include/cru/platform/Exception.h
+++ b/include/cru/platform/Exception.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "Base.h"
-#include "cru/common/Base.h"
-#include "cru/common/Exception.h"
-#include "cru/common/platform/Exception.h"
+#include "cru/base/Base.h"
+#include "cru/base/Exception.h"
+#include "cru/base/platform/Exception.h"
 
 #include <optional>
 
diff --git a/include/cru/platform/GraphicsBase.h b/include/cru/platform/GraphicsBase.h
index 676d3924..4837b08b 100644
--- a/include/cru/platform/GraphicsBase.h
+++ b/include/cru/platform/GraphicsBase.h
@@ -1,9 +1,9 @@
 #pragma once
 #include "Base.h"
 
-#include "cru/common/Format.h"
-#include "cru/common/Range.h"
-#include "cru/common/String.h"
+#include "cru/base/Format.h"
+#include "cru/base/Range.h"
+#include "cru/base/String.h"
 
 #include <limits>
 
diff --git a/include/cru/platform/Resource.h b/include/cru/platform/Resource.h
index ba3c5617..69210348 100644
--- a/include/cru/platform/Resource.h
+++ b/include/cru/platform/Resource.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "Base.h"
 
-#include "cru/common/Base.h"
-#include "cru/common/String.h"
+#include "cru/base/Base.h"
+#include "cru/base/String.h"
 
 namespace cru::platform {
 struct CRU_PLATFORM_API IPlatformResource : virtual Interface {
diff --git a/include/cru/platform/graphics/ImageFactory.h b/include/cru/platform/graphics/ImageFactory.h
index cd868087..e7e28143 100644
--- a/include/cru/platform/graphics/ImageFactory.h
+++ b/include/cru/platform/graphics/ImageFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Resource.h"
-#include "cru/common/io/Stream.h"
+#include "cru/base/io/Stream.h"
 
 namespace cru::platform::graphics {
 enum class ImageFormat { Jpeg, Png, Gif };
diff --git a/include/cru/platform/graphics/NullPainter.h b/include/cru/platform/graphics/NullPainter.h
index 2c6e6cb1..27cb6393 100644
--- a/include/cru/platform/graphics/NullPainter.h
+++ b/include/cru/platform/graphics/NullPainter.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Painter.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 
 namespace cru::platform::graphics {
 class CRU_PLATFORM_GRAPHICS_API NullPainter : public Object,
diff --git a/include/cru/platform/graphics/SvgGeometryBuilderMixin.h b/include/cru/platform/graphics/SvgGeometryBuilderMixin.h
index d516ce6c..1f7420e9 100644
--- a/include/cru/platform/graphics/SvgGeometryBuilderMixin.h
+++ b/include/cru/platform/graphics/SvgGeometryBuilderMixin.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Geometry.h"
-#include "cru/common/Format.h"
+#include "cru/base/Format.h"
 
 #include <utility>
 
diff --git a/include/cru/platform/graphics/direct2d/ComResource.h b/include/cru/platform/graphics/direct2d/ComResource.h
index 2beb4e20..d274ae16 100644
--- a/include/cru/platform/graphics/direct2d/ComResource.h
+++ b/include/cru/platform/graphics/direct2d/ComResource.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Base.h"
 
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 
 namespace cru::platform::graphics::direct2d {
 template <typename TInterface>
diff --git a/include/cru/platform/graphics/direct2d/Factory.h b/include/cru/platform/graphics/direct2d/Factory.h
index d6c43d9f..7abdc31f 100644
--- a/include/cru/platform/graphics/direct2d/Factory.h
+++ b/include/cru/platform/graphics/direct2d/Factory.h
@@ -3,7 +3,7 @@
 
 #include "ImageFactory.h"
 
-#include "cru/common/platform/win/ComAutoInit.h"
+#include "cru/base/platform/win/ComAutoInit.h"
 #include "cru/platform/graphics/Base.h"
 #include "cru/platform/graphics/Factory.h"
 
diff --git a/include/cru/platform/graphics/direct2d/Painter.h b/include/cru/platform/graphics/direct2d/Painter.h
index f85d840a..5e0fc92f 100644
--- a/include/cru/platform/graphics/direct2d/Painter.h
+++ b/include/cru/platform/graphics/direct2d/Painter.h
@@ -2,7 +2,7 @@
 #include "ComResource.h"
 #include "Resource.h"
 
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/graphics/Painter.h"
 
 #include <vector>
diff --git a/include/cru/platform/graphics/quartz/Brush.h b/include/cru/platform/graphics/quartz/Brush.h
index d5714293..9b29ef59 100644
--- a/include/cru/platform/graphics/quartz/Brush.h
+++ b/include/cru/platform/graphics/quartz/Brush.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Resource.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/graphics/Base.h"
 #include "cru/platform/graphics/Brush.h"
 
diff --git a/include/cru/platform/graphics/quartz/Convert.h b/include/cru/platform/graphics/quartz/Convert.h
index c7dab7c9..c5a1a6cc 100644
--- a/include/cru/platform/graphics/quartz/Convert.h
+++ b/include/cru/platform/graphics/quartz/Convert.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "cru/common/Range.h"
-#include "cru/common/String.h"
-#include "cru/common/io/Stream.h"
+#include "cru/base/Range.h"
+#include "cru/base/String.h"
+#include "cru/base/io/Stream.h"
 #include "cru/platform/Matrix.h"
 
 #include <CoreGraphics/CoreGraphics.h>
diff --git a/include/cru/platform/graphics/quartz/Factory.h b/include/cru/platform/graphics/quartz/Factory.h
index 57992d87..042e35ca 100644
--- a/include/cru/platform/graphics/quartz/Factory.h
+++ b/include/cru/platform/graphics/quartz/Factory.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Resource.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/graphics/quartz/ImageFactory.h"
 #include "cru/platform/graphics/Factory.h"
 #include "cru/platform/graphics/ImageFactory.h"
diff --git a/include/cru/platform/graphics/quartz/Font.h b/include/cru/platform/graphics/quartz/Font.h
index 36dba31a..975607b9 100644
--- a/include/cru/platform/graphics/quartz/Font.h
+++ b/include/cru/platform/graphics/quartz/Font.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Resource.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/graphics/Font.h"
 
 #include <CoreText/CoreText.h>
diff --git a/include/cru/platform/graphics/quartz/Painter.h b/include/cru/platform/graphics/quartz/Painter.h
index eba66a56..9e21904d 100644
--- a/include/cru/platform/graphics/quartz/Painter.h
+++ b/include/cru/platform/graphics/quartz/Painter.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Resource.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/graphics/Base.h"
 #include "cru/platform/graphics/Painter.h"
 
diff --git a/include/cru/platform/graphics/quartz/TextLayout.h b/include/cru/platform/graphics/quartz/TextLayout.h
index 0d23360d..bbb417f6 100644
--- a/include/cru/platform/graphics/quartz/TextLayout.h
+++ b/include/cru/platform/graphics/quartz/TextLayout.h
@@ -2,7 +2,7 @@
 #include "Resource.h"
 
 #include "Font.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/graphics/TextLayout.h"
 
 #include <memory>
diff --git a/include/cru/platform/graphics/web_canvas/WebCanvasRef.h b/include/cru/platform/graphics/web_canvas/WebCanvasRef.h
index a5d4f395..a8995b90 100644
--- a/include/cru/platform/graphics/web_canvas/WebCanvasRef.h
+++ b/include/cru/platform/graphics/web_canvas/WebCanvasRef.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 
 #include <emscripten/val.h>
 
diff --git a/include/cru/platform/graphics/web_canvas/WebCanvasResource.h b/include/cru/platform/graphics/web_canvas/WebCanvasResource.h
index 1e9bf75d..6c8087d0 100644
--- a/include/cru/platform/graphics/web_canvas/WebCanvasResource.h
+++ b/include/cru/platform/graphics/web_canvas/WebCanvasResource.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/Resource.h"
 
 namespace cru::platform::graphics::web_canvas {
diff --git a/include/cru/platform/gui/Base.h b/include/cru/platform/gui/Base.h
index 789ab308..f84e815e 100644
--- a/include/cru/platform/gui/Base.h
+++ b/include/cru/platform/gui/Base.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "cru/common/Base.h"
-#include "cru/common/Bitmask.h"
+#include "cru/base/Base.h"
+#include "cru/base/Bitmask.h"
 #include "cru/platform/graphics/Base.h"
 
 #include "../Resource.h"
diff --git a/include/cru/platform/gui/InputMethod.h b/include/cru/platform/gui/InputMethod.h
index 90d6b15a..b4a1e9d9 100644
--- a/include/cru/platform/gui/InputMethod.h
+++ b/include/cru/platform/gui/InputMethod.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Base.h"
 
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 
 #include <memory>
 #include <vector>
diff --git a/include/cru/platform/gui/Keyboard.h b/include/cru/platform/gui/Keyboard.h
index f25b25fa..224aea04 100644
--- a/include/cru/platform/gui/Keyboard.h
+++ b/include/cru/platform/gui/Keyboard.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/common/Bitmask.h"
+#include "cru/base/Bitmask.h"
 #include "cru/platform/gui/Base.h"
 
 #include <string>
diff --git a/include/cru/platform/gui/UiApplication.h b/include/cru/platform/gui/UiApplication.h
index ef13aaa4..88aa3e20 100644
--- a/include/cru/platform/gui/UiApplication.h
+++ b/include/cru/platform/gui/UiApplication.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Base.h"
 
-#include "cru/common/Bitmask.h"
+#include "cru/base/Bitmask.h"
 #include "cru/platform/gui/Menu.h"
 
 #include "SaveOpenDialogOptions.h"
diff --git a/include/cru/platform/gui/Window.h b/include/cru/platform/gui/Window.h
index d3f0daad..7f6923d1 100644
--- a/include/cru/platform/gui/Window.h
+++ b/include/cru/platform/gui/Window.h
@@ -3,7 +3,7 @@
 
 #include "Keyboard.h"
 
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 
 #include <string_view>
 
diff --git a/include/cru/platform/gui/win/Base.h b/include/cru/platform/gui/win/Base.h
index 78068827..d9a81068 100644
--- a/include/cru/platform/gui/win/Base.h
+++ b/include/cru/platform/gui/win/Base.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "cru/platform/win/WinPreConfig.h"
 
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 
 #ifdef CRU_PLATFORM_WINDOWS
 #ifdef CRU_WIN_GUI_EXPORT_API
diff --git a/include/cru/platform/gui/win/Clipboard.h b/include/cru/platform/gui/win/Clipboard.h
index dc4bc9b5..a322d520 100644
--- a/include/cru/platform/gui/win/Clipboard.h
+++ b/include/cru/platform/gui/win/Clipboard.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Resource.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/gui/Clipboard.h"
 #include "cru/platform/gui/win/Base.h"
 
diff --git a/include/cru/platform/gui/win/GodWindow.h b/include/cru/platform/gui/win/GodWindow.h
index fe61c80d..84fdfcea 100644
--- a/include/cru/platform/gui/win/GodWindow.h
+++ b/include/cru/platform/gui/win/GodWindow.h
@@ -2,8 +2,8 @@
 #include "Base.h"
 
 #include "WindowNativeMessageEventArgs.h"
-#include "cru/common/Event.h"
-#include "cru/common/String.h"
+#include "cru/base/Event.h"
+#include "cru/base/String.h"
 
 #include <memory>
 
diff --git a/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h b/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h
index bc85a597..1b5a233c 100644
--- a/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h
+++ b/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Base.h"
 
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 
 namespace cru::platform::gui::win {
 struct CRU_WIN_GUI_API WindowNativeMessage {
diff --git a/include/cru/platform/osx/Convert.h b/include/cru/platform/osx/Convert.h
index bf32174a..7994af44 100644
--- a/include/cru/platform/osx/Convert.h
+++ b/include/cru/platform/osx/Convert.h
@@ -1,2 +1,2 @@
 #pragma once
-#include "cru/common/platform/osx/Convert.h"
+#include "cru/base/platform/osx/Convert.h"
diff --git a/include/cru/platform/osx/Exception.h b/include/cru/platform/osx/Exception.h
index c346b970..d3c2aee0 100644
--- a/include/cru/platform/osx/Exception.h
+++ b/include/cru/platform/osx/Exception.h
@@ -1,3 +1,3 @@
 #pragma once
-#include "cru/common/platform/osx/Exception.h"
+#include "cru/base/platform/osx/Exception.h"
 #include "cru/platform/Exception.h"
diff --git a/include/cru/platform/win/Exception.h b/include/cru/platform/win/Exception.h
index af8b495c..353c2dab 100644
--- a/include/cru/platform/win/Exception.h
+++ b/include/cru/platform/win/Exception.h
@@ -1,3 +1,3 @@
 #pragma once
-#include "cru/common/platform/win/Exception.h"
+#include "cru/base/platform/win/Exception.h"
 #include "cru/platform/Exception.h"
diff --git a/include/cru/platform/win/WinPreConfig.h b/include/cru/platform/win/WinPreConfig.h
index e714bf5e..a67faf8f 100644
--- a/include/cru/platform/win/WinPreConfig.h
+++ b/include/cru/platform/win/WinPreConfig.h
@@ -1,2 +1,2 @@
 #pragma once
-#include "cru/common/platform/win/WinPreConfig.h"
+#include "cru/base/platform/win/WinPreConfig.h"
diff --git a/include/cru/toml/TomlDocument.h b/include/cru/toml/TomlDocument.h
index 6da5ad74..d072d384 100644
--- a/include/cru/toml/TomlDocument.h
+++ b/include/cru/toml/TomlDocument.h
@@ -2,8 +2,8 @@
 
 #include "Base.h"
 
-#include "cru/common/Base.h"
-#include "cru/common/String.h"
+#include "cru/base/Base.h"
+#include "cru/base/String.h"
 
 #include <optional>
 #include <unordered_map>
diff --git a/include/cru/toml/TomlParser.h b/include/cru/toml/TomlParser.h
index dcef2920..76c270c3 100644
--- a/include/cru/toml/TomlParser.h
+++ b/include/cru/toml/TomlParser.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cru/common/Exception.h"
+#include "cru/base/Exception.h"
 #include "cru/toml/TomlDocument.h"
 
 #include <optional>
diff --git a/include/cru/ui/Base.h b/include/cru/ui/Base.h
index 5e62d785..78b8ccf9 100644
--- a/include/cru/ui/Base.h
+++ b/include/cru/ui/Base.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/graphics/Base.h"
 #include "cru/platform/gui/Base.h"
 
diff --git a/include/cru/ui/ThemeManager.h b/include/cru/ui/ThemeManager.h
index faa8a1cf..d4e6a096 100644
--- a/include/cru/ui/ThemeManager.h
+++ b/include/cru/ui/ThemeManager.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Base.h"
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 #include "cru/ui/ThemeResourceDictionary.h"
 
 #include <vector>
diff --git a/include/cru/ui/ThemeResourceDictionary.h b/include/cru/ui/ThemeResourceDictionary.h
index 7112ab27..597fe707 100644
--- a/include/cru/ui/ThemeResourceDictionary.h
+++ b/include/cru/ui/ThemeResourceDictionary.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Base.h"
 
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/xml/XmlNode.h"
 #include "mapper/MapperRegistry.h"
 #include "style/StyleRuleSet.h"
diff --git a/include/cru/ui/components/Component.h b/include/cru/ui/components/Component.h
index a2f83149..ae742aae 100644
--- a/include/cru/ui/components/Component.h
+++ b/include/cru/ui/components/Component.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../Base.h"
 #include "../DeleteLater.h"
-#include "cru/common/SelfResolvable.h"
+#include "cru/base/SelfResolvable.h"
 
 namespace cru::ui::components {
 /**
diff --git a/include/cru/ui/components/Menu.h b/include/cru/ui/components/Menu.h
index 82766aa5..913f5c92 100644
--- a/include/cru/ui/components/Menu.h
+++ b/include/cru/ui/components/Menu.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Component.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/ui/controls/Button.h"
 #include "cru/ui/controls/Control.h"
 #include "cru/ui/controls/FlexLayout.h"
diff --git a/include/cru/ui/controls/Button.h b/include/cru/ui/controls/Button.h
index 6df23c62..717710e8 100644
--- a/include/cru/ui/controls/Button.h
+++ b/include/cru/ui/controls/Button.h
@@ -5,7 +5,7 @@
 #include "../render/BorderRenderObject.h"
 #include "IBorderControl.h"
 #include "IClickableControl.h"
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API Button : public SingleChildControl<render::BorderRenderObject>,
diff --git a/include/cru/ui/controls/Control.h b/include/cru/ui/controls/Control.h
index 38a9a86b..790f4a3a 100644
--- a/include/cru/ui/controls/Control.h
+++ b/include/cru/ui/controls/Control.h
@@ -4,7 +4,7 @@
 #include "../events/UiEvents.h"
 #include "../render/RenderObject.h"
 #include "../style/StyleRuleSet.h"
-#include "cru/common/SelfResolvable.h"
+#include "cru/base/SelfResolvable.h"
 #include "cru/ui/render/MeasureRequirement.h"
 
 namespace cru::ui::controls {
diff --git a/include/cru/ui/controls/IBorderControl.h b/include/cru/ui/controls/IBorderControl.h
index f8f2f88d..e3eb3388 100644
--- a/include/cru/ui/controls/IBorderControl.h
+++ b/include/cru/ui/controls/IBorderControl.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "../style/ApplyBorderStyleInfo.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 
 namespace cru::ui::controls {
 struct CRU_UI_API IBorderControl : virtual Interface {
diff --git a/include/cru/ui/controls/ICheckableControl.h b/include/cru/ui/controls/ICheckableControl.h
index 2c7aace8..7a6d7b8e 100644
--- a/include/cru/ui/controls/ICheckableControl.h
+++ b/include/cru/ui/controls/ICheckableControl.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "../Base.h"
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 
 namespace cru::ui::controls {
 struct CRU_UI_API ICheckableControl : virtual Interface {
diff --git a/include/cru/ui/controls/IClickableControl.h b/include/cru/ui/controls/IClickableControl.h
index 67fa43ab..4ddea730 100644
--- a/include/cru/ui/controls/IClickableControl.h
+++ b/include/cru/ui/controls/IClickableControl.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../helper/ClickDetector.h"
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 
 namespace cru::ui::controls {
 struct CRU_UI_API IClickableControl : virtual Interface {
diff --git a/include/cru/ui/controls/IconButton.h b/include/cru/ui/controls/IconButton.h
index a76d01d4..632450e2 100644
--- a/include/cru/ui/controls/IconButton.h
+++ b/include/cru/ui/controls/IconButton.h
@@ -8,7 +8,7 @@
 #include "IBorderControl.h"
 #include "IClickableControl.h"
 #include "IContentBrushControl.h"
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 #include "cru/platform/graphics/Brush.h"
 
 namespace cru::ui::controls {
diff --git a/include/cru/ui/controls/RootControl.h b/include/cru/ui/controls/RootControl.h
index 851b4db0..5fa8090e 100644
--- a/include/cru/ui/controls/RootControl.h
+++ b/include/cru/ui/controls/RootControl.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "LayoutControl.h"
 
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 #include "cru/platform/gui/Window.h"
 #include "cru/ui/host/WindowHost.h"
 #include "cru/ui/render/StackLayoutRenderObject.h"
diff --git a/include/cru/ui/controls/Window.h b/include/cru/ui/controls/Window.h
index a1a97f87..656a96dd 100644
--- a/include/cru/ui/controls/Window.h
+++ b/include/cru/ui/controls/Window.h
@@ -2,7 +2,7 @@
 #include "cru/platform/gui/Base.h"
 #include "cru/ui/controls/RootControl.h"
 
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 
 namespace cru::ui::controls {
 class CRU_UI_API Window final : public RootControl {
diff --git a/include/cru/ui/document/DocumentElementType.h b/include/cru/ui/document/DocumentElementType.h
index d16836c1..6d4958d0 100644
--- a/include/cru/ui/document/DocumentElementType.h
+++ b/include/cru/ui/document/DocumentElementType.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../Base.h"
-#include "cru/common/String.h"
+#include "cru/base/String.h"
 
 #include <vector>
 
diff --git a/include/cru/ui/document/TextDocumentElement.h b/include/cru/ui/document/TextDocumentElement.h
index 93b4933b..73a041ef 100644
--- a/include/cru/ui/document/TextDocumentElement.h
+++ b/include/cru/ui/document/TextDocumentElement.h
@@ -2,8 +2,8 @@
 
 #include "../Base.h"
 #include "DocumentElement.h"
-#include "cru/common/Base.h"
-#include "cru/common/Bitmask.h"
+#include "cru/base/Base.h"
+#include "cru/base/Bitmask.h"
 
 namespace cru::ui::document {
 namespace details {
diff --git a/include/cru/ui/events/RoutedEvent.h b/include/cru/ui/events/RoutedEvent.h
index 909678f8..a01839a6 100644
--- a/include/cru/ui/events/RoutedEvent.h
+++ b/include/cru/ui/events/RoutedEvent.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "UiEventArgs.h"
 
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 
 namespace cru::ui::events {
 // TEventArgs must not be a reference type. This class help add reference.
diff --git a/include/cru/ui/helper/ClickDetector.h b/include/cru/ui/helper/ClickDetector.h
index 3bf28451..5e30d9c3 100644
--- a/include/cru/ui/helper/ClickDetector.h
+++ b/include/cru/ui/helper/ClickDetector.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../Base.h"
 
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 
 namespace cru::ui::helper {
 class ClickDetector;
diff --git a/include/cru/ui/helper/ShortcutHub.h b/include/cru/ui/helper/ShortcutHub.h
index fe3b2a72..341e76da 100644
--- a/include/cru/ui/helper/ShortcutHub.h
+++ b/include/cru/ui/helper/ShortcutHub.h
@@ -2,8 +2,8 @@
 #include "../Base.h"
 
 #include "../events/KeyEventArgs.h"
-#include "cru/common/Base.h"
-#include "cru/common/Event.h"
+#include "cru/base/Base.h"
+#include "cru/base/Event.h"
 #include "cru/platform/gui/Keyboard.h"
 
 #include <cstddef>
diff --git a/include/cru/ui/host/WindowHost.h b/include/cru/ui/host/WindowHost.h
index 17f69d89..23229036 100644
--- a/include/cru/ui/host/WindowHost.h
+++ b/include/cru/ui/host/WindowHost.h
@@ -2,7 +2,7 @@
 #include "../Base.h"
 
 #include "../render/RenderObject.h"
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 #include "cru/platform/gui/Cursor.h"
 #include "cru/platform/gui/UiApplication.h"
 #include "cru/platform/gui/Window.h"
diff --git a/include/cru/ui/mapper/BrushMapper.h b/include/cru/ui/mapper/BrushMapper.h
index 0748c037..3b918dc7 100644
--- a/include/cru/ui/mapper/BrushMapper.h
+++ b/include/cru/ui/mapper/BrushMapper.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Mapper.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/graphics/Brush.h"
 #include "cru/xml/XmlNode.h"
 
diff --git a/include/cru/ui/mapper/FontMapper.h b/include/cru/ui/mapper/FontMapper.h
index f6dbf56a..f8b10047 100644
--- a/include/cru/ui/mapper/FontMapper.h
+++ b/include/cru/ui/mapper/FontMapper.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Mapper.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/platform/graphics/Font.h"
 
 namespace cru::ui::mapper {
diff --git a/include/cru/ui/mapper/Mapper.h b/include/cru/ui/mapper/Mapper.h
index e059f9c0..40e15186 100644
--- a/include/cru/ui/mapper/Mapper.h
+++ b/include/cru/ui/mapper/Mapper.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "../Base.h"
 
-#include "cru/common/ClonablePtr.h"
-#include "cru/common/Exception.h"
+#include "cru/base/ClonablePtr.h"
+#include "cru/base/Exception.h"
 #include "cru/xml/XmlNode.h"
 
 #include <memory>
diff --git a/include/cru/ui/mapper/ThicknessMapper.h b/include/cru/ui/mapper/ThicknessMapper.h
index 10f6c87e..fab1e5d3 100644
--- a/include/cru/ui/mapper/ThicknessMapper.h
+++ b/include/cru/ui/mapper/ThicknessMapper.h
@@ -2,7 +2,7 @@
 #include "Mapper.h"
 
 #include "../Base.h"
-#include "cru/common/Base.h"
+#include "cru/base/Base.h"
 #include "cru/xml/XmlNode.h"
 
 namespace cru::ui::mapper {
diff --git a/include/cru/ui/mapper/style/BorderStylerMapper.h b/include/cru/ui/mapper/style/BorderStylerMapper.h
index 3cf78faa..57b5dce4 100644
--- a/include/cru/ui/mapper/style/BorderStylerMapper.h
+++ b/include/cru/ui/mapper/style/BorderStylerMapper.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "../Mapper.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/mapper/style/IStylerMapper.h"
 #include "cru/ui/style/Styler.h"
 #include "cru/xml/XmlNode.h"
diff --git a/include/cru/ui/mapper/style/IConditionMapper.h b/include/cru/ui/mapper/style/IConditionMapper.h
index 7610dc8d..bfe24224 100644
--- a/include/cru/ui/mapper/style/IConditionMapper.h
+++ b/include/cru/ui/mapper/style/IConditionMapper.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "../../Base.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/mapper/Mapper.h"
 #include "cru/ui/style/Condition.h"
 #include "cru/xml/XmlNode.h"
diff --git a/include/cru/ui/mapper/style/IStylerMapper.h b/include/cru/ui/mapper/style/IStylerMapper.h
index 4c2ecd16..adf9b6fb 100644
--- a/include/cru/ui/mapper/style/IStylerMapper.h
+++ b/include/cru/ui/mapper/style/IStylerMapper.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "../../Base.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/mapper/Mapper.h"
 #include "cru/ui/style/Styler.h"
 #include "cru/xml/XmlNode.h"
diff --git a/include/cru/ui/mapper/style/NoConditionMapper.h b/include/cru/ui/mapper/style/NoConditionMapper.h
index 2103a268..06106514 100644
--- a/include/cru/ui/mapper/style/NoConditionMapper.h
+++ b/include/cru/ui/mapper/style/NoConditionMapper.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "../Mapper.h"
 #include "IConditionMapper.h"
-#include "cru/common/Base.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/Base.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/style/Condition.h"
 #include "cru/xml/XmlNode.h"
 
diff --git a/include/cru/ui/mapper/style/StyleRuleMapper.h b/include/cru/ui/mapper/style/StyleRuleMapper.h
index 21bf3176..7430274c 100644
--- a/include/cru/ui/mapper/style/StyleRuleMapper.h
+++ b/include/cru/ui/mapper/style/StyleRuleMapper.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../Mapper.h"
-#include "cru/common/Base.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/Base.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/ui/style/StyleRule.h"
 #include "cru/xml/XmlNode.h"
 
diff --git a/include/cru/ui/model/IListChangeNotify.h b/include/cru/ui/model/IListChangeNotify.h
index a9fcd65b..0cbd25f2 100644
--- a/include/cru/ui/model/IListChangeNotify.h
+++ b/include/cru/ui/model/IListChangeNotify.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../Base.h"
-#include "cru/common/Base.h"
-#include "cru/common/Event.h"
+#include "cru/base/Base.h"
+#include "cru/base/Event.h"
 
 namespace cru::ui::model {
 enum ListChangeType {
diff --git a/include/cru/ui/render/CanvasRenderObject.h b/include/cru/ui/render/CanvasRenderObject.h
index f498c5ae..dfe8f090 100644
--- a/include/cru/ui/render/CanvasRenderObject.h
+++ b/include/cru/ui/render/CanvasRenderObject.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "RenderObject.h"
 
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 
 namespace cru::ui::render {
 class CanvasPaintEventArgs {
diff --git a/include/cru/ui/render/MeasureRequirement.h b/include/cru/ui/render/MeasureRequirement.h
index ace52ef6..3f4e0a3d 100644
--- a/include/cru/ui/render/MeasureRequirement.h
+++ b/include/cru/ui/render/MeasureRequirement.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../Base.h"
 
-#include "cru/common/String.h"
+#include "cru/base/String.h"
 
 #include <algorithm>
 #include <limits>
diff --git a/include/cru/ui/render/RenderObject.h b/include/cru/ui/render/RenderObject.h
index 8a0ba511..7ab62446 100644
--- a/include/cru/ui/render/RenderObject.h
+++ b/include/cru/ui/render/RenderObject.h
@@ -2,7 +2,7 @@
 #include "../Base.h"
 
 #include "MeasureRequirement.h"
-#include "cru/common/String.h"
+#include "cru/base/String.h"
 
 namespace cru::ui::render {
 struct BoxConstraint {
diff --git a/include/cru/ui/render/ScrollBar.h b/include/cru/ui/render/ScrollBar.h
index 20b6e6cf..45f80389 100644
--- a/include/cru/ui/render/ScrollBar.h
+++ b/include/cru/ui/render/ScrollBar.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "cru/common/Base.h"
-#include "cru/common/Event.h"
+#include "cru/base/Base.h"
+#include "cru/base/Event.h"
 #include "cru/platform/graphics/Base.h"
 #include "cru/platform/graphics/Brush.h"
 #include "cru/platform/graphics/Geometry.h"
diff --git a/include/cru/ui/render/ScrollRenderObject.h b/include/cru/ui/render/ScrollRenderObject.h
index 44656942..180e927a 100644
--- a/include/cru/ui/render/ScrollRenderObject.h
+++ b/include/cru/ui/render/ScrollRenderObject.h
@@ -2,7 +2,7 @@
 #include "SingleChildRenderObject.h"
 
 #include "ScrollBar.h"
-#include "cru/common/Event.h"
+#include "cru/base/Event.h"
 #include "cru/ui/render/RenderObject.h"
 
 #include <memory>
diff --git a/include/cru/ui/style/Condition.h b/include/cru/ui/style/Condition.h
index 28f42315..2d2dceac 100644
--- a/include/cru/ui/style/Condition.h
+++ b/include/cru/ui/style/Condition.h
@@ -1,8 +1,8 @@
 #pragma once
 #include "../Base.h"
-#include "cru/common/Base.h"
-#include "cru/common/ClonablePtr.h"
-#include "cru/common/Event.h"
+#include "cru/base/Base.h"
+#include "cru/base/ClonablePtr.h"
+#include "cru/base/Event.h"
 #include "cru/ui/controls/IClickableControl.h"
 #include "cru/ui/helper/ClickDetector.h"
 
diff --git a/include/cru/ui/style/StyleRule.h b/include/cru/ui/style/StyleRule.h
index 27069930..1ae2f0f1 100644
--- a/include/cru/ui/style/StyleRule.h
+++ b/include/cru/ui/style/StyleRule.h
@@ -2,7 +2,7 @@
 #include "../Base.h"
 #include "Condition.h"
 #include "Styler.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 
 #include <memory>
 #include <vector>
diff --git a/include/cru/ui/style/StyleRuleSet.h b/include/cru/ui/style/StyleRuleSet.h
index 080c2eb8..fae9ab5f 100644
--- a/include/cru/ui/style/StyleRuleSet.h
+++ b/include/cru/ui/style/StyleRuleSet.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "StyleRule.h"
-#include "cru/common/Base.h"
-#include "cru/common/Event.h"
+#include "cru/base/Base.h"
+#include "cru/base/Event.h"
 #include "cru/ui/model/IListChangeNotify.h"
 
 #include <cstddef>
diff --git a/include/cru/ui/style/Styler.h b/include/cru/ui/style/Styler.h
index 7df3e138..3ed85e1e 100644
--- a/include/cru/ui/style/Styler.h
+++ b/include/cru/ui/style/Styler.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../Base.h"
 #include "ApplyBorderStyleInfo.h"
-#include "cru/common/ClonablePtr.h"
+#include "cru/base/ClonablePtr.h"
 #include "cru/platform/graphics/Brush.h"
 #include "cru/platform/gui/Cursor.h"
 #include "cru/ui/render/MeasureRequirement.h"
diff --git a/include/cru/xml/XmlNode.h b/include/cru/xml/XmlNode.h
index 50685749..a7d1bf38 100644
--- a/include/cru/xml/XmlNode.h
+++ b/include/cru/xml/XmlNode.h
@@ -2,7 +2,7 @@
 
 #include "Base.h"
 
-#include "cru/common/String.h"
+#include "cru/base/String.h"
 
 #include <algorithm>
 #include <optional>
diff --git a/include/cru/xml/XmlParser.h b/include/cru/xml/XmlParser.h
index 75664ce3..ca4fb54a 100644
--- a/include/cru/xml/XmlParser.h
+++ b/include/cru/xml/XmlParser.h
@@ -2,8 +2,8 @@
 
 #include "XmlNode.h"
 
-#include "cru/common/Exception.h"
-#include "cru/common/String.h"
+#include "cru/base/Exception.h"
+#include "cru/base/String.h"
 
 #include <optional>