diff --git a/HGamer3D-WinEvent.cabal b/HGamer3D-WinEvent.cabal
--- a/HGamer3D-WinEvent.cabal
+++ b/HGamer3D-WinEvent.cabal
@@ -1,5 +1,5 @@
 Name:                HGamer3D-WinEvent
-Version:             0.3.0
+Version:             0.4.0
 Synopsis:            Windowing and Event Functionality for HGamer3D
 Description:         
 	HGamer3D is a game engine for developing 3D games in the programming 
@@ -18,9 +18,9 @@
 Extra-source-files:  Setup.hs 
 
 Library
-  Build-Depends:     base >= 3 && < 5, text, HGamer3D-Data >= 0.3.0 && < 0.4.0, HGamer3D-SDL2-Binding >= 0.3.0 && < 0.4.0
+  Build-Depends:     base >= 3 && < 5, text, HGamer3D-Data >= 0.4.0 && < 0.5.0, HGamer3D-SDL2-Binding >= 0.4.0 && < 0.5.0
 
-  Exposed-modules:   HGamer3D.WinEvent
+  Exposed-modules:   HGamer3D.WinEvent.Internal.Base, HGamer3D.WinEvent.BaseAPI, HGamer3D.Internal.WinEvent
   Other-modules:     
 
   c-sources:         
