Hierarchify

darcs-hash:20071101201059-a5988-fc1f1262bec1b69e13ba18ae7cefeafc8c4471d4.gz

23 files changed, 100 insertions, 100 deletions

diff --git a/Commands.hs b/XMonad/Actions/Commands.hs
index dd97ad5..eaf6624 100644
--- a/Commands.hs
+++ b/XMonad/Actions/Commands.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.Commands
+-- Module      :  XMonad.Actions.Commands
 -- Copyright   :  (c) David Glasser 2007
 -- License     :  BSD3
 -- 
@@ -10,11 +10,11 @@
 --
 -- Allows you to run internal xmonad commands (X () actions) using
 -- a dmenu menu in addition to key bindings.  Requires dmenu and
--- the Dmenu XMonadContrib module.
+-- the Dmenu XMonad.Actions module.
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.Commands (
+module XMonad.Actions.Commands (
                              -- * Usage
                              -- $usage
                              commandMap,
@@ -28,7 +28,7 @@ module XMonadContrib.Commands (
 import XMonad
 import XMonad.Operations
 import XMonad.StackSet hiding (workspaces)
-import XMonadContrib.Dmenu (dmenu)
+import XMonad.Util.Dmenu (dmenu)
 import XMonad.Layouts
 
 import Control.Monad.Reader
@@ -40,7 +40,7 @@ import Data.Maybe
 --
 -- To use, modify your Config.hs to:
 --
--- >    import XMonadContrib.Commands
+-- >    import XMonad.Actions.Commands
 --
 -- and add a keybinding to the runCommand action:
 --
@@ -58,7 +58,7 @@ import Data.Maybe
 
 -- %def commands :: [(String, X ())]
 -- %def commands = defaultCommands
--- %import XMonadContrib.Commands
+-- %import XMonad.Actions.Commands
 -- %keybind , ((modMask .|. controlMask, xK_y), runCommand commands)
 
 commandMap :: [(String, X ())] -> M.Map String (X ())
diff --git a/ConstrainedResize.hs b/XMonad/Actions/ConstrainedResize.hs
index 5e54861..cb49d0a 100644
--- a/ConstrainedResize.hs
+++ b/XMonad/Actions/ConstrainedResize.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.ConstrainedResize
+-- Module      :  XMonad.Actions.ConstrainedResize
 -- Copyright   :  (c) Dougal Stanton
 -- License     :  BSD3-style (see LICENSE)
 -- 
@@ -15,10 +15,10 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.ConstrainedResize (
+module XMonad.Actions.ConstrainedResize (
 	-- * Usage
 	-- $usage
-	XMonadContrib.ConstrainedResize.mouseResizeWindow
+	XMonad.Actions.ConstrainedResize.mouseResizeWindow
 ) where
 
 import XMonad
@@ -29,7 +29,7 @@ import Graphics.X11.Xlib.Extras
 -- $usage
 -- Put something like this in your Config.hs file:
 --
--- > import qualified XMonadContrib.ConstrainedResize as Sqr
+-- > import qualified XMonad.Actions.ConstrainedResize as Sqr
 -- > mouseBindings = M.fromList
 -- >     [ ...
 -- >     , ((modMask, button3),               (\w -> focus w >> Sqr.mouseResizeWindow w False))
@@ -38,7 +38,7 @@ import Graphics.X11.Xlib.Extras
 -- The line without the shiftMask replaces the standard mouse resize function call, so it's
 -- not completely necessary but seems neater this way.
 
--- %import qualified XMonadContrib.ConstrainedResize as Sqr
+-- %import qualified XMonad.Actions.ConstrainedResize as Sqr
 -- %mousebind , ((modMask, button3), (\\w -> focus w >> Sqr.mouseResizeWindow w False))
 -- %mousebind , ((modMask .|. shiftMask, button3), (\\w -> focus w >> Sqr.mouseResizeWindow w True))
 
diff --git a/CopyWindow.hs b/XMonad/Actions/CopyWindow.hs
index 1e825ef..cb6a619 100644
--- a/CopyWindow.hs
+++ b/XMonad/Actions/CopyWindow.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.CopyWindow
+-- Module      :  XMonad.Actions.CopyWindow
 -- Copyright   :  (c) David Roundy <droundy@darcs.net>
 -- License     :  BSD3-style (see LICENSE)
 --
@@ -13,7 +13,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.CopyWindow (
+module XMonad.Actions.CopyWindow (
                                  -- * Usage
                                  -- $usage
                                  copy, kill1
@@ -29,7 +29,7 @@ import XMonad.StackSet
 -- $usage
 -- You can use this module with the following in your Config.hs file:
 -- 
--- > import XMonadContrib.CopyWindow
+-- > import XMonad.Actions.CopyWindow
 --
 -- > -- mod-[1..9] @@ Switch to workspace N
 -- > -- mod-shift-[1..9] @@ Move client to workspace N
@@ -43,7 +43,7 @@ import XMonad.StackSet
 --
 -- >  , ((modMask .|. shiftMask, xK_c     ), kill1) -- @@ Close the focused window
 
--- %import XMonadContrib.CopyWindow
+-- %import XMonad.Actions.CopyWindow
 -- %keybind -- comment out default close window binding above if you uncomment this:
 -- %keybind , ((modMask .|. shiftMask, xK_c     ), kill1) -- @@ Close the focused window
 -- %keybindlist ++
diff --git a/CycleWS.hs b/XMonad/Actions/CycleWS.hs
index 931ed47..6e854bc 100644
--- a/CycleWS.hs
+++ b/XMonad/Actions/CycleWS.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.CycleWS
+-- Module      :  XMonad.Actions.CycleWS
 -- Copyright   :  (c) Joachim Breitner <mail@joachim-breitner.de>,
 --                    Nelson Elhage <nelhage@mit.edu> (`toggleWS' function)
 -- License     :  BSD3-style (see LICENSE)
@@ -14,7 +14,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.CycleWS (
+module XMonad.Actions.CycleWS (
                               -- * Usage
                               -- $usage
                               nextWS,
@@ -38,7 +38,7 @@ import XMonad.Operations
 -- $usage
 -- You can use this module with the following in your Config.hs file:
 --
--- > import XMonadContrib.CycleWS
+-- > import XMonad.Actions.CycleWS
 --
 -- >   , ((modMask,               xK_Right), nextWS)
 -- >   , ((modMask,               xK_Left),  prevWS)
@@ -52,7 +52,7 @@ import XMonad.Operations
 -- >   , ((modMask .|. shiftMask, xK_Left),  shiftToPrev >> prevWS)
 --
 
--- %import XMonadContrib.CycleWS
+-- %import XMonad.Actions.CycleWS
 -- %keybind , ((modMask,               xK_Right), nextWS)
 -- %keybind , ((modMask,               xK_Left),  prevWS)
 -- %keybind , ((modMask .|. shiftMask, xK_Right), shiftToNext)
diff --git a/DeManage.hs b/XMonad/Actions/DeManage.hs
index 3994541..9bff48a 100644
--- a/DeManage.hs
+++ b/XMonad/Actions/DeManage.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.DeManage
+-- Module      :  XMonad.Actions.DeManage
 -- Copyright   :  (c) Spencer Janssen <sjanssen@cse.unl.edu>
 -- License     :  BSD3-style (see LICENSE)
 --
@@ -25,7 +25,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.DeManage (
+module XMonad.Actions.DeManage (
                                  -- * Usage
                                  -- $usage
                                  demanage
@@ -40,14 +40,14 @@ import Graphics.X11 (Window)
 -- $usage
 -- To use demanage, add this import:
 --
--- >     import XMonadContrib.DeManage
+-- >     import XMonad.Actions.DeManage
 --
 -- And add a keybinding to it:
 --
 -- > , ((modMask,               xK_d     ), withFocused demanage)
 --
 
--- %import XMonadContrib.DeManage
+-- %import XMonad.Actions.DeManage
 -- %keybind , ((modMask,               xK_d     ), withFocused demanage)
 
 -- | Stop managing the current focused window.
diff --git a/DwmPromote.hs b/XMonad/Actions/DwmPromote.hs
index 7e81e7b..dfe7cc6 100644
--- a/DwmPromote.hs
+++ b/XMonad/Actions/DwmPromote.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.DwmPromote
+-- Module      :  XMonad.Actions.DwmPromote
 -- Copyright   :  (c) Miikka Koskinen 2007
 -- License     :  BSD3-style (see LICENSE)
 --
@@ -16,7 +16,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.DwmPromote (
+module XMonad.Actions.DwmPromote (
                                  -- * Usage
                                  -- $usage 
                                  dwmpromote
@@ -30,13 +30,13 @@ import XMonad.StackSet
 --
 -- To use, modify your Config.hs to:
 --
--- >    import XMonadContrib.DwmPromote
+-- >    import XMonad.Actions.DwmPromote
 --
 -- and add a keybinding or substitute promote with dwmpromote:
 --
 -- >   , ((modMask,               xK_Return), dwmpromote)
 
--- %import XMonadContrib.DwmPromote
+-- %import XMonad.Actions.DwmPromote
 -- %keybind , ((modMask,               xK_Return), dwmpromote)
 
 dwmpromote :: X ()
diff --git a/DynamicWorkspaces.hs b/XMonad/Actions/DynamicWorkspaces.hs
index 34f57f1..6aa3fb9 100644
--- a/DynamicWorkspaces.hs
+++ b/XMonad/Actions/DynamicWorkspaces.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.DynamicWorkspaces
+-- Module      :  XMonad.Actions.DynamicWorkspaces
 -- Copyright   :  (c) David Roundy <droundy@darcs.net>
 -- License     :  BSD3-style (see LICENSE)
 --
@@ -13,7 +13,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.DynamicWorkspaces (
+module XMonad.Actions.DynamicWorkspaces (
                                          -- * Usage
                                          -- $usage
                                          addWorkspace, removeWorkspace,
@@ -28,13 +28,13 @@ import XMonad ( X, XState(..), Layout, WorkspaceId, WindowSet )
 import XMonad.Operations
 import XMonad.StackSet hiding (filter, modify, delete)
 import Graphics.X11.Xlib ( Window )
-import XMonadContrib.WorkspacePrompt
-import XMonadContrib.XPrompt ( XPConfig )
+import XMonad.Prompt.Workspace
+import XMonad.Prompt ( XPConfig )
 
 -- $usage
 -- You can use this module with the following in your Config.hs file:
 -- 
--- > import XMonadContrib.DynamicWorkspaces
+-- > import XMonad.Actions.DynamicWorkspaces
 --
 -- >   , ((modMask .|. shiftMask, xK_n), selectWorkspace defaultXPConfig layoutHook)
 -- >   , ((modMask .|. shiftMask, xK_BackSpace), removeWorkspace)
diff --git a/FindEmptyWorkspace.hs b/XMonad/Actions/FindEmptyWorkspace.hs
index 27b0de8..a0fb621 100644
--- a/FindEmptyWorkspace.hs
+++ b/XMonad/Actions/FindEmptyWorkspace.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.FindEmptyWorkspace
+-- Module      :  XMonad.Actions.FindEmptyWorkspace
 -- Copyright   :  (c) Miikka Koskinen 2007
 -- License     :  BSD3-style (see LICENSE)
 --
@@ -12,7 +12,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.FindEmptyWorkspace (
+module XMonad.Actions.FindEmptyWorkspace (
     -- * Usage
     -- $usage
     viewEmptyWorkspace, tagToEmptyWorkspace
@@ -31,7 +31,7 @@ import XMonad.Operations
 -- 
 -- To use, modify your Config.hs to:
 --
--- >   import XMonadContrib.FindEmptyWorkspace
+-- >   import XMonad.Actions.FindEmptyWorkspace
 --
 -- and add a keybinding:
 --
@@ -41,7 +41,7 @@ import XMonad.Operations
 -- Now you can jump to an empty workspace with mod-m. Mod-shift-m will
 -- tag the current window to an empty workspace and view it.
 
--- %import XMonadContrib.FindEmptyWorkspace
+-- %import XMonad.Actions.FindEmptyWorkspace
 -- %keybind , ((modMask,                xK_m    ), viewEmptyWorkspace)
 -- %keybind , ((modMask .|. shiftMask,  xK_m    ), tagToEmptyWorkspace)
 
diff --git a/FlexibleManipulate.hs b/XMonad/Actions/FlexibleManipulate.hs
index 7c96c77..b7fa25d 100644
--- a/FlexibleManipulate.hs
+++ b/XMonad/Actions/FlexibleManipulate.hs
@@ -2,7 +2,7 @@
 
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.FlexibleManipulate
+-- Module      :  XMonad.Actions.FlexibleManipulate
 -- Copyright   :  (c) Michael Sloan
 -- License     :  BSD3-style (see LICENSE)
 -- 
@@ -16,7 +16,7 @@
 
 -- Based on the FlexibleResize code by Lukas Mai (Mauke)
 
-module XMonadContrib.FlexibleManipulate (
+module XMonad.Actions.FlexibleManipulate (
 	-- * Usage
 	-- $usage
 	mouseWindow, discrete, linear, resize, position
@@ -30,7 +30,7 @@ import Graphics.X11.Xlib.Extras
 -- $usage
 -- Add this import to your Config.hs file:
 --
--- > import qualified XMonadContrib.FlexibleManipulate as Flex
+-- > import qualified XMonad.Actions.FlexibleManipulate as Flex
 --
 -- Set one of the mouse button bindings up like this:
 --
@@ -49,7 +49,7 @@ import Graphics.X11.Xlib.Extras
 -- a value between 0 and 1 indicating position, and return a value indicating
 -- the corresponding position if plain Flex.linear was used.
 
--- %import qualified XMonadContrib.FlexibleManipulate as Flex
+-- %import qualified XMonad.Actions.FlexibleManipulate as Flex
 -- %mousebind , ((modMask, button1), (\\w -> focus w >> Flex.mouseWindow Flex.linear w))
 
 discrete, linear, resize, position :: Double -> Double
diff --git a/FlexibleResize.hs b/XMonad/Actions/FlexibleResize.hs
index e6bb338..9f111f7 100644
--- a/FlexibleResize.hs
+++ b/XMonad/Actions/FlexibleResize.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.FlexibleResize
+-- Module      :  XMonad.Actions.FlexibleResize
 -- Copyright   :  (c) Lukas Mai
 -- License     :  BSD3-style (see LICENSE)
 -- 
@@ -12,10 +12,10 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.FlexibleResize (
+module XMonad.Actions.FlexibleResize (
 	-- * Usage
 	-- $usage
-	XMonadContrib.FlexibleResize.mouseResizeWindow
+	XMonad.Actions.FlexibleResize.mouseResizeWindow
 ) where
 
 import XMonad
@@ -27,12 +27,12 @@ import Foreign.C.Types
 -- $usage
 -- Put something like this in your Config.hs file:
 --
--- > import qualified XMonadContrib.FlexibleResize as Flex
+-- > import qualified XMonad.Actions.FlexibleResize as Flex
 -- > mouseBindings = M.fromList
 -- >     [ ...
 -- >     , ((modMask, button3), (\w -> focus w >> Flex.mouseResizeWindow w)) ]
 
--- %import qualified XMonadContrib.FlexibleResize as Flex
+-- %import qualified XMonad.Actions.FlexibleResize as Flex
 -- %mousebind , ((modMask, button3), (\\w -> focus w >> Flex.mouseResizeWindow w))
 
 mouseResizeWindow :: Window -> X ()
diff --git a/FloatKeys.hs b/XMonad/Actions/FloatKeys.hs
index 1f090e6..52ca90e 100644
--- a/FloatKeys.hs
+++ b/XMonad/Actions/FloatKeys.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module       : XMonadContrib.FloatKeys
+-- Module       : XMonad.Actions.FloatKeys
 -- Copyright    : (c) Karsten Schoelzel <kuser@gmx.de>
 -- License      : BSD
 --
@@ -11,7 +11,7 @@
 -- Move and resize floating windows.
 -----------------------------------------------------------------------------
 
-module XMonadContrib.FloatKeys (
+module XMonad.Actions.FloatKeys (
                 -- * Usage
                 -- $usage
                 keysMoveWindow,
@@ -25,7 +25,7 @@ import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
 
 -- $usage
--- > import XMonadContrib.FloatKeys
+-- > import XMonad.Actions.FloatKeys
 --
 -- >  , ((modMask,               xK_d     ), withFocused (keysResizeWindow (-10,-10) (1,1))) 
 -- >  , ((modMask,               xK_s     ), withFocused (keysResizeWindow (10,10) (1,1))) 
diff --git a/FocusNth.hs b/XMonad/Actions/FocusNth.hs
index 28e8e96..42336ef 100644
--- a/FocusNth.hs
+++ b/XMonad/Actions/FocusNth.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module       : XMonadContrib.FocusNth
+-- Module       : XMonad.Actions.FocusNth
 -- Copyright    : (c) Karsten Schoelzel <kuser@gmx.de>
 -- License      : BSD
 --
@@ -11,7 +11,7 @@
 -- Focus the nth window on the screen.
 -----------------------------------------------------------------------------
 
-module XMonadContrib.FocusNth (
+module XMonad.Actions.FocusNth (
                  -- * Usage
                  -- $usage
                  focusNth) where
@@ -21,13 +21,13 @@ import XMonad.Operations
 import XMonad
 
 -- $usage
--- > import XMonadContrib.FocusNth
+-- > import XMonad.Actions.FocusNth
 
 -- > -- mod4-[1..9] @@ Switch to window N
 -- > ++ [((mod4Mask, k), focusNth i)
 -- >     | (i, k) <- zip [0 .. 8] [xK_1 ..]]
 
--- %import XMonadContrib.FocusNth
+-- %import XMonad.Actions.FocusNth
 -- %keybdindextra ++
 -- %keybdindextra -- mod4-[1..9] @@ Switch to window N
 -- %keybdindextra [((mod4Mask, k), focusNth i)
diff --git a/MouseGestures.hs b/XMonad/Actions/MouseGestures.hs
index 93eea03..32d7e60 100644
--- a/MouseGestures.hs
+++ b/XMonad/Actions/MouseGestures.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.MouseGestures
+-- Module      :  XMonad.Actions.MouseGestures
 -- Copyright   :  (c) Lukas Mai
 -- License     :  BSD3-style (see LICENSE)
 -- 
@@ -12,7 +12,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.MouseGestures (
+module XMonad.Actions.MouseGestures (
     -- * Usage
     -- $usage
 	Direction(..),
@@ -34,7 +34,7 @@ import System.IO
 -- $usage
 -- In your Config.hs:
 --
--- > import XMonadContrib.MouseGestures
+-- > import XMonad.Actions.MouseGestures
 -- > ...
 -- > mouseBindings = M.fromList $
 -- >     [ ...
diff --git a/RotSlaves.hs b/XMonad/Actions/RotSlaves.hs
index b5406b0..95ef1f4 100644
--- a/RotSlaves.hs
+++ b/XMonad/Actions/RotSlaves.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module       : XMonadContrib.RotSlaves
+-- Module       : XMonad.Actions.RotSlaves
 -- Copyright    : (c) Hans Philipp Annen <haphi@gmx.net>, Mischa Dieterle <der_m@freenet.de>
 -- License      : BSD3-style (see LICENSE)
 --
@@ -11,7 +11,7 @@
 -- Rotate all windows except the master window 
 -- and keep the focus in place.
 -----------------------------------------------------------------------------
-module XMonadContrib.RotSlaves (
+module XMonad.Actions.RotSlaves (
 	-- $usag
 	rotSlaves', rotSlavesUp, rotSlavesDown,
 	rotAll', rotAllUp, rotAllDown
@@ -25,7 +25,7 @@ import XMonad
 --
 -- To use this module, import it with:
 --
--- > import XMonadContrib.RotSlaves
+-- > import XMonad.Actions.RotSlaves
 --
 -- and add a keybinding:
 --
@@ -33,9 +33,9 @@ import XMonad
 --
 --
 -- This operation will rotate all windows except the master window, while the focus
--- stays where it is. It is useful together with the TwoPane-Layout (see XMonadContrib.TwoPane).
+-- stays where it is. It is useful together with the TwoPane-Layout (see XMonad.Actions.TwoPane).
 
--- %import XMonadContrib.RotSlaves
+-- %import XMonad.Actions.RotSlaves
 -- %keybind , ((modMask .|. shiftMask, xK_Tab   ), rotSlavesUp)
 
 -- | Rotate the windows in the current stack excluding the first one
diff --git a/RotView.hs b/XMonad/Actions/RotView.hs
index 304eba2..6d4f8ea 100644
--- a/RotView.hs
+++ b/XMonad/Actions/RotView.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.RotView
+-- Module      :  XMonad.Actions.RotView
 -- Copyright   :  (c) David Roundy <droundy@darcs.net>
 -- License     :  BSD3-style (see LICENSE)
 --
@@ -12,7 +12,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.RotView (
+module XMonad.Actions.RotView (
                               -- * Usage
                               -- $usage
                               rotView
@@ -30,12 +30,12 @@ import XMonad.Operations
 -- $usage
 -- You can use this module with the following in your Config.hs file:
 --
--- > import XMonadContrib.RotView
+-- > import XMonad.Actions.RotView
 --
 -- >   , ((modMask .|. shiftMask, xK_Right), rotView True)
 -- >   , ((modMask .|. shiftMask, xK_Left), rotView False)
 
--- %import XMonadContrib.RotView
+-- %import XMonad.Actions.RotView
 -- %keybind , ((modMask .|. shiftMask, xK_Right), rotView True)
 -- %keybind , ((modMask .|. shiftMask, xK_Left), rotView False)
 
diff --git a/SimpleDate.hs b/XMonad/Actions/SimpleDate.hs
index 6712a5c..a30d78b 100644
--- a/SimpleDate.hs
+++ b/XMonad/Actions/SimpleDate.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.SimpleDate
+-- Module      :  XMonad.Actions.SimpleDate
 -- Copyright   :  (c) Don Stewart 2007
 -- License     :  BSD3-style (see LICENSE)
 -- 
@@ -13,7 +13,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.SimpleDate (
+module XMonad.Actions.SimpleDate (
                                  -- * Usage
                                  -- $usage
                                  date
@@ -24,7 +24,7 @@ import XMonad
 -- $usage
 -- To use, modify your Config.hs to:
 --
--- >     import XMonadContrib.SimpleDate
+-- >     import XMonad.Actions.SimpleDate
 --
 -- and add a keybinding:
 --
@@ -32,7 +32,7 @@ import XMonad
 --
 -- a popup date menu will now be bound to mod-d
 
--- %import XMonadContrib.SimpleDate
+-- %import XMonad.Actions.SimpleDate
 -- %keybind , ((modMask,               xK_d     ), date)
 
 date :: X ()
diff --git a/SinkAll.hs b/XMonad/Actions/SinkAll.hs
index 9ba9915..c193ad0 100644
--- a/SinkAll.hs
+++ b/XMonad/Actions/SinkAll.hs
@@ -9,7 +9,7 @@
 -- workspace back into tiling.
 -----------------------------------------------------------------------------
 
-module XMonadContrib.SinkAll (
+module XMonad.Actions.SinkAll (
     -- * Usage
     -- $usage
     sinkAll) where
@@ -21,10 +21,10 @@ import XMonad.StackSet
 import Graphics.X11.Xlib
 
 -- $usage
--- > import XMonadContrib.SinkAll
+-- > import XMonad.Actions.SinkAll
 -- > keys = [ ((modMask .|. shiftMask, xK_t), sinkAll) ]
 
--- %import XMonadContrib.SinkAll
+-- %import XMonad.Actions.SinkAll
 -- %keybind , ((modMask .|. shiftMask, xK_t), sinkAll)
 
 sinkAll :: X ()
diff --git a/Submap.hs b/XMonad/Actions/Submap.hs
index a9a2749..98d44c6 100644
--- a/Submap.hs
+++ b/XMonad/Actions/Submap.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.Submap
+-- Module      :  XMonad.Actions.Submap
 -- Copyright   :  (c) Jason Creighton <jcreigh@gmail.com>
 -- License     :  BSD3-style (see LICENSE)
 -- 
@@ -12,7 +12,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.Submap (
+module XMonad.Actions.Submap (
                              -- * Usage
                              -- $usage
                              submap
@@ -43,7 +43,7 @@ anyModifier will not work, because that is a special value passed to XGrabKey()
 and not an actual modifier.
 -}
 
--- %import XMonadContrib.Submap
+-- %import XMonad.Actions.Submap
 -- %keybind , ((modMask, xK_a), submap . M.fromList $
 -- %keybind     [ ((0, xK_n),     spawn "mpc next")
 -- %keybind     , ((0, xK_p),     spawn "mpc prev")
diff --git a/SwapWorkspaces.hs b/XMonad/Actions/SwapWorkspaces.hs
index 735426f..3f0ca35 100644
--- a/SwapWorkspaces.hs
+++ b/XMonad/Actions/SwapWorkspaces.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.SwapWorkspaces
+-- Module      :  XMonad.Actions.SwapWorkspaces
 -- Copyright   :  (c) Devin Mullins <me@twifkak.com>
 -- License     :  BSD3-style (see LICENSE)
 --
@@ -13,7 +13,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.SwapWorkspaces (
+module XMonad.Actions.SwapWorkspaces (
                                      -- * Usage
                                      -- $usage
                                      swapWithCurrent,
@@ -25,7 +25,7 @@ import XMonad.StackSet
 -- $usage
 -- Add this import to your Config.hs:
 --
--- > import XMonadContrib.SwapWorkspaces
+-- > import XMonad.Actions.SwapWorkspaces
 --
 -- Throw this in your keys definition:
 --
@@ -33,7 +33,7 @@ import XMonad.StackSet
 -- > [((modMask .|. controlMask, k), windows $ swapWithCurrent i)
 -- >     | (i, k) <- zip workspaces [xK_1 ..]]
 
--- %import XMonadContrib.SwapWorkspaces
+-- %import XMonad.Actions.SwapWorkspaces
 -- %keybindlist ++
 -- %keybindlist [((modMask .|. controlMask, k), windows $ swapWithCurrent i)
 -- %keybindlist     | (i, k) <- zip workspaces [xK_1 ..]]
diff --git a/TagWindows.hs b/XMonad/Actions/TagWindows.hs
index e11b579..938eb10 100644
--- a/TagWindows.hs
+++ b/XMonad/Actions/TagWindows.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module       : XMonadContrib.TagWindows
+-- Module       : XMonad.Actions.TagWindows
 -- Copyright    : (c) Karsten Schoelzel <kuser@gmx.de>
 -- License      : BSD
 --
@@ -11,7 +11,7 @@
 -- Functions for tagging windows and selecting them by tags.
 -----------------------------------------------------------------------------
 
-module XMonadContrib.TagWindows (
+module XMonad.Actions.TagWindows (
                  -- * Usage
                  -- $usage
                  addTag, delTag, unTag,
@@ -34,15 +34,15 @@ import XMonad.Operations (windows, withFocused)
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
 
-import XMonadContrib.XPrompt
+import XMonad.Prompt
 import XMonad hiding (workspaces)
 
 -- $usage
 -- 
 -- To use window tags add in your Config.hs:
 --
--- > import XMonadContrib.TagWindows
--- > import XMonadContrib.XPrompt    -- to use tagPrompt
+-- > import XMonad.Actions.TagWindows
+-- > import XMonad.Prompt    -- to use tagPrompt
 -- 
 -- and add keybindings like as follows:
 --
@@ -62,8 +62,8 @@ import XMonad hiding (workspaces)
 -- NOTE: Tags are saved as space seperated string and split with 'unwords' thus
 --       if you add a tag "a b" the window will have the tags "a" and "b" but not "a b".
 
--- %import XMonadContrib.TagWindows
--- %import XMonadContrib.XPrompt        -- to use tagPrompt
+-- %import XMonad.Actions.TagWindows
+-- %import XMonad.Prompt        -- to use tagPrompt
 
 -- set multiple tags for a window at once (overriding any previous tags)
 setTags :: [String] -> Window -> X ()
diff --git a/Warp.hs b/XMonad/Actions/Warp.hs
index e53b82c..bc7bacc 100644
--- a/Warp.hs
+++ b/XMonad/Actions/Warp.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.Warp
+-- Module      :  XMonad.Actions.Warp
 -- Copyright   :  (c) daniel@wagner-home.com
 -- License     :  BSD3-style (see LICENSE)
 -- 
@@ -13,7 +13,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.Warp (
+module XMonad.Actions.Warp (
                            -- * Usage
                            -- $usage
                            warpToScreen, 
@@ -44,7 +44,7 @@ my Config.hs:
 Note that warping to a particular screen may change the focus.
 -}
 
--- %import XMonadContrib.Warp
+-- %import XMonad.Actions.Warp
 -- %keybind , ((modMask,   xK_z     ), warpToWindow (1%2) (1%2)) -- @@ Move pointer to currently focused window
 -- %keybindlist ++
 -- %keybindlist -- mod-ctrl-{w,e,r} @@ Move mouse pointer to screen 1, 2, or 3
diff --git a/WindowBringer.hs b/XMonad/Actions/WindowBringer.hs
index b6020d2..bec4f0a 100644
--- a/WindowBringer.hs
+++ b/XMonad/Actions/WindowBringer.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  XMonadContrib.WindowBringer
+-- Module      :  XMonad.Actions.WindowBringer
 -- Copyright   :  Devin Mullins <me@twifkak.com>
 -- License     :  BSD-style (see LICENSE)
 --
@@ -14,7 +14,7 @@
 --
 -----------------------------------------------------------------------------
 
-module XMonadContrib.WindowBringer (
+module XMonad.Actions.WindowBringer (
                                     -- * Usage
                                     -- $usage
                                     gotoMenu, bringMenu, windowMapWith
@@ -29,21 +29,21 @@ import XMonad.Operations (windows)
 import qualified XMonad.StackSet as W
 import XMonad (X)
 import qualified XMonad as X
-import XMonadContrib.Dmenu (dmenuMap)
-import XMonadContrib.NamedWindows (getName)
+import XMonad.Util.Dmenu (dmenuMap)
+import XMonad.Util.NamedWindows (getName)
 
 -- $usage
 --
 -- Place in your Config.hs:
 --
--- > import XMonadContrib.WindowBringer
+-- > import XMonad.Actions.WindowBringer
 --
 -- and in the keys definition:
 --
 -- > , ((modMask .|. shiftMask, xK_g     ), gotoMenu)
 -- > , ((modMask .|. shiftMask, xK_b     ), bringMenu)
 
--- %import XMonadContrib.WindowBringer
+-- %import XMonad.Actions.WindowBringer
 -- %keybind , ((modMask .|. shiftMask, xK_g     ), gotoMenu)
 -- %keybind , ((modMask .|. shiftMask, xK_b     ), bringMenu)
 
diff --git a/WmiiActions.hs b/XMonad/Actions/WmiiActions.hs
index 2a82791..d98003b 100644
--- a/WmiiActions.hs
+++ b/XMonad/Actions/WmiiActions.hs
@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module       : XMonadContrib.WmiiActions
+-- Module       : XMonad.Actions.WmiiActions
 -- Copyright    : (c) Juraj Hercek <juhe_xmonad@hck.sk>
 -- License      : BSD3
 --
@@ -16,7 +16,7 @@
 -- recompile dmenu afterwards ;-).
 -----------------------------------------------------------------------------
 
-module XMonadContrib.WmiiActions (
+module XMonad.Actions.WmiiActions (
                                  -- * Usage
                                  -- $usage
                                    wmiiActions
@@ -26,8 +26,8 @@ module XMonadContrib.WmiiActions (
                                  ) where
 
 import XMonad
-import XMonadContrib.Dmenu (dmenu, dmenuXinerama)
-import XMonadContrib.Run (runProcessWithInput)
+import XMonad.Util.Dmenu (dmenu, dmenuXinerama)
+import XMonad.Util.Run (runProcessWithInput)
 
 import Control.Monad (filterM, liftM, liftM2)
 import System.Directory (getDirectoryContents, doesFileExist, getPermissions, executable)
@@ -36,7 +36,7 @@ import System.Directory (getDirectoryContents, doesFileExist, getPermissions, ex
 --
 -- You can use this module with the following in your Config.hs file:
 --
--- > import XMonadContrib.WmiiActions
+-- > import XMonad.Actions.WmiiActions
 --
 --  and add following to the list of keyboard bindings:
 --
@@ -47,7 +47,7 @@ import System.Directory (getDirectoryContents, doesFileExist, getPermissions, ex
 -- > ,((modMask, xK_a), wmiiActionsXinerama "/home/joe/.wmii-3.5/")
 --
 -- however, make sure you have also xinerama build of dmenu (for more
--- information see "XMonadContrib.Dmenu" extension).
+-- information see "XMonad.Util.Dmenu" extension).
 
 -- | The 'wmiiActions' function takes the file path as a first argument and
 -- executes dmenu with all executables found in the provided path.