diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,4 @@
+# Changelog
+## 0.0.0.2
+### Features
+* Parsers for orgmode list headlines.
diff --git a/README.org b/README.org
new file mode 100644
--- /dev/null
+++ b/README.org
@@ -0,0 +1,3 @@
+* Welcome!
+  This is a reference implementation of a [[https://github.com/msgheap/structmsg/blob/master/SPECIFICATION.org][structmsg]] parser in Haskell.
+
diff --git a/TODO.org b/TODO.org
new file mode 100644
--- /dev/null
+++ b/TODO.org
@@ -0,0 +1,4 @@
+-*- mode: org -*-
+
+Please place stray thought TODOs in here.
+
diff --git a/orgmode-parse.cabal b/orgmode-parse.cabal
--- a/orgmode-parse.cabal
+++ b/orgmode-parse.cabal
@@ -1,9 +1,10 @@
 Name:                   orgmode-parse
-Version:                0.0.0.1
+Version:                0.0.0.2
 Author:                 Parnell <parnell@digitalmentat.com>
 Maintainer:             Parnell <parnell@digitalmentat.com>
 License:                BSD3
 License-File:           LICENSE
+Category:               Data
 Synopsis:               A parser and writer for org-mode flavored documents.
 Description:
 
@@ -17,6 +18,12 @@
 Cabal-Version:          >= 1.10
 Build-Type:             Simple
 
+Extra-Source-Files:
+    LICENSE
+    README.org
+    TODO.org
+    CHANGELOG.md
+
 Library
   Default-Language:     Haskell2010
   HS-Source-Dirs:       src
@@ -25,7 +32,6 @@
 
   Exposed-Modules:
     Data.OrgMode.Parse
-    Data.OrgMode.Parse.Attoparsec.Headings
 
   Other-Modules:
     Data.OrgMode.Parse.Internal
@@ -58,4 +64,4 @@
 
 Source-Repository head
   Type:                 git
-  Location:             git@github.com:digitalmentat/orgmode-parse.git
+  Location:             https://github.com/digitalmentat/orgmode-parse
diff --git a/src/Data/OrgMode/Parse/Attoparsec/Headings.hs b/src/Data/OrgMode/Parse/Attoparsec/Headings.hs
deleted file mode 100644
--- a/src/Data/OrgMode/Parse/Attoparsec/Headings.hs
+++ /dev/null
@@ -1,145 +0,0 @@
------------------------------------------------------------------------------
--- |
--- Module      :  Data.OrgMode.Parse.Attoparsec.Headings
--- Copyright   :  © 2014 Parnell Springmeyer
--- License     :  All Rights Reserved
--- Maintainer  :  Parnell Springmeyer <parnell@digitalmentat.com>
--- Stability   :  stable
---
--- Parsing combinators for org-list headings.
-----------------------------------------------------------------------------
-
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE TemplateHaskell   #-}
-
-module Data.OrgMode.Parse.Attoparsec.Headings
-( module Data.OrgMode.Parse.Internal
-, heading
-, headingLevel
-, headingPriority
-, headingTitle
-, headingKeyword
-)
-where
-
-import           Control.Applicative         ((*>), (<*), (<|>))
-import           Data.Attoparsec.Text        as T
-import           Data.Attoparsec.Types       as TP (Parser)
-import           Data.Char                   (isUpper)
-import           Data.Maybe                  (catMaybes, isJust)
-import           Data.Text                   as Text (Text, concat, length,
-                                                      null, pack)
-import           Prelude                     hiding (concat, null, takeWhile)
-
-import           Data.OrgMode.Parse.Internal
-
--- | Parse an org-mode heading.
-heading :: TP.Parser Text Heading
-heading = do
-    lvl  <- headingLevel
-    st   <- option Nothing headingState
-    pr   <- option Nothing headingPriority
-
-    (tl, k) <- headingTitle
-
-    keys <- attemptKeys k
-
-    endOfLine
-
-    return $ Heading lvl pr st tl (catMaybes (k:keys))
-
-  where
-    attemptKeys (Just _) = many' (headingKeyword)
-    attemptKeys Nothing  = return []
-
--- | Parse the asterisk indicated heading level until a space is
--- reached.
-headingLevel :: TP.Parser Text Int
-headingLevel = return . Text.length =<< takeWhile1 (== '*')
-
--- | Parse the priority indicator.
---
--- If anything but these priority indicators are used the parser will
--- fail: `[#A]`, `[#B]`, `[#C]`.
-headingPriority :: TP.Parser Text (Maybe Priority)
-headingPriority = do
-    pr <- start *> (takeWhile $ inClass "ABC") <* end
-    if null pr
-    then fail "Priority must be one of [#A], [#B], or [#C]"
-    else return . Just $ toPriority pr
-  where
-    start = char '[' *> char '#'
-    end   = char ']' <* space
-
-
--- | Parse the state indicator {`TODO` | `DOING` | `DONE`}.
---
--- These can be custom so we're parsing the state identifier as Text
--- but wrapped with the State newtype.
-headingState :: TP.Parser Text (Maybe State)
-headingState = do
-    st <- space *> takeWhile isUpper <* space
-
-    if null st
-    then return Nothing
-    else return . Just $ State st
-
--- | Title parser with alternative.
---
--- This function tries to parse a title with a keyword and if it fails
--- it then attempts to parse everything till the end of the line.
-headingTitle :: TP.Parser Text (Text, Maybe Keyword)
-headingTitle = takeTitleKeys <|> takeTitleEnd
-
-takeTitleEnd :: TP.Parser Text (Text, Maybe Keyword)
-takeTitleEnd = do
-    t <- takeTill isEndOfLine
-    return (t, Nothing)
-
--- | Try to parse a title that may have keys.
---
--- This function recurs for every occurrence of ':' and tries to parse
--- it as a keyword. If the keyword parser fails we fold the ':' onto
--- our title result. If it succeeds then we return the title *and the
--- parsed keyword*.
-takeTitleKeys :: TP.Parser Text (Text, Maybe Keyword)
-takeTitleKeys = do
-    t  <- takeWhile $ notInClass ":\n\r"
-    cl <- char ':'
-    k  <- headingKeyword'
-
-    if isJust k
-    then char ':' *> return (t, k)
-    else do
-        (t', k') <- takeTitleKeys
-        return (concat [t, pack [cl], t'], k')
-
--- | Parse a heading keyword.
---
--- NOTE: this is meant to be used with `takeTitleKeys` since it cannot
--- fail and we use it recursively in that function to determine
--- whether we are hitting a keyword chunk or not (and saving it if we
--- do!).
---
--- It is not exported because it is not meant to be used outside of
--- the `takeTitleKeys` function.
-headingKeyword' :: TP.Parser Text (Maybe Keyword)
-headingKeyword' = do
-    key <- takeWhile $ notInClass " :\n\r"
-    if null key
-    then return Nothing
-    else return . Just $ Keyword key
-
--- | Parse a heading keyword.
---
--- You can use this with `many'` and `catMaybes` to get a list
--- keywords:
---
--- > keys <- many' headingKeyword
--- > return $ catMaybes keys
-headingKeyword :: TP.Parser Text (Maybe Keyword)
-headingKeyword = do
-    key <- (takeWhile1 $ notInClass ":\n\r") <* char ':'
-    if null key
-    then return Nothing
-    else return . Just $ Keyword key