...

24 files changed, 92 insertions, 92 deletions

diff --git a/include/cru/win/graph/direct/Brush.hpp b/include/cru/win/graphics/direct/Brush.hpp
index df1debe3..fbff83b5 100644
--- a/include/cru/win/graph/direct/Brush.hpp
+++ b/include/cru/win/graphics/direct/Brush.hpp
@@ -2,9 +2,9 @@
 #include "ComResource.hpp"
 #include "Resource.hpp"
 
-#include "cru/platform/graph/Brush.hpp"
+#include "cru/platform/graphics/Brush.hpp"
 
-namespace cru::platform::graph::win::direct {
+namespace cru::platform::graphics::win::direct {
 struct ID2DBrush : virtual IBrush {
   virtual ID2D1Brush* GetD2DBrushInterface() const = 0;
 };
@@ -36,4 +36,4 @@ class D2DSolidColorBrush : public DirectGraphResource,
 
   Microsoft::WRL::ComPtr<ID2D1SolidColorBrush> brush_;
 };
-}  // namespace cru::platform::graph::win::direct
+}  // namespace cru::platform::graphics::win::direct
diff --git a/include/cru/win/graph/direct/ComResource.hpp b/include/cru/win/graphics/direct/ComResource.hpp
index 2ac332cd..34ea39ed 100644
--- a/include/cru/win/graph/direct/ComResource.hpp
+++ b/include/cru/win/graphics/direct/ComResource.hpp
@@ -3,9 +3,9 @@
 
 #include "cru/common/Base.hpp"
 
-namespace cru::platform::graph::win::direct {
+namespace cru::platform::graphics::win::direct {
 template <typename TInterface>
 struct IComResource : virtual Interface {
   virtual TInterface* GetComInterface() const = 0;
 };
-}  // namespace cru::platform::graph::win::direct
+}  // namespace cru::platform::graphics::win::direct
diff --git a/include/cru/win/graph/direct/ConvertUtil.hpp b/include/cru/win/graphics/direct/ConvertUtil.hpp
index 12a04c7b..0d8da8a1 100644
--- a/include/cru/win/graph/direct/ConvertUtil.hpp
+++ b/include/cru/win/graphics/direct/ConvertUtil.hpp
@@ -1,9 +1,9 @@
 #pragma once
 #include "../../WinPreConfig.hpp"
 
-#include "cru/platform/graph/Base.hpp"
+#include "cru/platform/graphics/Base.hpp"
 