diff --git a/HGamer3D/Internal/WinEvent.hs b/HGamer3D/Internal/WinEvent.hs
new file mode 100644
--- /dev/null
+++ b/HGamer3D/Internal/WinEvent.hs
@@ -0,0 +1,30 @@
+-- This source file is part of HGamer3D
+-- (A project to enable 3D game development in Haskell)
+-- For the latest info, see http://www.hgamer3d.org
+--
+-- (c) 2011-2014 Peter Althainz
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+-- WinEvents.hs
+
+
+-- | Windowing and Event functionality for HGamer3D, internal API. 
+module HGamer3D.Internal.WinEvent
+(
+  module HGamer3D.WinEvent.Internal.Base
+)
+
+where
+
+import HGamer3D.WinEvent.Internal.Base
diff --git a/HGamer3D/WinEvent.hs b/HGamer3D/WinEvent.hs
deleted file mode 100644
--- a/HGamer3D/WinEvent.hs
+++ /dev/null
@@ -1,132 +0,0 @@
--- This source file is part of HGamer3D
--- (A project to enable 3D game development in Haskell)
--- For the latest info, see http://www.hgamer3d.org
---
--- (c) 2011-2014 Peter Althainz
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-
--- Events.hs
-
-
--- | Windowing and Event functionality for HGamer3D
-module HGamer3D.WinEvent
-(
-  EnumWinEventInit (..),
-  SDLWindow,
-  initWinEvent,
-  attachToWindow,
-  openWindow,
-  pollWinEvent,
-  quitWinEvent,
-  showCursor,
-  module HGamer3D.Bindings.SDL2.StructSDLEvent,
-  module HGamer3D.Bindings.SDL2.EnumSDLEventType,
-  module HGamer3D.Bindings.SDL2.EnumSDLKeymod,
-  module HGamer3D.Bindings.SDL2.EnumSDLScancode,
-  module HGamer3D.Bindings.SDL2.EnumSDLWindowEventID,
-  module HGamer3D.Bindings.SDL2.EnumSDLWindowFlags,
-
-  initHGamer3D,
-  exitHGamer3D,
-  loopHGamer3D
-)
-
-where
-
-import GHC.Ptr
-import HGamer3D.Data
-
-import HGamer3D.Bindings.SDL2.ClassPtr
-import HGamer3D.Bindings.SDL2.Utils
-
-
-import HGamer3D.Bindings.SDL2.EnumSDLEventType
-import HGamer3D.Bindings.SDL2.EnumSDLKeymod
-import HGamer3D.Bindings.SDL2.EnumSDLScancode
-import HGamer3D.Bindings.SDL2.EnumSDLWindowEventID
-import HGamer3D.Bindings.SDL2.EnumSDLWindowFlags
-
-import HGamer3D.Bindings.SDL2.StructSDLEvent
-
-import HGamer3D.Bindings.SDL2.HeaderSDL
-import HGamer3D.Bindings.SDL2.HeaderSDLVideo
-import HGamer3D.Bindings.SDL2.HeaderSDLEvents
-import HGamer3D.Bindings.SDL2.EnumSDLWindowFlags
-import HGamer3D.Bindings.SDL2.HeaderSDLMouse
-import HGamer3D.Bindings.SDL2.ClassHG3DUtilities
-
-import Foreign.Marshal.Utils
-import Control.Monad
-import Control.Applicative
-
--- Enum Definitions for initializing
-data EnumWinEventInit = WEV_INIT_VIDEO | WEV_INIT_TIMER | WEV_INIT_EVENTS
-instance Enum EnumWinEventInit where
- toEnum 0x20 = WEV_INIT_VIDEO
- toEnum 0x4000 = WEV_INIT_EVENTS
- toEnum 0x01 = WEV_INIT_TIMER
-
- fromEnum WEV_INIT_VIDEO = 0x20
- fromEnum WEV_INIT_EVENTS = 0x4000
- fromEnum WEV_INIT_TIMER = 0x01
-
--- show instance for SDLEvent
-instance Show SDLEvent where
-  show (EvtQuit ts) = "Event-Quit"
-  show (EvtKeyUp ts window keyscan keycode keymode) = "Event-KeyUp " ++ (show (fromEnum keyscan))
-  show (EvtKeyDown ts window keyscan keycode keymode) = "Event-KeyDown " ++ (show (fromEnum keyscan))
-  show (EvtText ts window text) = "Event-Text " ++ text
-  show (EvtMouseButtonUp ts window mid button x y) = "Event-MouseButtonUp  " ++ (show button) ++ " " ++ (show x) ++ " " ++ (show y) 
-  show (EvtMouseButtonDown ts window mid button x y) = "Event-MouseButtonDown  " ++ (show button) ++ " " ++ (show x) ++ " " ++ (show y) 
-  show (EvtMouseMotion ts window mid x y rx ry) = "Event-MouseMotion " ++ (show x) ++ " " ++ (show y) ++ " r: " ++ (show rx) ++ " " ++ (show ry)
-  show (EvtWindow ts window weid x y) = "Event-Window " ++ (show (fromEnum weid)) ++ " " ++ (show x) ++ " " ++ (show y)
-  show _ = "Specific Event is not in show instance"
-
-
-initWinEvent :: [EnumWinEventInit] -> IO Int
-initWinEvent flags = do
-  res <- sdlInit $ sum (fmap fromEnum flags)
-  return res
-  
-
-attachToWindow :: Window -> IO (Ptr SDLWindow)
-attachToWindow (Window handle) = do
-  res <- createWindowFromHandle handle
-  return $ res
-
-openWindow :: String -> Int -> Int -> Int -> Int -> [EnumSDLWindowFlags] -> IO (Ptr SDLWindow)
-openWindow title x y w h flags = do
-  win <- sdlCreateWindow title x y w h (sum $ fmap fromEnum flags)
-  return win
-
-pollWinEvent :: IO (Maybe SDLEvent)
-pollWinEvent = do
-    (sdlevt, res) <- sdlPollEvent
-    let r = case res of
-          0 -> Nothing
-          1 -> Just sdlevt
-          _ -> Nothing
-    return r
-
-quitWinEvent :: IO ()
-quitWinEvent = sdlQuit
-
-showCursor :: Bool -> IO Bool
-showCursor flag = do
-  ival <- sdlShowCursor (fromBool flag)
-  return (toBool ival)
-  
-initHGamer3D = initWinEvent  
-exitHGamer3D = quitWinEvent
-loopHGamer3D = pollWinEvent
diff --git a/HGamer3D/WinEvent/BaseAPI.hs b/HGamer3D/WinEvent/BaseAPI.hs
new file mode 100644
--- /dev/null
+++ b/HGamer3D/WinEvent/BaseAPI.hs
@@ -0,0 +1,53 @@
+-- This source file is part of HGamer3D
+-- (A project to enable 3D game development in Haskell)
+-- For the latest info, see http://www.hgamer3d.org
+--
+-- (c) 2011-2014 Peter Althainz
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+-- WinEvents.hs
+
+
+-- | Windowing and Event functionality for HGamer3D, public API. This module abstracts the functionality needed to create a window and to handle events from this window over different platforms. This module currently is not useful standalone, but is used in HGamer3D (main module) to construct initialization and game loop functionality.
+module HGamer3D.WinEvent.BaseAPI
+(
+  -- * Basic Data Types and Enums
+  EnumWinEventInit (..),
+  SDLSystem,
+  module HGamer3D.Bindings.SDL2.StructSDLEvent,
+  module HGamer3D.Bindings.SDL2.EnumSDLEventType,
+  module HGamer3D.Bindings.SDL2.EnumSDLKeymod,
+  module HGamer3D.Bindings.SDL2.EnumSDLScancode,
+  module HGamer3D.Bindings.SDL2.EnumSDLWindowEventID,
+  module HGamer3D.Bindings.SDL2.EnumSDLWindowFlags,
+
+  -- * Initialization and Game Loop Functions
+  initWinEvent,
+  freeWinEvent,
+  pollWinEvent,
+
+  -- * Misc Functions
+  openWindow,
+)
+
+where
+
+import HGamer3D.WinEvent.Internal.Base
+
+import HGamer3D.Bindings.SDL2.EnumSDLEventType
+import HGamer3D.Bindings.SDL2.EnumSDLKeymod
+import HGamer3D.Bindings.SDL2.EnumSDLScancode
+import HGamer3D.Bindings.SDL2.EnumSDLWindowEventID
+import HGamer3D.Bindings.SDL2.EnumSDLWindowFlags
+import HGamer3D.Bindings.SDL2.StructSDLEvent
diff --git a/HGamer3D/WinEvent/Internal/Base.hs b/HGamer3D/WinEvent/Internal/Base.hs
new file mode 100644
--- /dev/null
+++ b/HGamer3D/WinEvent/Internal/Base.hs
@@ -0,0 +1,146 @@
+{-# OPTIONS_HADDOCK hide #-}
+-- This source file is part of HGamer3D
+-- (A project to enable 3D game development in Haskell)
+-- For the latest info, see http://www.hgamer3d.org
+--
+-- (c) 2011-2014 Peter Althainz
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+-- WinEvent/Internal/Base.hs
+
+
+-- | Windowing and Event functionality for HGamer3D, implementation module. This modules exposes internal data structures, public API is in HGamer3D.WinEvent.
+module HGamer3D.WinEvent.Internal.Base
+(
+  EnumWinEventInit (..),
+
+  SDLSystem,
+  initWinEvent,
+  freeWinEvent,
+
+  attachToWindow,
+  openWindow,
+  pollWinEvent,
+  showCursor,
+
+  module HGamer3D.Bindings.SDL2.StructSDLEvent,
+  module HGamer3D.Bindings.SDL2.EnumSDLEventType,
+  module HGamer3D.Bindings.SDL2.EnumSDLKeymod,
+  module HGamer3D.Bindings.SDL2.EnumSDLScancode,
+  module HGamer3D.Bindings.SDL2.EnumSDLWindowEventID,
+  module HGamer3D.Bindings.SDL2.EnumSDLWindowFlags,
+)
+
+where
+
+import GHC.Ptr
+import HGamer3D.Data
+import HGamer3D.Data.Window
+
+import HGamer3D.Bindings.SDL2.ClassPtr
+import HGamer3D.Bindings.SDL2.Utils
+
+
+import HGamer3D.Bindings.SDL2.EnumSDLEventType
+import HGamer3D.Bindings.SDL2.EnumSDLKeymod
+import HGamer3D.Bindings.SDL2.EnumSDLScancode
+import HGamer3D.Bindings.SDL2.EnumSDLWindowEventID
+import HGamer3D.Bindings.SDL2.EnumSDLWindowFlags
+
+import HGamer3D.Bindings.SDL2.StructSDLEvent
+
+import HGamer3D.Bindings.SDL2.HeaderSDL
+import HGamer3D.Bindings.SDL2.HeaderSDLVideo
+import HGamer3D.Bindings.SDL2.HeaderSDLEvents
+import HGamer3D.Bindings.SDL2.EnumSDLWindowFlags
+import HGamer3D.Bindings.SDL2.HeaderSDLMouse
+import HGamer3D.Bindings.SDL2.ClassHG3DUtilities
+
+import Foreign.Marshal.Utils
+import Control.Monad
+import Control.Applicative
+
+data SDLSystem = SDLSystem (Ptr SDLWindow)
+
+-- WinEvent Initialization Flags
+data EnumWinEventInit = WEV_INIT_VIDEO    -- ^ initialize Video subsystem
+                        | WEV_INIT_TIMER  -- ^ initialize Timer subsystem
+                        | WEV_INIT_EVENTS -- ^ initialize Event subsystem
+
+instance Enum EnumWinEventInit where
+ toEnum 0x20 = WEV_INIT_VIDEO
+ toEnum 0x4000 = WEV_INIT_EVENTS
+ toEnum 0x01 = WEV_INIT_TIMER
+
+ fromEnum WEV_INIT_VIDEO = 0x20
+ fromEnum WEV_INIT_EVENTS = 0x4000
+ fromEnum WEV_INIT_TIMER = 0x01
+
+-- show instance for SDLEvent
+instance Show SDLEvent where
+  show (EvtQuit ts) = "Event-Quit"
+  show (EvtKeyUp ts window keyscan keycode keymode) = "Event-KeyUp " ++ (show (fromEnum keyscan))
+  show (EvtKeyDown ts window keyscan keycode keymode) = "Event-KeyDown " ++ (show (fromEnum keyscan))
+  show (EvtText ts window text) = "Event-Text " ++ text
+  show (EvtMouseButtonUp ts window mid button x y) = "Event-MouseButtonUp  " ++ (show button) ++ " " ++ (show x) ++ " " ++ (show y) 
+  show (EvtMouseButtonDown ts window mid button x y) = "Event-MouseButtonDown  " ++ (show button) ++ " " ++ (show x) ++ " " ++ (show y) 
+  show (EvtMouseMotion ts window mid x y rx ry) = "Event-MouseMotion " ++ (show x) ++ " " ++ (show y) ++ " r: " ++ (show rx) ++ " " ++ (show ry)
+  show (EvtWindow ts window weid x y) = "Event-Window " ++ (show (fromEnum weid)) ++ " " ++ (show x) ++ " " ++ (show y)
+  show _ = "Specific Event is not in show instance"
+
+-- | Initialization of WinEvent
+initWinEvent :: [EnumWinEventInit] -- ^ Initialization Flags
+                -> IO Int          -- ^ result != 0 in case of errors
+initWinEvent flags = do
+  res <- sdlInit $ sum (fmap fromEnum flags)
+  return res
+  
+-- | Un-initialize WinEvent and free resources
+freeWinEvent :: IO ()
+freeWinEvent = sdlQuit
+
+
+attachToWindow :: Window -> IO (SDLSystem)
+attachToWindow (Window handle) = do
+  res <- createWindowFromHandle handle
+  return $ SDLSystem res
+
+-- | open new window
+openWindow :: String   -- ^ Window Display Name
+              -> Int   -- ^ X coordinate of Window
+              -> Int   -- ^ Y coordinate of Window
+              -> Int   -- ^ Width of Window
+              -> Int   -- ^ Height of Window
+              -> [EnumSDLWindowFlags]  -- ^ initialization flags
+              -> IO (SDLSystem)
+openWindow title x y w h flags = do
+  win <- sdlCreateWindow title x y w h (sum $ fmap fromEnum flags)
+  return $ SDLSystem win
+
+-- | query for events from windowing system
+pollWinEvent :: IO (Maybe SDLEvent)
+pollWinEvent = do
+    (sdlevt, res) <- sdlPollEvent
+    let r = case res of
+          0 -> Nothing
+          1 -> Just sdlevt
+          _ -> Nothing
+    return r
+
+-- | show / hide cursor, returns previous state
+showCursor :: Bool -> IO Bool
+showCursor flag = do
+  ival <- sdlShowCursor (fromBool flag)
+  return (toBool ival)
+