diff --git a/Test/Hspec.hs b/Test/Hspec.hs
--- a/Test/Hspec.hs
+++ b/Test/Hspec.hs
@@ -15,7 +15,7 @@
 -- it over this one.  For documentation on the monadic API look at
 -- "Test.Hspec.Monadic".
 
-module Test.Hspec (
+module Test.Hspec {-# WARNING "This module will re-export Test.Hspec.Monadic in the future.  Either use Test.Hspec.Core as a drop-in replacement, or migrate your code to the monadic API!" #-} (
 
 -- * Introduction
 -- $intro
@@ -42,8 +42,6 @@
 ) where
 
 import           Test.Hspec.Core
-import           Test.Hspec.Runner
-import           Test.Hspec.Pending
 
 -- $intro
 --
diff --git a/Test/Hspec/Core.hs b/Test/Hspec/Core.hs
--- a/Test/Hspec/Core.hs
+++ b/Test/Hspec/Core.hs
@@ -3,18 +3,27 @@
 -- This module contains the core types, constructors, classes, instances, and
 -- utility functions common to hspec.
 module Test.Hspec.Core (
-  SpecTree (..)
+-- * Types
+  Spec
+, Specs
 , Example (..)
-, Result (..)
-, descriptions
+, Pending
 
+-- * Defining a spec
 , describe
 , it
-, Spec
-, Specs
-, UnevaluatedSpec
-, EvaluatedSpec
+, pending
 
+-- * Running a spec
+, hspec
+, hspecB
+, hspecX
+, hHspec
+
+-- * Internals
+, SpecTree (..)
+, EvaluatedSpec
+, Result (..)
 , quantify
 
 -- * Deprecated types and functions
@@ -23,9 +32,10 @@
 --
 -- If you still need any of those, please open an issue and describe your use
 -- case: <https://github.com/hspec/hspec/issues>
+, descriptions
 , AnyExample
 , safeEvaluateExample
-
+, UnevaluatedSpec
 , success
 , failure
 , isFailure
@@ -34,6 +44,8 @@
 
 import           Test.Hspec.Internal hiding (safeEvaluateExample)
 import qualified Test.Hspec.Internal as Internal
+import           Test.Hspec.Pending
+import           Test.Hspec.Runner
 
 {-# DEPRECATED UnevaluatedSpec "use Spec instead" #-}
 type UnevaluatedSpec = Spec
@@ -42,10 +54,6 @@
 descriptions :: Specs -> Specs
 descriptions = id
 {-# DEPRECATED descriptions "this is no longer needed, and will be removed in a future release" #-}
-
-type Specs = [Spec]
-
-type EvaluatedSpec = SpecTree Result
 
 {-# DEPRECATED success "This will be removed with the next major release.  If you still need this, raise your voice!" #-}
 success :: [EvaluatedSpec] -> Bool
diff --git a/Test/Hspec/Formatters.hs b/Test/Hspec/Formatters.hs
--- a/Test/Hspec/Formatters.hs
+++ b/Test/Hspec/Formatters.hs
@@ -39,7 +39,7 @@
 ) where
 
 import           Data.Maybe
-import           Test.Hspec.Core (quantify)
+import           Test.Hspec.Internal (quantify)
 import           Data.List (intersperse)
 import           Text.Printf
 import           Control.Monad (unless)
diff --git a/Test/Hspec/Internal.hs b/Test/Hspec/Internal.hs
--- a/Test/Hspec/Internal.hs
+++ b/Test/Hspec/Internal.hs
@@ -2,6 +2,8 @@
 module Test.Hspec.Internal (
   SpecTree (..)
 , Spec (..)
+, Specs
+, EvaluatedSpec
 , Example (..)
 , safeEvaluateExample
 , Result (..)
@@ -15,6 +17,9 @@
 
 import           Control.Exception
 import qualified Test.Hspec.Pending as Pending
+
+type Specs = [Spec]
+type EvaluatedSpec = SpecTree Result
 
 -- | The result of running an example.
 data Result = Success | Pending (Maybe String) | Fail String
diff --git a/Test/Hspec/Runner.hs b/Test/Hspec/Runner.hs
--- a/Test/Hspec/Runner.hs
+++ b/Test/Hspec/Runner.hs
@@ -7,7 +7,6 @@
 ) where
 
 import           Test.Hspec.Internal
-import           Test.Hspec.Core (EvaluatedSpec, Specs)
 import           Test.Hspec.Formatters
 import           Test.Hspec.Formatters.Internal
 import           System.IO
diff --git a/hspec.cabal b/hspec.cabal
--- a/hspec.cabal
+++ b/hspec.cabal
@@ -1,5 +1,5 @@
 name:           hspec
-version:        1.1.2
+version:        1.1.3
 cabal-version:  >= 1.8
 build-type:     Simple
 license:        BSD3