diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index ce7a8c0c..1b520dc4 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -38,7 +38,6 @@ library
                    , shakespeare               >= 0.10     && < 0.11
                    , shakespeare-js            >= 0.10     && < 0.11
                    , shakespeare-css           >= 0.10     && < 0.11
-                   , shakespeare-text          >= 0.10     && < 0.11
                    , blaze-builder             >= 0.2.1    && < 0.4
                    , transformers              >= 0.2      && < 0.3
                    , clientsession             >= 0.7.2    && < 0.8
@@ -55,10 +54,6 @@ library
                    , case-insensitive          >= 0.2      && < 0.4
                    , parsec                    >= 2        && < 3.2
                    , directory                 >= 1        && < 1.2
-                   , cmdargs                   >= 0.8      && < 0.9
-                   , data-object               >= 0.3      && < 0.4
-                   , data-object-yaml          >= 0.3      && < 0.4
-                   , warp                      >= 0.4      && < 0.5
                    -- for logger. Probably logger should be a separate package
                    , strict-concurrency        >= 0.2.4    && < 0.2.5
 
@@ -70,8 +65,6 @@ library
                      Yesod.Request
                      Yesod.Widget
                      Yesod.Message
-                     Yesod.Settings
-                     Yesod.Main
     other-modules:   Yesod.Internal
                      Yesod.Internal.Core
                      Yesod.Internal.Session
diff --git a/yesod-core/Yesod/Main.hs b/yesod/Yesod/Main.hs
similarity index 100%
rename from yesod-core/Yesod/Main.hs
rename to yesod/Yesod/Main.hs
diff --git a/yesod-core/Yesod/Settings.hs b/yesod/Yesod/Settings.hs
similarity index 100%
rename from yesod-core/Yesod/Settings.hs
rename to yesod/Yesod/Settings.hs
diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal
index 94a340d4..37c0634a 100644
--- a/yesod/yesod.cabal
+++ b/yesod/yesod.cabal
@@ -74,9 +74,15 @@ library
                    , hamlet                    >= 0.10     && < 0.11
                    , shakespeare-js            >= 0.10     && < 0.11
                    , shakespeare-css           >= 0.10     && < 0.11
+                   , shakespeare-text          >= 0.10     && < 0.11
                    , warp                      >= 0.4      && < 0.5
                    , blaze-html                >= 0.4      && < 0.5
+                   , cmdargs                   >= 0.8      && < 0.9
+                   , data-object               >= 0.3      && < 0.4
+                   , data-object-yaml          >= 0.3      && < 0.4
     exposed-modules: Yesod
+                     Yesod.Settings
+                     Yesod.Main
     ghc-options:     -Wall
 
 executable             yesod