diff --git a/restful-snap.cabal b/restful-snap.cabal
--- a/restful-snap.cabal
+++ b/restful-snap.cabal
@@ -1,5 +1,5 @@
 name:                restful-snap
-version:             0.1.1.1
+version:             0.2
 description:         A convention-based RESTful routing mechanism for snap
 license:             BSD3
 license-file:        LICENSE
diff --git a/src/Snap/Restful.hs b/src/Snap/Restful.hs
--- a/src/Snap/Restful.hs
+++ b/src/Snap/Restful.hs
@@ -8,22 +8,35 @@
 {-# LANGUAGE TypeSynonymInstances       #-}
 
 module Snap.Restful
-    ( CRUD (..)
+    (
+
+    -- * Core API
+      addResource
+    , addResourceRelative
+    , initRest
+
+    -- * Splice functions
+    , resourceSplices
+    , itemSplices
+    , resourceCSplices
+    , itemCSplices
+    , unitLens
+    , resourceRouter
+    , resourceRoutes
+
+    -- * Types
+    , CRUD (..)
     , Resource (..)
     , DBId (..)
+
+    -- * Generating forms and splices
     , HasFormlet (..)
     , PrimSplice (..)
     , iPrimText
     , iPrimShow
     , cPrimShow
 
-    , addResource
-    , addResourceRelative
-    , initRest
-    , unitLens
-    , resourceRouter
-    , resourceRoutes
-
+    -- * Functions for generating paths
     , rootPath
     , indexPath
     , createPath
@@ -33,23 +46,14 @@
     , updatePath
     , destroyPath
     , itemActionPath
-
     , templatePath
 
-    , resourceSplices
-    , itemSplices
-    , resourceCSplices
-    , itemCSplices
-
+    -- * Misc helpers
     , redirToItem
-
     , prefixSplices
-
     , relativeRedirect
-
     , setFormAction
     , getFormAction
-
     , simpleDateFormlet
     ) where
 
diff --git a/src/Snap/Restful/TH.hs b/src/Snap/Restful/TH.hs
--- a/src/Snap/Restful/TH.hs
+++ b/src/Snap/Restful/TH.hs
@@ -9,7 +9,11 @@
 {-# LANGUAGE TypeOperators              #-}
 {-# LANGUAGE TypeSynonymInstances       #-}
 
-module Snap.Restful.TH where
+module Snap.Restful.TH
+  ( deriveHasFormlet
+  , iSplices
+  , cSplices
+  ) where
 
 ------------------------------------------------------------------------------
 import           Control.Applicative