...

55 files changed, 120 insertions, 124 deletions

diff --git a/include/cru/osx/graphics/quartz/Brush.h b/include/cru/platform/graphics/quartz/Brush.h
index 677a0b6c..f3579771 100644
--- a/include/cru/osx/graphics/quartz/Brush.h
+++ b/include/cru/platform/graphics/quartz/Brush.h
@@ -8,7 +8,7 @@
 
 #include <functional>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class QuartzBrush : public OsxQuartzResource, public virtual IBrush {
  public:
   QuartzBrush(IGraphicsFactory* graphics_factory)
@@ -44,4 +44,4 @@ class QuartzSolidColorBrush : public QuartzBrush,
   Color color_;
   CGColorRef cg_color_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/Convert.h b/include/cru/platform/graphics/quartz/Convert.h
index be56b959..c7dab7c9 100644
--- a/include/cru/osx/graphics/quartz/Convert.h
+++ b/include/cru/platform/graphics/quartz/Convert.h
@@ -6,7 +6,7 @@
 
 #include <CoreGraphics/CoreGraphics.h>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 CGAffineTransform Convert(const Matrix& matrix);
 Matrix Convert(const CGAffineTransform& matrix);
 
@@ -21,4 +21,4 @@ Rect Convert(const CGRect& rect);
 
 CGDataProviderRef ConvertStreamToCGDataProvider(io::Stream* stream);
 CGDataConsumerRef ConvertStreamToCGDataConsumer(io::Stream* stream);
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/Factory.h b/include/cru/platform/graphics/quartz/Factory.h
index 1a5abdc1..57992d87 100644
--- a/include/cru/osx/graphics/quartz/Factory.h
+++ b/include/cru/platform/graphics/quartz/Factory.h
@@ -1,11 +1,11 @@
 #pragma once
 #include "Resource.h"
 #include "cru/common/Base.h"
