diff --git a/dear-imgui.cabal b/dear-imgui.cabal
index 1d27a9f..3dc6396 100644
--- a/dear-imgui.cabal
+++ b/dear-imgui.cabal
@@ -159,8 +159,8 @@ library
     DearImGui.Raw.Font.GlyphRanges
     DearImGui.Raw.IO
     DearImGui.Raw.ListClipper
+    DearImGui.Raw.Context
   other-modules:
-    DearImGui.Context
     DearImGui.Enums
     DearImGui.Structs
   cxx-options: -std=c++11
diff --git a/src/DearImGui/Raw.hs b/src/DearImGui/Raw.hs
index aecd642..4aa0579 100644
--- a/src/DearImGui/Raw.hs
+++ b/src/DearImGui/Raw.hs
@@ -264,7 +264,7 @@ import System.IO.Unsafe
   ( unsafePerformIO )
 
 -- dear-imgui
-import DearImGui.Context
+import DearImGui.Raw.Context
   ( imguiContext )
 import DearImGui.Enums
 import DearImGui.Structs
diff --git a/src/DearImGui/Context.hs b/src/DearImGui/Raw/Context.hs
similarity index 97%
rename from src/DearImGui/Context.hs
rename to src/DearImGui/Raw/Context.hs
index bd32724..eb6c5cd 100644
--- a/src/DearImGui/Context.hs
+++ b/src/DearImGui/Raw/Context.hs
@@ -6,7 +6,7 @@
 {-# language PatternSynonyms #-}
 {-# language TemplateHaskell #-}
 
-module DearImGui.Context where
+module DearImGui.Raw.Context where
 
 -- containers
 import qualified Data.Map.Strict as Map
diff --git a/src/DearImGui/Raw/DrawList.hs b/src/DearImGui/Raw/DrawList.hs
index 5add9d1..589ea00 100644
--- a/src/DearImGui/Raw/DrawList.hs
+++ b/src/DearImGui/Raw/DrawList.hs
@@ -115,7 +115,7 @@ import Foreign hiding (new)
 import Foreign.C
 
 -- dear-imgui
-import DearImGui.Context
+import DearImGui.Raw.Context
   ( imguiContext )
 import DearImGui.Enums
 import DearImGui.Structs
diff --git a/src/DearImGui/Raw/Font.hs b/src/DearImGui/Raw/Font.hs
index e6cde97..6823296 100644
--- a/src/DearImGui/Raw/Font.hs
+++ b/src/DearImGui/Raw/Font.hs
@@ -41,7 +41,7 @@ import Foreign ( Ptr, castPtr )
 import Foreign.C
 
 -- dear-imgui
-import DearImGui.Context
+import DearImGui.Raw.Context
   ( imguiContext )
 import DearImGui.Structs
 import DearImGui.Raw.Font.Config
diff --git a/src/DearImGui/Raw/Font/Config.hs b/src/DearImGui/Raw/Font/Config.hs
index cefaa50..9fd3a6d 100644
--- a/src/DearImGui/Raw/Font/Config.hs
+++ b/src/DearImGui/Raw/Font/Config.hs
@@ -46,7 +46,7 @@ import Foreign ( Ptr )
 import Foreign.C
 
 -- dear-imgui
-import DearImGui.Context
+import DearImGui.Raw.Context
   ( imguiContext )
 import DearImGui.Structs
 import DearImGui.Raw.Font.GlyphRanges
diff --git a/src/DearImGui/Raw/Font/GlyphRanges.hs b/src/DearImGui/Raw/Font/GlyphRanges.hs
index 19c624f..e9a5c63 100644
--- a/src/DearImGui/Raw/Font/GlyphRanges.hs
+++ b/src/DearImGui/Raw/Font/GlyphRanges.hs
@@ -75,7 +75,7 @@ import Foreign.C
 import System.IO.Unsafe (unsafePerformIO)
 
 -- dear-imgui
-import DearImGui.Context
+import DearImGui.Raw.Context
   ( imguiContext )
 import DearImGui.Structs
 
diff --git a/src/DearImGui/Raw/IO.hs b/src/DearImGui/Raw/IO.hs
index deb2532..be826bc 100644
--- a/src/DearImGui/Raw/IO.hs
+++ b/src/DearImGui/Raw/IO.hs
@@ -39,7 +39,7 @@ import Foreign.C
   )
 
 -- dear-imgui
-import DearImGui.Context
+import DearImGui.Raw.Context
   ( imguiContext )
 -- import DearImGui.Enums
 -- import DearImGui.Structs
diff --git a/src/DearImGui/Raw/ListClipper.hs b/src/DearImGui/Raw/ListClipper.hs
index 7bbe1ff..f4c3bea 100644
--- a/src/DearImGui/Raw/ListClipper.hs
+++ b/src/DearImGui/Raw/ListClipper.hs
@@ -59,7 +59,7 @@ import Foreign.C
 import System.IO.Unsafe (unsafePerformIO)
 
 -- dear-imgui
-import DearImGui.Context
+import DearImGui.Raw.Context
   ( imguiContext )
 import DearImGui.Structs
   ( ImGuiListClipper )