-namespace cru::platform::graph::win::direct {
+namespace cru::platform::graphics::win::direct {
 inline D2D1_MATRIX_3X2_F Convert(const platform::Matrix& matrix) {
   D2D1_MATRIX_3X2_F m;
   m._11 = matrix.m11;
@@ -104,4 +104,4 @@ inline bool operator==(const D2D1_ELLIPSE& left, const D2D1_ELLIPSE& right) {
 inline bool operator!=(const D2D1_ELLIPSE& left, const D2D1_ELLIPSE& right) {
   return !(left == right);
 }
-}  // namespace cru::platform::graph::win::direct
+}  // namespace cru::platform::graphics::win::direct
diff --git a/include/cru/win/graph/direct/Exception.hpp b/include/cru/win/graphics/direct/Exception.hpp
index 8b62e8fa..72493f2f 100644
--- a/include/cru/win/graph/direct/Exception.hpp
+++ b/include/cru/win/graphics/direct/Exception.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "../../Exception.hpp"
 
-namespace cru::platform::graph::win::direct {
+namespace cru::platform::graphics::win::direct {
 using platform::win::HResultError;
 using platform::win::ThrowIfFailed;
-}  // namespace cru::platform::graph::win::direct
\ No newline at end of file
+}  // namespace cru::platform::graphics::win::direct
diff --git a/include/cru/win/graph/direct/Factory.hpp b/include/cru/win/graphics/direct/Factory.hpp
index e70454f5..70f3ede1 100644
--- a/include/cru/win/graph/direct/Factory.hpp
+++ b/include/cru/win/graphics/direct/Factory.hpp
@@ -1,9 +1,9 @@
 #pragma once
 #include "Resource.hpp"
 
-#include "cru/platform/graph/Factory.hpp"
+#include "cru/platform/graphics/Factory.hpp"
 
-namespace cru::platform::graph::win::direct {
+namespace cru::platform::graphics::win::direct {
 class DirectGraphFactory : public DirectResource, public virtual IGraphFactory {
  public:
   DirectGraphFactory();
@@ -55,4 +55,4 @@ class DirectGraphFactory : public DirectResource, public virtual IGraphFactory {
   Microsoft::WRL::ComPtr<IDWriteFactory> dwrite_factory_;
   Microsoft::WRL::ComPtr<IDWriteFontCollection> dwrite_system_font_collection_;
 };
-}  // namespace cru::platform::graph::win::direct
+}  // namespace cru::platform::graphics::win::direct
diff --git a/include/cru/win/graph/direct/Font.hpp b/include/cru/win/graphics/direct/Font.hpp
index 2195f3e4..fd3921a3 100644
--- a/include/cru/win/graph/direct/Font.hpp
+++ b/include/cru/win/graphics/direct/Font.hpp
@@ -2,11 +2,11 @@
 #include "ComResource.hpp"
 #include "Resource.hpp"
 
-#include "cru/platform/graph/Font.hpp"
+#include "cru/platform/graphics/Font.hpp"
 
 #include <string_view>
 
-namespace cru::platform::graph::win::direct {
+namespace cru::platform::graphics::win::direct {
 class DWriteFont : public DirectGraphResource,
                    public virtual IFont,
                    public virtual IComResource<IDWriteTextFormat> {
@@ -30,4 +30,4 @@ class DWriteFont : public DirectGraphResource,
   std::u16string font_family_;
   Microsoft::WRL::ComPtr<IDWriteTextFormat> text_format_;
 };
-}  // namespace cru::platform::graph::win::direct
+}  // namespace cru::platform::graphics::win::direct
diff --git a/include/cru/win/graph/direct/Geometry.hpp b/include/cru/win/graphics/direct/Geometry.hpp
index 87987d3e..edfec590 100644
--- a/include/cru/win/graph/direct/Geometry.hpp
+++ b/include/cru/win/graphics/direct/Geometry.hpp
@@ -2,9 +2,9 @@
 #include "ComResource.hpp"
 #include "Resource.hpp"
 
-#include "cru/platform/graph/Geometry.hpp"
+#include "cru/platform/graphics/Geometry.hpp"
 
-namespace cru::platform::graph::win::direct {
+namespace cru::platform::graphics::win::direct {
 class D2DGeometryBuilder : public DirectGraphResource,
                            public virtual IGeometryBuilder {
  public:
@@ -54,4 +54,4 @@ class D2DGeometry : public DirectGraphResource,
  private:
   Microsoft::WRL::ComPtr<ID2D1PathGeometry> geometry_;
 };
-}  // namespace cru::platform::graph::win::direct
+}  // namespace cru::platform::graphics::win::direct
diff --git a/include/cru/win/graph/direct/Painter.hpp b/include/cru/win/graphics/direct/Painter.hpp
index a50f962d..93c768e7 100644
--- a/include/cru/win/graph/direct/Painter.hpp
+++ b/include/cru/win/graphics/direct/Painter.hpp
@@ -2,11 +2,11 @@
 #include "ComResource.hpp"
 #include "Resource.hpp"
 
-#include "cru/platform/graph/Painter.hpp"
+#include "cru/platform/graphics/Painter.hpp"
 
 #include <vector>
 
-namespace cru::platform::graph::win::direct {
+namespace cru::platform::graphics::win::direct {
 class D2DPainter : public DirectResource,
                    public virtual IPainter,
                    public virtual IComResource<ID2D1RenderTarget> {
@@ -57,4 +57,4 @@ class D2DPainter : public DirectResource,
 
   bool is_drawing_ = true;
 };
-}  // namespace cru::platform::graph::win::direct
+}  // namespace cru::platform::graphics::win::direct
diff --git a/include/cru/win/graph/direct/Resource.hpp b/include/cru/win/graphics/direct/Resource.hpp
index 6162ebd8..f60f373e 100644
--- a/include/cru/win/graph/direct/Resource.hpp
+++ b/include/cru/win/graphics/direct/Resource.hpp
@@ -1,11 +1,11 @@
 #pragma once
 #include "../../WinPreConfig.hpp"
 
-#include "cru/platform/graph/Resource.hpp"
+#include "cru/platform/graphics/Resource.hpp"
 
 #include <string_view>
 
-namespace cru::platform::graph::win::direct {
+namespace cru::platform::graphics::win::direct {
 class DirectGraphFactory;
 
 class DirectResource : public Object, public virtual INativeResource {
@@ -46,4 +46,4 @@ class DirectGraphResource : public DirectResource,
  private:
   DirectGraphFactory* factory_;
 };
-}  // namespace cru::platform::graph::win::direct
+}  // namespace cru::platform::graphics::win::direct
diff --git a/include/cru/win/graph/direct/TextLayout.hpp b/include/cru/win/graphics/direct/TextLayout.hpp
index 016009ab..3320431f 100644
--- a/include/cru/win/graph/direct/TextLayout.hpp
+++ b/include/cru/win/graphics/direct/TextLayout.hpp
@@ -2,12 +2,12 @@
 #include "ComResource.hpp"
 #include "Resource.hpp"
 
-#include "cru/platform/graph/TextLayout.hpp"
+#include "cru/platform/graphics/TextLayout.hpp"
 
 #include <limits>
 #include <memory>
 
-namespace cru::platform::graph::win::direct {
+namespace cru::platform::graphics::win::direct {
 class DWriteFont;
 
 class DWriteTextLayout : public DirectGraphResource,
@@ -52,4 +52,4 @@ class DWriteTextLayout : public DirectGraphResource,
   float max_height_ = std::numeric_limits<float>::max();
   Microsoft::WRL::ComPtr<IDWriteTextLayout> text_layout_;
 };
-}  // namespace cru::platform::graph::win::direct
+}  // namespace cru::platform::graphics::win::direct
diff --git a/include/cru/win/graph/direct/WindowPainter.hpp b/include/cru/win/graphics/direct/WindowPainter.hpp
index 53961586..b5faf7b5 100644
--- a/include/cru/win/graph/direct/WindowPainter.hpp
+++ b/include/cru/win/graphics/direct/WindowPainter.hpp
@@ -2,8 +2,8 @@
 #include "Painter.hpp"
 #include "WindowRenderTarget.hpp"
 
-namespace cru::platform::graph::win::direct {
-class D2DWindowPainter : public graph::win::direct::D2DPainter {
+namespace cru::platform::graphics::win::direct {
+class D2DWindowPainter : public graphics::win::direct::D2DPainter {
  public:
   explicit D2DWindowPainter(D2DWindowRenderTarget* window);
 
@@ -18,4 +18,4 @@ class D2DWindowPainter : public graph::win::direct::D2DPainter {
  private:
   D2DWindowRenderTarget* render_target_;
 };
-}  // namespace cru::platform::graph::win::direct
+}  // namespace cru::platform::graphics::win::direct
diff --git a/include/cru/win/graph/direct/WindowRenderTarget.hpp b/include/cru/win/graphics/direct/WindowRenderTarget.hpp
index c9ee098f..75b1bf20 100644
--- a/include/cru/win/graph/direct/WindowRenderTarget.hpp
+++ b/include/cru/win/graphics/direct/WindowRenderTarget.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "Factory.hpp"
 
-namespace cru::platform::graph::win::direct {
+namespace cru::platform::graphics::win::direct {
 // Represents a window render target.
 class D2DWindowRenderTarget : public Object {
  public:
@@ -13,7 +13,7 @@ class D2DWindowRenderTarget : public Object {
   ~D2DWindowRenderTarget() override = default;
 
  public:
-  graph::win::direct::DirectGraphFactory* GetDirectFactory() const {
+  graphics::win::direct::DirectGraphFactory* GetDirectFactory() const {
     return factory_;
   }
 
@@ -39,4 +39,4 @@ class D2DWindowRenderTarget : public Object {
   Microsoft::WRL::ComPtr<IDXGISwapChain1> dxgi_swap_chain_;
   Microsoft::WRL::ComPtr<ID2D1Bitmap1> target_bitmap_;
 };
-}  // namespace cru::platform::graph::win::direct
+}  // namespace cru::platform::graphics::win::direct
diff --git a/include/cru/win/native/Base.hpp b/include/cru/win/gui/Base.hpp
index 881dd8b1..00782663 100644
--- a/include/cru/win/native/Base.hpp
+++ b/include/cru/win/gui/Base.hpp
@@ -3,7 +3,7 @@
 
 #include "cru/common/Base.hpp"
 
-namespace cru::platform::native::win {
+namespace cru::platform::gui::win {
 class GodWindow;
 class TimerManager;
 class WinCursor;
@@ -13,4 +13,4 @@ class WindowManager;
 class WinNativeWindow;
 class WinUiApplication;
 class WinInputMethodContext;
-}  // namespace cru::platform::native::win
+}  // namespace cru::platform::gui::win
diff --git a/include/cru/win/native/Cursor.hpp b/include/cru/win/gui/Cursor.hpp
index 373b9170..cd13ded7 100644
--- a/include/cru/win/native/Cursor.hpp
+++ b/include/cru/win/gui/Cursor.hpp
@@ -1,13 +1,13 @@
 #pragma once
 #include "Resource.hpp"
 
-#include "cru/platform/native/Cursor.hpp"
+#include "cru/platform/gui/Cursor.hpp"
 
 #include <memory>
 
-namespace cru::platform::native::win {
+namespace cru::platform::gui::win {
 class WinCursor : public WinNativeResource, public virtual ICursor {
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::native::win::WinCursor")
+  CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::gui::win::WinCursor")
 
  public:
   WinCursor(HCURSOR handle, bool auto_destroy);
@@ -46,4 +46,4 @@ class WinCursorManager : public WinNativeResource,
   std::shared_ptr<WinCursor> sys_arrow_;
   std::shared_ptr<WinCursor> sys_hand_;
 };
-}  // namespace cru::platform::native::win
+}  // namespace cru::platform::gui::win
diff --git a/include/cru/win/native/Exception.hpp b/include/cru/win/gui/Exception.hpp
index 6a5265c1..895e6c14 100644
--- a/include/cru/win/native/Exception.hpp
+++ b/include/cru/win/gui/Exception.hpp
@@ -1,7 +1,7 @@
 #pragma once
 #include "../Exception.hpp"
 
-namespace cru::platform::native::win {
+namespace cru::platform::gui::win {
 using platform::win::Win32Error;
 using platform::win::HResultError;
-}  // namespace cru::platform::native::win
+}  // namespace cru::platform::gui::win
diff --git a/include/cru/win/native/GodWindow.hpp b/include/cru/win/gui/GodWindow.hpp
index 93d1acad..0343b159 100644
--- a/include/cru/win/native/GodWindow.hpp
+++ b/include/cru/win/gui/GodWindow.hpp
@@ -6,9 +6,9 @@
 
 #include <memory>
 
-namespace cru::platform::native::win {
+namespace cru::platform::gui::win {
 class GodWindow : public Object {
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::native::win::GodWindow")
+  CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::gui::win::GodWindow")
 
  public:
   explicit GodWindow(WinUiApplication* application);
@@ -35,4 +35,4 @@ class GodWindow : public Object {
 
   Event<WindowNativeMessageEventArgs&> message_event_;
 };
-}  // namespace cru::platform::native::win
+}  // namespace cru::platform::gui::win
diff --git a/include/cru/win/native/InputMethod.hpp b/include/cru/win/gui/InputMethod.hpp
index f3dc15c0..51a007d8 100644
--- a/include/cru/win/native/InputMethod.hpp
+++ b/include/cru/win/gui/InputMethod.hpp
@@ -6,13 +6,13 @@
 #include "Resource.hpp"
 
 #include "WindowNativeMessageEventArgs.hpp"
-#include "cru/platform/native/InputMethod.hpp"
+#include "cru/platform/gui/InputMethod.hpp"
 
 #include <imm.h>
 
-namespace cru::platform::native::win {
+namespace cru::platform::gui::win {
 class AutoHIMC : public Object {
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::native::win::AutoHIMC")
+  CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::gui::win::AutoHIMC")
 
  public:
   explicit AutoHIMC(HWND hwnd);
@@ -35,7 +35,7 @@ class AutoHIMC : public Object {
 
 class WinInputMethodContext : public WinNativeResource,
                               public virtual IInputMethodContext {
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::native::win::WinInputMethodContext")
+  CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::gui::win::WinInputMethodContext")
 
  public:
   WinInputMethodContext(gsl::not_null<WinNativeWindow*> window);
@@ -84,4 +84,4 @@ class WinInputMethodContext : public WinNativeResource,
   Event<std::nullptr_t> composition_event_;
   Event<std::u16string_view> text_event_;
 };
-}  // namespace cru::platform::native::win
+}  // namespace cru::platform::gui::win
diff --git a/include/cru/win/gui/Keyboard.hpp b/include/cru/win/gui/Keyboard.hpp
new file mode 100644
index 00000000..5b98833c
--- /dev/null
+++ b/include/cru/win/gui/Keyboard.hpp
@@ -0,0 +1,9 @@
+#pragma once
+#include "Base.hpp"
+
+#include "cru/platform/gui/Keyboard.hpp"
+
+namespace cru::platform::gui::win {
+KeyCode VirtualKeyToKeyCode(int virtual_key);
+KeyModifier RetrieveKeyMofifier();
+}  // namespace cru::platform::gui::win
diff --git a/include/cru/win/native/Resource.hpp b/include/cru/win/gui/Resource.hpp
index 0de0e1a8..1f6f0a4a 100644
--- a/include/cru/win/native/Resource.hpp
+++ b/include/cru/win/gui/Resource.hpp
@@ -3,7 +3,7 @@
 
 #include "cru/platform/Resource.hpp"
 
-namespace cru::platform::native::win {
+namespace cru::platform::gui::win {
 class WinNativeResource : public Object, public virtual INativeResource {
  public:
   static constexpr std::u16string_view k_platform_id = u"Windows";
@@ -20,4 +20,4 @@ class WinNativeResource : public Object, public virtual INativeResource {
  public:
   std::u16string_view GetPlatformId() const final { return k_platform_id; }
 };
-}  // namespace cru::platform::native::win
+}  // namespace cru::platform::gui::win
diff --git a/include/cru/win/native/UiApplication.hpp b/include/cru/win/gui/UiApplication.hpp
index 170be532..0f733cd4 100644
--- a/include/cru/win/native/UiApplication.hpp
+++ b/include/cru/win/gui/UiApplication.hpp
@@ -1,16 +1,16 @@
 #pragma once
 #include "Resource.hpp"
 
-#include "cru/platform/native/Base.hpp"
-#include "cru/platform/native/UiApplication.hpp"
+#include "cru/platform/gui/Base.hpp"
+#include "cru/platform/gui/UiApplication.hpp"
 
 #include <memory>
 
-namespace cru::platform::graph::win::direct {
+namespace cru::platform::graphics::win::direct {
 class DirectGraphFactory;
 }
 
-namespace cru::platform::native::win {
+namespace cru::platform::gui::win {
 class WinUiApplication : public WinNativeResource,
                          public virtual IUiApplication {
  public:
@@ -43,9 +43,9 @@ class WinUiApplication : public WinNativeResource,
   std::vector<INativeWindow*> GetAllWindow() override;
   INativeWindow* CreateWindow(INativeWindow* parent) override;
 
-  cru::platform::graph::IGraphFactory* GetGraphFactory() override;
+  cru::platform::graphics::IGraphFactory* GetGraphFactory() override;
 
-  cru::platform::graph::win::direct::DirectGraphFactory* GetDirectFactory() {
+  cru::platform::graphics::win::direct::DirectGraphFactory* GetDirectFactory() {
     return graph_factory_.get();
   }
 
@@ -60,7 +60,7 @@ class WinUiApplication : public WinNativeResource,
  private:
   HINSTANCE instance_handle_;
 
-  std::unique_ptr<cru::platform::graph::win::direct::DirectGraphFactory>
+  std::unique_ptr<cru::platform::graphics::win::direct::DirectGraphFactory>
       graph_factory_;
 
   std::unique_ptr<GodWindow> god_window_;
@@ -71,4 +71,4 @@ class WinUiApplication : public WinNativeResource,
 
   std::vector<std::function<void()>> quit_handlers_;
 };
-}  // namespace cru::platform::native::win
+}  // namespace cru::platform::gui::win
diff --git a/include/cru/win/native/Window.hpp b/include/cru/win/gui/Window.hpp
index 6bf71601..3ba9ef68 100644
--- a/include/cru/win/native/Window.hpp
+++ b/include/cru/win/gui/Window.hpp
@@ -3,15 +3,15 @@
 
 #include "WindowNativeMessageEventArgs.hpp"
 #include "cru/platform/GraphBase.hpp"
-#include "cru/platform/native/Base.hpp"
-#include "cru/platform/native/Window.hpp"
-#include "cru/win/graph/direct/WindowRenderTarget.hpp"
+#include "cru/platform/gui/Base.hpp"
+#include "cru/platform/gui/Window.hpp"
+#include "cru/win/graphics/direct/WindowRenderTarget.hpp"
 
 #include <memory>
 
-namespace cru::platform::native::win {
+namespace cru::platform::gui::win {
 class WinNativeWindow : public WinNativeResource, public virtual INativeWindow {
-  CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::native::win::WinNativeWindow")
+  CRU_DEFINE_CLASS_LOG_TAG(u"cru::platform::gui::win::WinNativeWindow")
 
  public:
   WinNativeWindow(WinUiApplication* application, WindowClass* window_class,
@@ -47,7 +47,7 @@ class WinNativeWindow : public WinNativeResource, public virtual INativeWindow {
   bool ReleaseMouse() override;
 
   void RequestRepaint() override;
-  std::unique_ptr<graph::IPainter> BeginPaint() override;
+  std::unique_ptr<graphics::IPainter> BeginPaint() override;
 
   void SetCursor(std::shared_ptr<ICursor> cursor) override;
 
@@ -59,18 +59,18 @@ class WinNativeWindow : public WinNativeResource, public virtual INativeWindow {
     return &mouse_enter_leave_event_;
   }
   IEvent<Point>* MouseMoveEvent() override { return &mouse_move_event_; }
-  IEvent<platform::native::NativeMouseButtonEventArgs>* MouseDownEvent()
+  IEvent<platform::gui::NativeMouseButtonEventArgs>* MouseDownEvent()
       override {
     return &mouse_down_event_;
   }
-  IEvent<platform::native::NativeMouseButtonEventArgs>* MouseUpEvent()
+  IEvent<platform::gui::NativeMouseButtonEventArgs>* MouseUpEvent()
       override {
     return &mouse_up_event_;
   }
-  IEvent<platform::native::NativeKeyEventArgs>* KeyDownEvent() override {
+  IEvent<platform::gui::NativeKeyEventArgs>* KeyDownEvent() override {
     return &key_down_event_;
   }
-  IEvent<platform::native::NativeKeyEventArgs>* KeyUpEvent() override {
+  IEvent<platform::gui::NativeKeyEventArgs>* KeyUpEvent() override {
     return &key_up_event_;
   }
 
@@ -86,7 +86,7 @@ class WinNativeWindow : public WinNativeResource, public virtual INativeWindow {
   bool HandleNativeWindowMessage(HWND hwnd, UINT msg, WPARAM w_param,
                                  LPARAM l_param, LRESULT* result);
 
-  graph::win::direct::D2DWindowRenderTarget* GetWindowRenderTarget() const {
+  graphics::win::direct::D2DWindowRenderTarget* GetWindowRenderTarget() const {
     return window_render_target_.get();
   }
 
@@ -127,8 +127,8 @@ class WinNativeWindow : public WinNativeResource, public virtual INativeWindow {
 
   void OnMouseMoveInternal(POINT point);
   void OnMouseLeaveInternal();
-  void OnMouseDownInternal(platform::native::MouseButton button, POINT point);
-  void OnMouseUpInternal(platform::native::MouseButton button, POINT point);
+  void OnMouseDownInternal(platform::gui::MouseButton button, POINT point);
+  void OnMouseUpInternal(platform::gui::MouseButton button, POINT point);
 
   void OnMouseWheelInternal(short delta, POINT point);
   void OnKeyDownInternal(int virtual_code);
@@ -155,7 +155,7 @@ class WinNativeWindow : public WinNativeResource, public virtual INativeWindow {
   bool has_focus_ = false;
   bool is_mouse_in_ = false;
 
-  std::unique_ptr<graph::win::direct::D2DWindowRenderTarget>
+  std::unique_ptr<graphics::win::direct::D2DWindowRenderTarget>
       window_render_target_;
 
   std::shared_ptr<WinCursor> cursor_;
@@ -168,11 +168,11 @@ class WinNativeWindow : public WinNativeResource, public virtual INativeWindow {
   Event<FocusChangeType> focus_event_;
   Event<MouseEnterLeaveType> mouse_enter_leave_event_;
   Event<Point> mouse_move_event_;
-  Event<platform::native::NativeMouseButtonEventArgs> mouse_down_event_;
-  Event<platform::native::NativeMouseButtonEventArgs> mouse_up_event_;
-  Event<platform::native::NativeKeyEventArgs> key_down_event_;
-  Event<platform::native::NativeKeyEventArgs> key_up_event_;
+  Event<platform::gui::NativeMouseButtonEventArgs> mouse_down_event_;
+  Event<platform::gui::NativeMouseButtonEventArgs> mouse_up_event_;
+  Event<platform::gui::NativeKeyEventArgs> key_down_event_;
+  Event<platform::gui::NativeKeyEventArgs> key_up_event_;
 
   Event<WindowNativeMessageEventArgs&> native_message_event_;
 };
-}  // namespace cru::platform::native::win
+}  // namespace cru::platform::gui::win
diff --git a/include/cru/win/native/WindowClass.hpp b/include/cru/win/gui/WindowClass.hpp
index fdd55065..2c07b68f 100644
--- a/include/cru/win/native/WindowClass.hpp
+++ b/include/cru/win/gui/WindowClass.hpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-namespace cru::platform::native::win {
+namespace cru::platform::gui::win {
 class WindowClass : public Object {
  public:
   WindowClass(std::wstring name, WNDPROC window_proc, HINSTANCE h_instance);
@@ -21,4 +21,4 @@ class WindowClass : public Object {
   std::wstring name_;
   ATOM atom_;
 };
-}  // namespace cru::platform::native::win
+}  // namespace cru::platform::gui::win
diff --git a/include/cru/win/native/WindowNativeMessageEventArgs.hpp b/include/cru/win/gui/WindowNativeMessageEventArgs.hpp
index 84a7a123..834ba3c2 100644
--- a/include/cru/win/native/WindowNativeMessageEventArgs.hpp
+++ b/include/cru/win/gui/WindowNativeMessageEventArgs.hpp
@@ -3,7 +3,7 @@
 
 #include "cru/common/Base.hpp"
 
-namespace cru::platform::native::win {
+namespace cru::platform::gui::win {
 struct WindowNativeMessage {
   HWND hwnd;
   UINT msg;
@@ -37,4 +37,4 @@ class WindowNativeMessageEventArgs : public Object {
   LRESULT result_;
   bool handled_ = false;
 };
-}  // namespace cru::platform::native::win
+}  // namespace cru::platform::gui::win
diff --git a/include/cru/win/native/Keyboard.hpp b/include/cru/win/native/Keyboard.hpp
deleted file mode 100644
index 790e0015..00000000
--- a/include/cru/win/native/Keyboard.hpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-#include "Base.hpp"
-
-#include "cru/platform/native/Keyboard.hpp"
-
-namespace cru::platform::native::win {
-KeyCode VirtualKeyToKeyCode(int virtual_key);
-KeyModifier RetrieveKeyMofifier();
-}  // namespace cru::platform::native::win