-#include "cru/osx/graphics/quartz/ImageFactory.h"
+#include "cru/platform/graphics/quartz/ImageFactory.h"
 #include "cru/platform/graphics/Factory.h"
 #include "cru/platform/graphics/ImageFactory.h"
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class QuartzGraphicsFactory : public OsxQuartzResource,
                               public virtual IGraphicsFactory {
  public:
@@ -32,4 +32,4 @@ class QuartzGraphicsFactory : public OsxQuartzResource,
  private:
   std::unique_ptr<QuartzImageFactory> image_factory_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/Font.h b/include/cru/platform/graphics/quartz/Font.h
index 50703dfe..36dba31a 100644
--- a/include/cru/osx/graphics/quartz/Font.h
+++ b/include/cru/platform/graphics/quartz/Font.h
@@ -5,7 +5,7 @@
 
 #include <CoreText/CoreText.h>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class OsxCTFont : public OsxQuartzResource, public virtual IFont {
  public:
   OsxCTFont(IGraphicsFactory* graphics_factory, const String& name, float size);
@@ -24,4 +24,4 @@ class OsxCTFont : public OsxQuartzResource, public virtual IFont {
   String name_;
   CTFontRef ct_font_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/Geometry.h b/include/cru/platform/graphics/quartz/Geometry.h
index e0bdd5b6..18e2e25e 100644
--- a/include/cru/osx/graphics/quartz/Geometry.h
+++ b/include/cru/platform/graphics/quartz/Geometry.h
@@ -6,7 +6,7 @@
 
 #include <CoreGraphics/CoreGraphics.h>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class QuartzGeometry : public OsxQuartzResource, public virtual IGeometry {
  public:
   QuartzGeometry(IGraphicsFactory *graphics_factory, CGPathRef cg_path);
@@ -54,4 +54,4 @@ class QuartzGeometryBuilder : public OsxQuartzResource,
  private:
   CGMutablePathRef cg_mutable_path_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/Image.h b/include/cru/platform/graphics/quartz/Image.h
index 5b3aead9..1dd8f0a6 100644
--- a/include/cru/osx/graphics/quartz/Image.h
+++ b/include/cru/platform/graphics/quartz/Image.h
@@ -5,7 +5,7 @@
 
 #include <CoreGraphics/CoreGraphics.h>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class QuartzImage : public OsxQuartzResource, public virtual IImage {
  public:
   QuartzImage(IGraphicsFactory* graphics_factory, IImageFactory* image_factory,
@@ -34,4 +34,4 @@ class QuartzImage : public OsxQuartzResource, public virtual IImage {
 
   unsigned char* buffer_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/ImageFactory.h b/include/cru/platform/graphics/quartz/ImageFactory.h
index 23d14332..bd2a929f 100644
--- a/include/cru/osx/graphics/quartz/ImageFactory.h
+++ b/include/cru/platform/graphics/quartz/ImageFactory.h
@@ -2,7 +2,7 @@
 #include "Resource.h"
 #include "cru/platform/graphics/ImageFactory.h"
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class QuartzImageFactory : public OsxQuartzResource,
                            public virtual IImageFactory {
  public:
@@ -19,4 +19,4 @@ class QuartzImageFactory : public OsxQuartzResource,
                       float quality) override;
   std::unique_ptr<IImage> CreateBitmap(int width, int height) override;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/Painter.h b/include/cru/platform/graphics/quartz/Painter.h
index 87389437..eba66a56 100644
--- a/include/cru/osx/graphics/quartz/Painter.h
+++ b/include/cru/platform/graphics/quartz/Painter.h
@@ -8,7 +8,7 @@
 
 #include <functional>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class QuartzCGContextPainter : public OsxQuartzResource,
                                public virtual IPainter {
   CRU_DEFINE_CLASS_LOG_TAG(u"QuartzCGContextPainter")
@@ -79,4 +79,4 @@ class QuartzCGContextPainter : public OsxQuartzResource,
 
   std::vector<Rect> clip_stack_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/Resource.h b/include/cru/platform/graphics/quartz/Resource.h
index 916a376f..d28e4055 100644
--- a/include/cru/osx/graphics/quartz/Resource.h
+++ b/include/cru/platform/graphics/quartz/Resource.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "cru/osx/Resource.h"
+#include "cru/platform/osx/Resource.h"
 #include "cru/platform/graphics/Base.h"
 #include "cru/platform/graphics/Resource.h"
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class OsxQuartzResource : public platform::osx::OsxResource,
                           public virtual IGraphicsResource {
  public:
@@ -22,4 +22,4 @@ class OsxQuartzResource : public platform::osx::OsxResource,
  private:
   IGraphicsFactory* graphics_factory_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/graphics/quartz/TextLayout.h b/include/cru/platform/graphics/quartz/TextLayout.h
index c0abc7f9..0d23360d 100644
--- a/include/cru/osx/graphics/quartz/TextLayout.h
+++ b/include/cru/platform/graphics/quartz/TextLayout.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 class OsxCTTextLayout : public OsxQuartzResource, public virtual ITextLayout {
  public:
   OsxCTTextLayout(IGraphicsFactory* graphics_factory,
@@ -92,4 +92,4 @@ class OsxCTTextLayout : public OsxQuartzResource, public virtual ITextLayout {
 
   Matrix transform_;
 };
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/include/cru/osx/gui/Clipboard.h b/include/cru/platform/gui/osx/Clipboard.h
index b4dcce4c..b4dcce4c 100644
--- a/include/cru/osx/gui/Clipboard.h
+++ b/include/cru/platform/gui/osx/Clipboard.h
diff --git a/include/cru/osx/gui/Cursor.h b/include/cru/platform/gui/osx/Cursor.h
index 6cfd400a..6cfd400a 100644
--- a/include/cru/osx/gui/Cursor.h
+++ b/include/cru/platform/gui/osx/Cursor.h
diff --git a/include/cru/osx/gui/InputMethod.h b/include/cru/platform/gui/osx/InputMethod.h
index cbfdae6c..cbfdae6c 100644
--- a/include/cru/osx/gui/InputMethod.h
+++ b/include/cru/platform/gui/osx/InputMethod.h
diff --git a/include/cru/osx/gui/Keyboard.h b/include/cru/platform/gui/osx/Keyboard.h
index 89e0fa05..89e0fa05 100644
--- a/include/cru/osx/gui/Keyboard.h
+++ b/include/cru/platform/gui/osx/Keyboard.h
diff --git a/include/cru/osx/gui/Menu.h b/include/cru/platform/gui/osx/Menu.h
index c5cc756a..c5cc756a 100644
--- a/include/cru/osx/gui/Menu.h
+++ b/include/cru/platform/gui/osx/Menu.h
diff --git a/include/cru/osx/gui/Resource.h b/include/cru/platform/gui/osx/Resource.h
index bc3f9cd6..1eec7d09 100644
--- a/include/cru/osx/gui/Resource.h
+++ b/include/cru/platform/gui/osx/Resource.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../Resource.h"
+#include "cru/platform/osx/Resource.h"
 
 #include "cru/platform/gui/Base.h"
 
diff --git a/include/cru/osx/gui/UiApplication.h b/include/cru/platform/gui/osx/UiApplication.h
index 2d2c119c..2d2c119c 100644
--- a/include/cru/osx/gui/UiApplication.h
+++ b/include/cru/platform/gui/osx/UiApplication.h
diff --git a/include/cru/osx/gui/Window.h b/include/cru/platform/gui/osx/Window.h
index 6cefbe8e..6cefbe8e 100644
--- a/include/cru/osx/gui/Window.h
+++ b/include/cru/platform/gui/osx/Window.h
diff --git a/include/cru/osx/Convert.h b/include/cru/platform/osx/Convert.h
index bf32174a..bf32174a 100644
--- a/include/cru/osx/Convert.h
+++ b/include/cru/platform/osx/Convert.h
diff --git a/include/cru/osx/Exception.h b/include/cru/platform/osx/Exception.h
index c346b970..c346b970 100644
--- a/include/cru/osx/Exception.h
+++ b/include/cru/platform/osx/Exception.h
diff --git a/include/cru/osx/Resource.h b/include/cru/platform/osx/Resource.h
index d30ee31b..d30ee31b 100644
--- a/include/cru/osx/Resource.h
+++ b/include/cru/platform/osx/Resource.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c528d061..b3fdbff2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,10 +2,6 @@ add_subdirectory(common)
 
 add_subdirectory(platform)
 
-if (APPLE)
-	add_subdirectory(osx)
-endif()
-
 add_subdirectory(ui)
 add_subdirectory(parse)
 add_subdirectory(toml)
diff --git a/src/osx/Resource.cpp b/src/osx/Resource.cpp
deleted file mode 100644
index dbf15d48..00000000
--- a/src/osx/Resource.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "cru/osx/Resource.h"
diff --git a/src/osx/graphics/CMakeLists.txt b/src/osx/graphics/CMakeLists.txt
deleted file mode 100644
index 980c2f93..00000000
--- a/src/osx/graphics/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(quartz)
diff --git a/src/osx/graphics/quartz/Resource.cpp b/src/osx/graphics/quartz/Resource.cpp
deleted file mode 100644
index 00bd5c94..00000000
--- a/src/osx/graphics/quartz/Resource.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "cru/osx/graphics/quartz/Resource.h"
diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt
index a63aab44..bb9259ae 100644
--- a/src/platform/CMakeLists.txt
+++ b/src/platform/CMakeLists.txt
@@ -13,6 +13,10 @@ if (WIN32)
 	add_subdirectory(win)
 	add_subdirectory(graphics/direct2d)
 	add_subdirectory(gui/win)
+elseif (APPLE)
+	add_subdirectory(osx)
+	add_subdirectory(graphics/quartz)
+	add_subdirectory(gui/osx)
 endif()
 
 add_subdirectory(bootstrap)
diff --git a/src/platform/bootstrap/Bootstrap.cpp b/src/platform/bootstrap/Bootstrap.cpp
index 5dcd0c77..30099b96 100644
--- a/src/platform/bootstrap/Bootstrap.cpp
+++ b/src/platform/bootstrap/Bootstrap.cpp
@@ -4,8 +4,8 @@
 #include "cru/platform/graphics/direct2d/Factory.h"
 #include "cru/platform/gui/win/UiApplication.h"
 #else
-#include "cru/osx/graphics/quartz/Factory.h"
-#include "cru/osx/gui/UiApplication.h"
+#include "cru/platform/graphics/quartz/Factory.h"
+#include "cru/platform/gui/osx/UiApplication.h"
 #endif
 
 namespace cru::platform::bootstrap {
@@ -24,7 +24,7 @@ CreateGraphicsFactory() {
 #ifdef CRU_PLATFORM_WINDOWS
   return new cru::platform::graphics::direct2d::DirectGraphicsFactory();
 #elif CRU_PLATFORM_OSX
-  return new cru::platform::graphics::osx::quartz::QuartzGraphicsFactory();
+  return new cru::platform::graphics::quartz::QuartzGraphicsFactory();
 #else
   return nullptr;
 #endif
diff --git a/src/osx/graphics/quartz/Brush.cpp b/src/platform/graphics/quartz/Brush.cpp
index cfb8f635..2aa31bd8 100644
--- a/src/osx/graphics/quartz/Brush.cpp
+++ b/src/platform/graphics/quartz/Brush.cpp
@@ -1,8 +1,8 @@
-#include "cru/osx/graphics/quartz/Brush.h"
+#include "cru/platform/graphics/quartz/Brush.h"
 #include "cru/common/String.h"
 #include "cru/common/Format.h"
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 QuartzSolidColorBrush::QuartzSolidColorBrush(IGraphicsFactory* graphics_factory,
                                              const Color& color)
     : QuartzBrush(graphics_factory), color_(color) {
@@ -33,4 +33,4 @@ void QuartzSolidColorBrush::Select(CGContextRef context) {
 String QuartzSolidColorBrush::GetDebugString() {
   return Format(u"QuartzSolidColorBrush(Color: {})", color_);
 }
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/src/osx/graphics/quartz/CMakeLists.txt b/src/platform/graphics/quartz/CMakeLists.txt
index 1fcaff26..1fcaff26 100644
--- a/src/osx/graphics/quartz/CMakeLists.txt
+++ b/src/platform/graphics/quartz/CMakeLists.txt
diff --git a/src/osx/graphics/quartz/Convert.cpp b/src/platform/graphics/quartz/Convert.cpp
index df62a206..06720982 100644
--- a/src/osx/graphics/quartz/Convert.cpp
+++ b/src/platform/graphics/quartz/Convert.cpp
@@ -1,7 +1,7 @@
-#include "cru/osx/graphics/quartz/Convert.h"
+#include "cru/platform/graphics/quartz/Convert.h"
 #include <cstdint>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 
 CGPoint Convert(const Point& point) { return CGPoint{point.x, point.y}; }
 Point Convert(const CGPoint& point) { return Point(point.x, point.y); }
@@ -60,4 +60,4 @@ CGDataConsumerRef ConvertStreamToCGDataConsumer(io::Stream* stream) {
   return CGDataConsumerCreate(stream, &kStreamToCGDataConsumerCallbacks);
 }
 
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/src/osx/graphics/quartz/Factory.cpp b/src/platform/graphics/quartz/Factory.cpp
index 283341e5..862c0966 100644
--- a/src/osx/graphics/quartz/Factory.cpp
+++ b/src/platform/graphics/quartz/Factory.cpp
@@ -1,16 +1,16 @@
-#include "cru/osx/graphics/quartz/Factory.h"
+#include "cru/platform/graphics/quartz/Factory.h"
 
-#include "cru/osx/graphics/quartz/Brush.h"
-#include "cru/osx/graphics/quartz/Font.h"
-#include "cru/osx/graphics/quartz/Geometry.h"
-#include "cru/osx/graphics/quartz/ImageFactory.h"
-#include "cru/osx/graphics/quartz/TextLayout.h"
+#include "cru/platform/graphics/quartz/Brush.h"
+#include "cru/platform/graphics/quartz/Font.h"
+#include "cru/platform/graphics/quartz/Geometry.h"
+#include "cru/platform/graphics/quartz/ImageFactory.h"
+#include "cru/platform/graphics/quartz/TextLayout.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/graphics/ImageFactory.h"
 
 #include <memory>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 QuartzGraphicsFactory::QuartzGraphicsFactory()
     : OsxQuartzResource(this), image_factory_(new QuartzImageFactory(this)) {}
 
@@ -40,4 +40,4 @@ std::unique_ptr<ITextLayout> QuartzGraphicsFactory::CreateTextLayout(
 IImageFactory* QuartzGraphicsFactory::GetImageFactory() {
   return image_factory_.get();
 }
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/src/osx/graphics/quartz/Font.cpp b/src/platform/graphics/quartz/Font.cpp
index a1b8bac2..62052b0a 100644
--- a/src/osx/graphics/quartz/Font.cpp
+++ b/src/platform/graphics/quartz/Font.cpp
@@ -1,10 +1,10 @@
-#include "cru/osx/graphics/quartz/Font.h"
+#include "cru/platform/graphics/quartz/Font.h"
 
-#include "cru/osx/Convert.h"
-#include "cru/osx/graphics/quartz/Convert.h"
-#include "cru/osx/graphics/quartz/Resource.h"
+#include "cru/platform/osx/Convert.h"
+#include "cru/platform/graphics/quartz/Convert.h"
+#include "cru/platform/graphics/quartz/Resource.h"
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 using cru::platform::osx::Convert;
 
 OsxCTFont::OsxCTFont(IGraphicsFactory* graphics_factory, const String& name,
@@ -27,4 +27,4 @@ OsxCTFont::~OsxCTFont() { CFRelease(ct_font_); }
 
 String OsxCTFont::GetFontName() { return name_; }
 float OsxCTFont::GetFontSize() { return CTFontGetSize(ct_font_); }
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/src/osx/graphics/quartz/Geometry.cpp b/src/platform/graphics/quartz/Geometry.cpp
index c88add87..e6558fbb 100644
--- a/src/osx/graphics/quartz/Geometry.cpp
+++ b/src/platform/graphics/quartz/Geometry.cpp
@@ -1,9 +1,9 @@
-#include "cru/osx/graphics/quartz/Geometry.h"
-#include "cru/osx/graphics/quartz/Convert.h"
+#include "cru/platform/graphics/quartz/Geometry.h"
+#include "cru/platform/graphics/quartz/Convert.h"
 
 #include <memory>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 QuartzGeometry::QuartzGeometry(IGraphicsFactory *graphics_factory,
                                CGPathRef cg_path)
     : OsxQuartzResource(graphics_factory), cg_path_(cg_path) {}
@@ -76,4 +76,4 @@ std::unique_ptr<IGeometry> QuartzGeometryBuilder::Build() {
   return std::make_unique<QuartzGeometry>(GetGraphicsFactory(),
                                           CGPathCreateCopy(cg_mutable_path_));
 }
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/src/osx/graphics/quartz/Image.cpp b/src/platform/graphics/quartz/Image.cpp
index 28087000..3fa40937 100644
--- a/src/osx/graphics/quartz/Image.cpp
+++ b/src/platform/graphics/quartz/Image.cpp
@@ -1,9 +1,9 @@
-#include "cru/osx/graphics/quartz/Image.h"
+#include "cru/platform/graphics/quartz/Image.h"
 #include "cru/common/Exception.h"
-#include "cru/osx/graphics/quartz/Convert.h"
-#include "cru/osx/graphics/quartz/Painter.h"
+#include "cru/platform/graphics/quartz/Convert.h"
+#include "cru/platform/graphics/quartz/Painter.h"
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 QuartzImage::QuartzImage(IGraphicsFactory* graphics_factory,
                          IImageFactory* image_factory, CGImageRef image,
                          bool auto_release, unsigned char* buffer)
@@ -55,4 +55,4 @@ std::unique_ptr<IPainter> QuartzImage::CreatePainter() {
 
       });
 }
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/src/osx/graphics/quartz/ImageFactory.cpp b/src/platform/graphics/quartz/ImageFactory.cpp
index 5ff262c3..a48b4b86 100644
--- a/src/osx/graphics/quartz/ImageFactory.cpp
+++ b/src/platform/graphics/quartz/ImageFactory.cpp
@@ -1,14 +1,14 @@
-#include "cru/osx/graphics/quartz/ImageFactory.h"
+#include "cru/platform/graphics/quartz/ImageFactory.h"
 #include "cru/common/Exception.h"
 #include "cru/common/platform/osx/Convert.h"
-#include "cru/osx/graphics/quartz/Convert.h"
-#include "cru/osx/graphics/quartz/Image.h"
+#include "cru/platform/graphics/quartz/Convert.h"
+#include "cru/platform/graphics/quartz/Image.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/graphics/Image.h"
 
 #include <ImageIO/ImageIO.h>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 using cru::platform::osx::Convert;
 
 QuartzImageFactory::QuartzImageFactory(IGraphicsFactory* graphics_factory)
@@ -106,4 +106,4 @@ std::unique_ptr<IImage> QuartzImageFactory::CreateBitmap(int width,
   return std::unique_ptr<IImage>(
       new QuartzImage(GetGraphicsFactory(), this, cg_image, true, buffer));
 }
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/src/osx/graphics/quartz/Painter.cpp b/src/platform/graphics/quartz/Painter.cpp
index a8c3715a..69e187c3 100644
--- a/src/osx/graphics/quartz/Painter.cpp
+++ b/src/platform/graphics/quartz/Painter.cpp
@@ -1,15 +1,15 @@
-#include "cru/osx/graphics/quartz/Painter.h"
+#include "cru/platform/graphics/quartz/Painter.h"
 
-#include "cru/osx/graphics/quartz/Brush.h"
-#include "cru/osx/graphics/quartz/Convert.h"
-#include "cru/osx/graphics/quartz/Geometry.h"
-#include "cru/osx/graphics/quartz/Image.h"
-#include "cru/osx/graphics/quartz/TextLayout.h"
+#include "cru/platform/graphics/quartz/Brush.h"
+#include "cru/platform/graphics/quartz/Convert.h"
+#include "cru/platform/graphics/quartz/Geometry.h"
+#include "cru/platform/graphics/quartz/Image.h"
+#include "cru/platform/graphics/quartz/TextLayout.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/Color.h"
 #include "cru/platform/Exception.h"
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 QuartzCGContextPainter::QuartzCGContextPainter(
     IGraphicsFactory* graphics_factory, CGContextRef cg_context,
     bool auto_release, const Size& size,
@@ -227,4 +227,4 @@ void QuartzCGContextPainter::Validate() {
   if (cg_context_ == nullptr)
     throw ReuseException(u"QuartzCGContextPainter has already be released.");
 }
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/src/platform/graphics/quartz/Resource.cpp b/src/platform/graphics/quartz/Resource.cpp
new file mode 100644
index 00000000..a5d43747
--- /dev/null
+++ b/src/platform/graphics/quartz/Resource.cpp
@@ -0,0 +1 @@
+#include "cru/platform/graphics/quartz/Resource.h"
diff --git a/src/osx/graphics/quartz/TextLayout.cpp b/src/platform/graphics/quartz/TextLayout.cpp
index 6013efba..24fd71ef 100644
--- a/src/osx/graphics/quartz/TextLayout.cpp
+++ b/src/platform/graphics/quartz/TextLayout.cpp
@@ -1,17 +1,17 @@
-#include "cru/osx/graphics/quartz/TextLayout.h"
+#include "cru/platform/graphics/quartz/TextLayout.h"
 #include "cru/common/Base.h"
 #include "cru/common/Format.h"
 #include "cru/common/StringUtil.h"
-#include "cru/osx/Convert.h"
-#include "cru/osx/graphics/quartz/Convert.h"
-#include "cru/osx/graphics/quartz/Resource.h"
+#include "cru/platform/osx/Convert.h"
+#include "cru/platform/graphics/quartz/Convert.h"
+#include "cru/platform/graphics/quartz/Resource.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/graphics/Base.h"
 
 #include <algorithm>
 #include <limits>
 
-namespace cru::platform::graphics::osx::quartz {
+namespace cru::platform::graphics::quartz {
 using cru::platform::osx::Convert;
 
 OsxCTTextLayout::OsxCTTextLayout(IGraphicsFactory* graphics_factory,
@@ -453,4 +453,4 @@ CGRect OsxCTTextLayout::DoTextSinglePoint(Index position, bool trailing) {
 
   UnreachableCode();
 }
-}  // namespace cru::platform::graphics::osx::quartz
+}  // namespace cru::platform::graphics::quartz
diff --git a/src/osx/gui/CMakeLists.txt b/src/platform/gui/osx/CMakeLists.txt
index 5442ad15..5442ad15 100644
--- a/src/osx/gui/CMakeLists.txt
+++ b/src/platform/gui/osx/CMakeLists.txt
diff --git a/src/osx/gui/Clipboard.mm b/src/platform/gui/osx/Clipboard.mm
index 6e3fb076..068771c8 100644
--- a/src/osx/gui/Clipboard.mm
+++ b/src/platform/gui/osx/Clipboard.mm
@@ -1,8 +1,8 @@
-#include "cru/osx/gui/Clipboard.h"
+#include "cru/platform/gui/osx/Clipboard.h"
 #include "ClipboardPrivate.h"
 
 #include "cru/common/log/Logger.h"
-#include "cru/osx/Convert.h"
+#include "cru/platform/osx/Convert.h"
 
 #include <memory>
 
diff --git a/src/osx/gui/ClipboardPrivate.h b/src/platform/gui/osx/ClipboardPrivate.h
index 63145a64..e00c59dc 100644
--- a/src/osx/gui/ClipboardPrivate.h
+++ b/src/platform/gui/osx/ClipboardPrivate.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "cru/common/Base.h"
-#include "cru/osx/gui/Clipboard.h"
+#include "cru/platform/gui/osx/Clipboard.h"
 
 #include <AppKit/AppKit.h>
 
diff --git a/src/osx/gui/Cursor.mm b/src/platform/gui/osx/Cursor.mm
index 13bdc858..fae1514c 100644
--- a/src/osx/gui/Cursor.mm
+++ b/src/platform/gui/osx/Cursor.mm
@@ -1,8 +1,8 @@
-#include "cru/osx/gui/Cursor.h"
+#include "cru/platform/gui/osx/Cursor.h"
 #include "CursorPrivate.h"
 
-#include "cru/osx/Exception.h"
-#include "cru/osx/gui/Resource.h"
+#include "cru/platform/osx/Exception.h"
+#include "cru/platform/gui/osx/Resource.h"
 #include "cru/platform/gui/Cursor.h"
 #include "cru/platform/gui/UiApplication.h"
 
diff --git a/src/osx/gui/CursorPrivate.h b/src/platform/gui/osx/CursorPrivate.h
index c840e286..2dcfed8f 100644
--- a/src/osx/gui/CursorPrivate.h
+++ b/src/platform/gui/osx/CursorPrivate.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/osx/gui/Cursor.h"
+#include "cru/platform/gui/osx/Cursor.h"
 
 #import <AppKit/NSCursor.h>
 
diff --git a/src/osx/gui/InputMethod.mm b/src/platform/gui/osx/InputMethod.mm
index 2c19c358..50ff80de 100644
--- a/src/osx/gui/InputMethod.mm
+++ b/src/platform/gui/osx/InputMethod.mm
@@ -1,11 +1,11 @@
-#include "cru/osx/gui/InputMethod.h"
+#include "cru/platform/gui/osx/InputMethod.h"
 
 #import <AppKit/AppKit.h>
 #include "InputMethodPrivate.h"
 #include "WindowPrivate.h"
 #include "cru/common/log/Logger.h"
-#include "cru/osx/Convert.h"
-#include "cru/osx/gui/Window.h"
+#include "cru/platform/osx/Convert.h"
+#include "cru/platform/gui/osx/Window.h"
 
 namespace cru::platform::gui::osx {
 namespace details {
diff --git a/src/osx/gui/InputMethodPrivate.h b/src/platform/gui/osx/InputMethodPrivate.h
index 1df21b37..ac2d1bf4 100644
--- a/src/osx/gui/InputMethodPrivate.h
+++ b/src/platform/gui/osx/InputMethodPrivate.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/osx/gui/InputMethod.h"
+#include "cru/platform/gui/osx/InputMethod.h"
 
 #include <AppKit/AppKit.h>
 
diff --git a/src/osx/gui/Keyboard.mm b/src/platform/gui/osx/Keyboard.mm
index 3e78eecb..d4489c96 100644
--- a/src/osx/gui/Keyboard.mm
+++ b/src/platform/gui/osx/Keyboard.mm
@@ -1,4 +1,4 @@
-#include "cru/osx/gui/Keyboard.h"
+#include "cru/platform/gui/osx/Keyboard.h"
 
 #import <AppKit/NSText.h>
 #import <Carbon/Carbon.h>
diff --git a/src/osx/gui/KeyboardPrivate.h b/src/platform/gui/osx/KeyboardPrivate.h
index b98ea5d4..4bf53cc4 100644
--- a/src/osx/gui/KeyboardPrivate.h
+++ b/src/platform/gui/osx/KeyboardPrivate.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/osx/gui/Keyboard.h"
+#include "cru/platform/gui/osx/Keyboard.h"
 
 #import <AppKit/NSEvent.h>
 
diff --git a/src/osx/gui/Menu.mm b/src/platform/gui/osx/Menu.mm
index 5d0fd4d5..568a5208 100644
--- a/src/osx/gui/Menu.mm
+++ b/src/platform/gui/osx/Menu.mm
@@ -1,4 +1,4 @@
-#include "cru/osx/gui/Menu.h"
+#include "cru/platform/gui/osx/Menu.h"
 #import "MenuPrivate.h"
 
 #include "KeyboardPrivate.h"
diff --git a/src/osx/gui/MenuPrivate.h b/src/platform/gui/osx/MenuPrivate.h
index d5269312..cda8216b 100644
--- a/src/osx/gui/MenuPrivate.h
+++ b/src/platform/gui/osx/MenuPrivate.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "cru/osx/gui/Menu.h"
+#include "cru/platform/gui/osx/Menu.h"
 
 #import <AppKit/NSMenu.h>
 #import <AppKit/NSMenuItem.h>
diff --git a/src/osx/gui/Resource.cpp b/src/platform/gui/osx/Resource.cpp
index a6be5d75..d33133c7 100644
--- a/src/osx/gui/Resource.cpp
+++ b/src/platform/gui/osx/Resource.cpp
@@ -1,4 +1,4 @@
-#include "cru/osx/gui/Resource.h"
+#include "cru/platform/gui/osx/Resource.h"
 
 namespace cru::platform::gui::osx {
 OsxGuiResource::OsxGuiResource(IUiApplication* ui_application)
diff --git a/src/osx/gui/UiApplication.mm b/src/platform/gui/osx/UiApplication.mm
index 43c49c5c..ef62af58 100644
--- a/src/osx/gui/UiApplication.mm
+++ b/src/platform/gui/osx/UiApplication.mm
@@ -1,13 +1,13 @@
-#include "cru/osx/gui/UiApplication.h"
+#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/osx/graphics/quartz/Factory.h"
-#include "cru/osx/gui/Clipboard.h"
-#include "cru/osx/gui/Cursor.h"
-#include "cru/osx/gui/Menu.h"
-#include "cru/osx/gui/Window.h"
+#include "cru/platform/graphics/quartz/Factory.h"
+#include "cru/platform/gui/osx/Clipboard.h"
+#include "cru/platform/gui/osx/Cursor.h"
+#include "cru/platform/gui/osx/Menu.h"
+#include "cru/platform/gui/osx/Window.h"
 #include "cru/platform/graphics/Factory.h"
 #include "cru/platform/gui/Base.h"
 #include "cru/platform/gui/UiApplication.h"
@@ -66,7 +66,7 @@ class OsxUiApplicationPrivate {
 
   std::unique_ptr<OsxClipboard> clipboard_;
 
-  std::unique_ptr<platform::graphics::osx::quartz::QuartzGraphicsFactory> quartz_graphics_factory_;
+  std::unique_ptr<platform::graphics::quartz::QuartzGraphicsFactory> quartz_graphics_factory_;
 };
 
 void OsxUiApplicationPrivate::CallQuitHandlers() {
@@ -81,7 +81,7 @@ OsxUiApplication::OsxUiApplication()
   [NSApplication sharedApplication];
 
   [NSApp setDelegate:p_->app_delegate_];
-  p_->quartz_graphics_factory_ = std::make_unique<graphics::osx::quartz::QuartzGraphicsFactory>();
+  p_->quartz_graphics_factory_ = std::make_unique<graphics::quartz::QuartzGraphicsFactory>();
   p_->cursor_manager_ = std::make_unique<OsxCursorManager>(this);
   p_->clipboard_ = std::make_unique<OsxClipboard>(
       this, std::make_unique<details::OsxClipboardPrivate>([NSPasteboard generalPasteboard]));
diff --git a/src/osx/gui/Window.mm b/src/platform/gui/osx/Window.mm
index 8d15ef37..2c55d2dd 100644
--- a/src/osx/gui/Window.mm
+++ b/src/platform/gui/osx/Window.mm
@@ -1,18 +1,18 @@
-#include "cru/osx/gui/Window.h"
+#include "cru/platform/gui/osx/Window.h"
 #include "WindowPrivate.h"
 
 #include "CursorPrivate.h"
 #include "InputMethodPrivate.h"
 #include "cru/common/Range.h"
 #include "cru/common/log/Logger.h"
-#include "cru/osx/Convert.h"
-#include "cru/osx/graphics/quartz/Convert.h"
-#include "cru/osx/graphics/quartz/Painter.h"
-#include "cru/osx/gui/Cursor.h"
-#include "cru/osx/gui/InputMethod.h"
-#include "cru/osx/gui/Keyboard.h"
-#include "cru/osx/gui/Resource.h"
-#include "cru/osx/gui/UiApplication.h"
+#include "cru/platform/osx/Convert.h"
+#include "cru/platform/graphics/quartz/Convert.h"
+#include "cru/platform/graphics/quartz/Painter.h"
+#include "cru/platform/gui/osx/Cursor.h"
+#include "cru/platform/gui/osx/InputMethod.h"
+#include "cru/platform/gui/osx/Keyboard.h"
+#include "cru/platform/gui/osx/Resource.h"
+#include "cru/platform/gui/osx/UiApplication.h"
 #include "cru/platform/Check.h"
 #include "cru/platform/graphics/NullPainter.h"
 #include "cru/platform/gui/TimerHelper.h"
@@ -29,7 +29,7 @@ constexpr int key_down_debug = 0;
 }
 
 using cru::platform::osx::Convert;
-using cru::platform::graphics::osx::quartz::Convert;
+using cru::platform::graphics::quartz::Convert;
 
 namespace cru::platform::gui::osx {
 namespace {
@@ -210,7 +210,7 @@ Rect OsxWindowPrivate::RetrieveContentRect() {
   NSRect rect = [NSWindow contentRectForFrameRect:[window_ frame]
                                         styleMask:CalcWindowStyleMask(style_flag_)];
   rect.origin.y = GetScreenSize().height - rect.origin.y - rect.size.height;
-  return cru::platform::graphics::osx::quartz::Convert(rect);
+  return cru::platform::graphics::quartz::Convert(rect);
 }
 
 }
@@ -348,9 +348,9 @@ std::unique_ptr<graphics::IPainter> OsxWindow::BeginPaint() {
 
   CGContextRef cg_context = CGLayerGetContext(p_->draw_layer_);
 
-  return std::make_unique<cru::platform::graphics::osx::quartz::QuartzCGContextPainter>(
+  return std::make_unique<cru::platform::graphics::quartz::QuartzCGContextPainter>(
       GetUiApplication()->GetGraphicsFactory(), cg_context, false, GetClientSize(),
-      [this](graphics::osx::quartz::QuartzCGContextPainter*) {
+      [this](graphics::quartz::QuartzCGContextPainter*) {
         [[p_->window_ contentView] setNeedsDisplay:YES];
       });
 }
@@ -454,7 +454,7 @@ cru::platform::gui::KeyModifier GetKeyModifier(NSEvent* event) {
      input_context_p:
          (cru::platform::gui::osx::details::OsxInputMethodContextPrivate*)input_context_p
                frame:(cru::platform::Rect)frame {
-  [super initWithFrame:cru::platform::graphics::osx::quartz::Convert(frame)];
+  [super initWithFrame:cru::platform::graphics::quartz::Convert(frame)];
   _p = p;
   _input_context_p = input_context_p;
 
diff --git a/src/osx/gui/WindowPrivate.h b/src/platform/gui/osx/WindowPrivate.h
index cdd34246..49cc0154 100644
--- a/src/osx/gui/WindowPrivate.h
+++ b/src/platform/gui/osx/WindowPrivate.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "cru/osx/gui/Window.h"
+#include "cru/platform/gui/osx/Window.h"
 
 #include "cru/common/Event.h"
-#include "cru/osx/gui/Cursor.h"
+#include "cru/platform/gui/osx/Cursor.h"
 #include "cru/platform/gui/TimerHelper.h"
 #include "cru/platform/gui/Window.h"
 
diff --git a/src/osx/CMakeLists.txt b/src/platform/osx/CMakeLists.txt
index 0a8bb7af..9768a75c 100644
--- a/src/osx/CMakeLists.txt
+++ b/src/platform/osx/CMakeLists.txt
@@ -6,6 +6,3 @@ find_library(FOUNDATION Foundation REQUIRED)
 find_library(CORE_FOUNDATION CoreFoundation REQUIRED)
 
 target_link_libraries(CruPlatformBaseOsx PUBLIC CruPlatformBase ${FOUNDATION} ${CORE_FOUNDATION})
-
-add_subdirectory(graphics)
-add_subdirectory(gui)
diff --git a/src/platform/osx/Resource.cpp b/src/platform/osx/Resource.cpp
new file mode 100644
index 00000000..0b098d6f
--- /dev/null
+++ b/src/platform/osx/Resource.cpp
@@ -0,0 +1 @@
+#include "cru/platform/osx/Resource.h"