diff --git a/CHANGELOG b/CHANGELOG
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 -*- mode: org -*-
 
 * Changelog
+** 0.0.2.1
+*** Bugfixes
+    - [X] Fixing the import for the =Internal= module (instead of
+      re-exporting it in each parser module).
 ** 0.0.2.0
 *** Features
     - [X] Added parsers for the scheduled / deadline timestamps.
diff --git a/orgmode-parse.cabal b/orgmode-parse.cabal
--- a/orgmode-parse.cabal
+++ b/orgmode-parse.cabal
@@ -1,5 +1,5 @@
 Name:                   orgmode-parse
-Version:                0.0.2.0
+Version:                0.0.2.1
 Author:                 Parnell Springmeyer <parnell@digitalmentat.com>
 Maintainer:             Parnell Springmeyer <parnell@digitalmentat.com>
 License:                BSD3
@@ -34,9 +34,7 @@
 
   Exposed-Modules:
     Data.OrgMode.Parse
-
-  Other-Modules:
-    Data.OrgMode.Parse.Internal
+    Data.OrgMode.Parse.Types
 
   Build-Depends:
     base                      >= 4.4      && < 5,
diff --git a/src/Data/OrgMode/Parse/Internal.hs b/src/Data/OrgMode/Parse/Internal.hs
deleted file mode 100644
--- a/src/Data/OrgMode/Parse/Internal.hs
+++ /dev/null
@@ -1,77 +0,0 @@
------------------------------------------------------------------------------
--- |
--- Module      :  Data.OrgMode.Parse.Internal
--- Copyright   :  © 2014 Parnell Springmeyer
--- License     :  All Rights Reserved
--- Maintainer  :  Parnell Springmeyer <parnell@digitalmentat.com>
--- Stability   :  stable
---
--- Internal types and utility functions.
-----------------------------------------------------------------------------
-
-{-# LANGUAGE OverloadedStrings #-}
-
-module Data.OrgMode.Parse.Internal
-( Heading  (..)
-, Priority (..)
-, State    (..)
-, Keyword  (..)
-, PropertyDrawer (..)
-, Schedule     (..)
-, ScheduleType (..)
-, Timestamp    (..)
-, Open         (..)
-, Close        (..)
-, toPriority
-) where
-
-import           Data.HashMap.Strict  (HashMap)
-import           Data.Text            (Text)
-import           Data.Thyme.LocalTime (LocalTime (..))
-
-----------------------------------------------------------------------------
-
-data Heading = Heading
-    { level    :: Int
-    , priority :: Maybe Priority
-    , state    :: Maybe State
-    , title    :: Text
-    , keywords :: [Keyword]
-    } deriving (Show, Eq)
-
-
-data Priority = A | B | C | Unknown
-  deriving (Show, Read, Eq, Ord)
-
-newtype State = State Text
-  deriving (Show, Eq)
-
-newtype Keyword = Keyword Text
-  deriving (Show, Eq, Ord)
-
-toPriority :: Text -> Priority
-toPriority "A" = A
-toPriority "B" = B
-toPriority "C" = C
-toPriority _   = Unknown
-
-----------------------------------------------------------------------------
-
-newtype PropertyDrawer k v = PropertyDrawer (HashMap k v)
-  deriving (Show, Eq)
-
-----------------------------------------------------------------------------
-data Schedule = Schedule
-    { schedule_type :: ScheduleType
-    , timestamp     :: Maybe Timestamp
-    , recurring     :: Maybe Text
-    } deriving (Show, Eq)
-
-data ScheduleType = SCHEDULED | DEADLINE | APPOINTMENT
-  deriving (Show, Eq)
-
-data Timestamp = Active LocalTime | Inactive LocalTime
-  deriving (Show, Eq)
-
-newtype Open = Open Char
-newtype Close = Close Char
diff --git a/src/Data/OrgMode/Parse/Types.hs b/src/Data/OrgMode/Parse/Types.hs
new file mode 100644
--- /dev/null
+++ b/src/Data/OrgMode/Parse/Types.hs
@@ -0,0 +1,77 @@
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Data.OrgMode.Parse.Types
+-- Copyright   :  © 2014 Parnell Springmeyer
+-- License     :  All Rights Reserved
+-- Maintainer  :  Parnell Springmeyer <parnell@digitalmentat.com>
+-- Stability   :  stable
+--
+-- Types and utility functions.
+----------------------------------------------------------------------------
+
+{-# LANGUAGE OverloadedStrings #-}
+
+module Data.OrgMode.Parse.Types
+( Heading  (..)
+, Priority (..)
+, State    (..)
+, Keyword  (..)
+, PropertyDrawer (..)
+, Schedule     (..)
+, ScheduleType (..)
+, Timestamp    (..)
+, Open         (..)
+, Close        (..)
+, toPriority
+) where
+
+import           Data.HashMap.Strict  (HashMap)
+import           Data.Text            (Text)
+import           Data.Thyme.LocalTime (LocalTime (..))
+
+----------------------------------------------------------------------------
+
+data Heading = Heading
+    { level    :: Int
+    , priority :: Maybe Priority
+    , state    :: Maybe State
+    , title    :: Text
+    , keywords :: [Keyword]
+    } deriving (Show, Eq)
+
+
+data Priority = A | B | C | Unknown
+  deriving (Show, Read, Eq, Ord)
+
+newtype State = State Text
+  deriving (Show, Eq)
+
+newtype Keyword = Keyword Text
+  deriving (Show, Eq, Ord)
+
+toPriority :: Text -> Priority
+toPriority "A" = A
+toPriority "B" = B
+toPriority "C" = C
+toPriority _   = Unknown
+
+----------------------------------------------------------------------------
+
+newtype PropertyDrawer k v = PropertyDrawer (HashMap k v)
+  deriving (Show, Eq)
+
+----------------------------------------------------------------------------
+data Schedule = Schedule
+    { schedule_type :: ScheduleType
+    , timestamp     :: Maybe Timestamp
+    , recurring     :: Maybe Text
+    } deriving (Show, Eq)
+
+data ScheduleType = SCHEDULED | DEADLINE | APPOINTMENT
+  deriving (Show, Eq)
+
+data Timestamp = Active LocalTime | Inactive LocalTime
+  deriving (Show, Eq)
+
+newtype Open = Open Char
+newtype Close = Close Char