Use hierarchical module names from the core

darcs-hash:20071101182824-a5988-e02ade829d66f49dd6b303b7a797933251c44164.gz

57 files changed, 94 insertions, 94 deletions

diff --git a/Accordion.hs b/Accordion.hs
index af87eae..f5c24d8 100644
--- a/Accordion.hs
+++ b/Accordion.hs
@@ -20,8 +20,8 @@ module XMonadContrib.Accordion (
     Accordion(Accordion)) where
 
 import XMonad
-import Layouts
-import qualified StackSet as W
+import XMonad.Layouts
+import qualified XMonad.StackSet as W
 import Graphics.X11.Xlib
 import Data.Ratio
 
diff --git a/Circle.hs b/Circle.hs
index 53ea9c8..d0f343b 100644
--- a/Circle.hs
+++ b/Circle.hs
@@ -23,7 +23,7 @@ module XMonadContrib.Circle (
 import Data.List
 import Graphics.X11.Xlib
 import XMonad
-import StackSet (integrate, peek)
+import XMonad.StackSet (integrate, peek)
 
 -- $usage
 -- You can use this module with the following in your Config.hs file:
diff --git a/Combo.hs b/Combo.hs
index f3797a0..15c7155 100644
--- a/Combo.hs
+++ b/Combo.hs
@@ -25,10 +25,10 @@ import Control.Arrow ( first )
 import Data.List ( delete, intersect, (\\) )
 import Data.Maybe ( isJust )
 import XMonad
-import StackSet ( integrate, Stack(..) )
+import XMonad.StackSet ( integrate, Stack(..) )
 import XMonadContrib.Invisible
 import XMonadContrib.WindowNavigation ( MoveWindowToWindow(..) )
-import qualified StackSet as W ( differentiate )
+import qualified XMonad.StackSet as W ( differentiate )
 
 -- $usage
 --
diff --git a/Commands.hs b/Commands.hs
index 4c7ab54..dd97ad5 100644
--- a/Commands.hs
+++ b/Commands.hs
@@ -26,10 +26,10 @@ module XMonadContrib.Commands (
                               ) where
 
 import XMonad
-import Operations
-import StackSet hiding (workspaces)
+import XMonad.Operations
+import XMonad.StackSet hiding (workspaces)
 import XMonadContrib.Dmenu (dmenu)
-import Layouts
+import XMonad.Layouts
 
 import Control.Monad.Reader
 import qualified Data.Map as M
diff --git a/ConstrainedResize.hs b/ConstrainedResize.hs
index 6baf471..5e54861 100644
--- a/ConstrainedResize.hs
+++ b/ConstrainedResize.hs
@@ -22,7 +22,7 @@ module XMonadContrib.ConstrainedResize (
 ) where
 
 import XMonad
-import Operations
+import XMonad.Operations
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
 
diff --git a/CopyWindow.hs b/CopyWindow.hs
index e23e35b..1e825ef 100644
--- a/CopyWindow.hs
+++ b/CopyWindow.hs
@@ -23,8 +23,8 @@ import Prelude hiding ( filter )
 import Control.Monad.State ( gets )
 import qualified Data.List as L
 import XMonad
-import Operations ( windows, kill )
-import StackSet
+import XMonad.Operations ( windows, kill )
+import XMonad.StackSet
 
 -- $usage
 -- You can use this module with the following in your Config.hs file:
diff --git a/CycleWS.hs b/CycleWS.hs
index 2f57f91..931ed47 100644
--- a/CycleWS.hs
+++ b/CycleWS.hs
@@ -32,8 +32,8 @@ import Data.Ord ( comparing )
 
 import XMonad hiding (workspaces)
 import qualified XMonad (workspaces)
-import StackSet hiding (filter)
-import Operations
+import XMonad.StackSet hiding (filter)
+import XMonad.Operations
 
 -- $usage
 -- You can use this module with the following in your Config.hs file:
diff --git a/DeManage.hs b/DeManage.hs
index dff3b3b..3994541 100644
--- a/DeManage.hs
+++ b/DeManage.hs
@@ -31,9 +31,9 @@ module XMonadContrib.DeManage (
                                  demanage
                                 ) where
 
-import qualified StackSet as W
+import qualified XMonad.StackSet as W
 import XMonad
-import Operations
+import XMonad.Operations
 import Control.Monad.State
 import Graphics.X11 (Window)
 
diff --git a/Dishes.hs b/Dishes.hs
index a40ac4c..a1eae21 100644
--- a/Dishes.hs
+++ b/Dishes.hs
@@ -23,8 +23,8 @@ module XMonadContrib.Dishes (
 
 import Data.List
 import XMonad
-import Layouts
-import StackSet (integrate)
+import XMonad.Layouts
+import XMonad.StackSet (integrate)
 import Control.Monad (ap)
 import Graphics.X11.Xlib
 
diff --git a/Dmenu.hs b/Dmenu.hs
index fd68446..51cca67 100644
--- a/Dmenu.hs
+++ b/Dmenu.hs
@@ -21,7 +21,7 @@ module XMonadContrib.Dmenu (
                            ) where
 
 import XMonad
-import qualified StackSet as W
+import qualified XMonad.StackSet as W
 import qualified Data.Map as M
 import Control.Monad.State
 import XMonadContrib.Run
diff --git a/DragPane.hs b/DragPane.hs
index 7f003aa..0ae9761 100644
--- a/DragPane.hs
+++ b/DragPane.hs
@@ -34,9 +34,9 @@ import XMonad
 import Data.Bits
 import Data.Unique
 
-import Layouts
-import Operations
-import qualified StackSet as W 
+import XMonad.Layouts
+import XMonad.Operations
+import qualified XMonad.StackSet as W 
 import XMonadContrib.Invisible
 import XMonadContrib.XUtils
 
diff --git a/DwmPromote.hs b/DwmPromote.hs
index 778cf20..7e81e7b 100644
--- a/DwmPromote.hs
+++ b/DwmPromote.hs
@@ -23,8 +23,8 @@ module XMonadContrib.DwmPromote (
                                 ) where
 
 import XMonad
-import Operations (windows)
-import StackSet
+import XMonad.Operations (windows)
+import XMonad.StackSet
 
 -- $usage
 --
diff --git a/DynamicLog.hs b/DynamicLog.hs
index 97e5725..adacc0c 100644
--- a/DynamicLog.hs
+++ b/DynamicLog.hs
@@ -42,7 +42,7 @@ import Control.Monad.Reader
 import Data.Maybe ( isJust )
 import Data.List
 import Data.Ord ( comparing )
-import qualified StackSet as S
+import qualified XMonad.StackSet as S
 import Data.Monoid
 import XMonadContrib.NamedWindows
 
diff --git a/DynamicWorkspaces.hs b/DynamicWorkspaces.hs
index 6aad4c5..34f57f1 100644
--- a/DynamicWorkspaces.hs
+++ b/DynamicWorkspaces.hs
@@ -25,8 +25,8 @@ import Control.Monad.State ( gets )
 import Data.List ( sort )
 
 import XMonad ( X, XState(..), Layout, WorkspaceId, WindowSet )
-import Operations
-import StackSet hiding (filter, modify, delete)
+import XMonad.Operations
+import XMonad.StackSet hiding (filter, modify, delete)
 import Graphics.X11.Xlib ( Window )
 import XMonadContrib.WorkspacePrompt
 import XMonadContrib.XPrompt ( XPConfig )
diff --git a/Dzen.hs b/Dzen.hs
index 8d4b411..5853ace 100644
--- a/Dzen.hs
+++ b/Dzen.hs
@@ -21,7 +21,7 @@ import Control.Monad.State (gets)
 import qualified Data.Set as S
 import Graphics.X11.Types (Window)
 
-import qualified StackSet as W
+import qualified XMonad.StackSet as W
 import XMonad
 
 import XMonadContrib.NamedWindows (getName)
diff --git a/EwmhDesktops.hs b/EwmhDesktops.hs
index ee69c98..4e2d754 100644
--- a/EwmhDesktops.hs
+++ b/EwmhDesktops.hs
@@ -23,7 +23,7 @@ import Data.Maybe   (fromMaybe)
 
 import Control.Monad.Reader
 import XMonad
-import qualified StackSet as W
+import qualified XMonad.StackSet as W
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
 
diff --git a/FindEmptyWorkspace.hs b/FindEmptyWorkspace.hs
index 4cc9775..27b0de8 100644
--- a/FindEmptyWorkspace.hs
+++ b/FindEmptyWorkspace.hs
@@ -23,9 +23,9 @@ import Data.List
 import Data.Maybe ( isNothing )
 
 import XMonad
-import StackSet
+import XMonad.StackSet
 
-import Operations
+import XMonad.Operations
 
 -- $usage
 -- 
diff --git a/FlexibleManipulate.hs b/FlexibleManipulate.hs
index c85706a..7c96c77 100644
--- a/FlexibleManipulate.hs
+++ b/FlexibleManipulate.hs
@@ -23,7 +23,7 @@ module XMonadContrib.FlexibleManipulate (
 ) where
 
 import XMonad
-import Operations
+import XMonad.Operations
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
 
diff --git a/FlexibleResize.hs b/FlexibleResize.hs
index 6546258..e6bb338 100644
--- a/FlexibleResize.hs
+++ b/FlexibleResize.hs
@@ -19,7 +19,7 @@ module XMonadContrib.FlexibleResize (
 ) where
 
 import XMonad
-import Operations
+import XMonad.Operations
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
 import Foreign.C.Types
diff --git a/FloatKeys.hs b/FloatKeys.hs
index 5ea5e11..1f090e6 100644
--- a/FloatKeys.hs
+++ b/FloatKeys.hs
@@ -19,7 +19,7 @@ module XMonadContrib.FloatKeys (
                 keysResizeWindow,
                 keysAbsResizeWindow) where
 
-import Operations
+import XMonad.Operations
 import XMonad
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
diff --git a/FocusNth.hs b/FocusNth.hs
index 1d0e65e..28e8e96 100644
--- a/FocusNth.hs
+++ b/FocusNth.hs
@@ -16,8 +16,8 @@ module XMonadContrib.FocusNth (
                  -- $usage
                  focusNth) where
 
-import StackSet
-import Operations
+import XMonad.StackSet
+import XMonad.Operations
 import XMonad
 
 -- $usage
diff --git a/Grid.hs b/Grid.hs
index fdd6a97..c18f997 100644
--- a/Grid.hs
+++ b/Grid.hs
@@ -21,7 +21,7 @@ module XMonadContrib.Grid (
 ) where
 
 import XMonad
-import StackSet
+import XMonad.StackSet
 import Graphics.X11.Xlib.Types
 
 -- $usage
diff --git a/HintedTile.hs b/HintedTile.hs
index 1e701f6..c641896 100644
--- a/HintedTile.hs
+++ b/HintedTile.hs
@@ -19,8 +19,8 @@ module XMonadContrib.HintedTile (
                                  tall, wide) where
 
 import XMonad
-import Operations (Resize(..), IncMasterN(..), applySizeHints)
-import qualified StackSet as W
+import XMonad.Operations (Resize(..), IncMasterN(..), applySizeHints)
+import qualified XMonad.StackSet as W
 import {-# SOURCE #-} Config (borderWidth)
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
diff --git a/LayoutHints.hs b/LayoutHints.hs
index 705e063..8f6f110 100644
--- a/LayoutHints.hs
+++ b/LayoutHints.hs
@@ -19,7 +19,7 @@ module XMonadContrib.LayoutHints (
     layoutHints,
     LayoutHints) where
 
-import Operations ( applySizeHints, D )
+import XMonad.Operations ( applySizeHints, D )
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras ( getWMNormalHints )
 import {-#SOURCE#-} Config (borderWidth)
diff --git a/LayoutModifier.hs b/LayoutModifier.hs
index aff1900..16bdbcb 100644
--- a/LayoutModifier.hs
+++ b/LayoutModifier.hs
@@ -22,7 +22,7 @@ module XMonadContrib.LayoutModifier (
 
 import Graphics.X11.Xlib ( Rectangle )
 import XMonad
-import StackSet ( Stack )
+import XMonad.StackSet ( Stack )
 
 -- $usage
 -- Use LayoutHelpers to help write easy Layouts.
diff --git a/LayoutScreens.hs b/LayoutScreens.hs
index 5393c71..10e1fc9 100644
--- a/LayoutScreens.hs
+++ b/LayoutScreens.hs
@@ -21,8 +21,8 @@ module XMonadContrib.LayoutScreens (
 import Control.Monad.Reader ( asks )
 
 import XMonad
-import qualified StackSet as W
-import qualified Operations as O
+import qualified XMonad.StackSet as W
+import qualified XMonad.Operations as O
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
 
diff --git a/MagicFocus.hs b/MagicFocus.hs
index 5e4fb1a..91f38ee 100644
--- a/MagicFocus.hs
+++ b/MagicFocus.hs
@@ -21,7 +21,7 @@ module XMonadContrib.MagicFocus
 
 import Graphics.X11.Xlib
 import XMonad
-import StackSet
+import XMonad.StackSet
 
 -- $usage
 -- > import XMonadContrib.MagicFocus
diff --git a/Magnifier.hs b/Magnifier.hs
index 11b6aec..3997d5d 100644
--- a/Magnifier.hs
+++ b/Magnifier.hs
@@ -24,7 +24,7 @@ module XMonadContrib.Magnifier (
 
 import Graphics.X11.Xlib (Window, Rectangle(..))
 import XMonad
-import StackSet
+import XMonad.StackSet
 import XMonadContrib.LayoutHelpers
 
 -- $usage
diff --git a/ManageDocks.hs b/ManageDocks.hs
index b9f9aec..9651c5e 100644
--- a/ManageDocks.hs
+++ b/ManageDocks.hs
@@ -27,8 +27,8 @@ module XMonadContrib.ManageDocks (
 
 import Control.Monad.Reader
 import XMonad
-import Operations
-import qualified StackSet as W
+import XMonad.Operations
+import qualified XMonad.StackSet as W
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
 import Data.Word (Word32)
diff --git a/Mosaic.hs b/Mosaic.hs
index 8e15803..8defbc7 100644
--- a/Mosaic.hs
+++ b/Mosaic.hs
@@ -28,8 +28,8 @@ import System.Random ( StdGen, mkStdGen )
 import Data.Ratio
 import Graphics.X11.Xlib
 import XMonad hiding ( trace )
-import Operations ( full, Resize(Shrink, Expand) )
-import qualified StackSet as W
+import XMonad.Operations ( full, Resize(Shrink, Expand) )
+import qualified XMonad.StackSet as W
 import qualified Data.Map as M
 import Data.List ( sort )
 import Data.Typeable ( Typeable )
diff --git a/MosaicAlt.hs b/MosaicAlt.hs
index 06a4639..0129028 100644
--- a/MosaicAlt.hs
+++ b/MosaicAlt.hs
@@ -29,9 +29,9 @@ module XMonadContrib.MosaicAlt (
     ) where
 
 import XMonad
-import Layouts
+import XMonad.Layouts
 import Graphics.X11.Xlib
-import qualified StackSet as W
+import qualified XMonad.StackSet as W
 import qualified Data.Map as M
 import Data.List ( sortBy )
 import Data.Ratio
diff --git a/MouseGestures.hs b/MouseGestures.hs
index 4e1a3e4..93eea03 100644
--- a/MouseGestures.hs
+++ b/MouseGestures.hs
@@ -20,7 +20,7 @@ module XMonadContrib.MouseGestures (
 ) where
 
 import XMonad
-import Operations
+import XMonad.Operations
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
 
diff --git a/NamedWindows.hs b/NamedWindows.hs
index 790fe1a..9237255 100644
--- a/NamedWindows.hs
+++ b/NamedWindows.hs
@@ -25,7 +25,7 @@ module XMonadContrib.NamedWindows (
 import Control.Monad.Reader ( asks )
 import Control.Monad.State ( gets )
 
-import qualified StackSet as W ( peek )
+import qualified XMonad.StackSet as W ( peek )
 
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
diff --git a/NoBorders.hs b/NoBorders.hs
index ef07336..a1fdc96 100644
--- a/NoBorders.hs
+++ b/NoBorders.hs
@@ -31,7 +31,7 @@ import Graphics.X11.Xlib
 
 import XMonad
 import XMonadContrib.LayoutModifier
-import qualified StackSet as W
+import qualified XMonad.StackSet as W
 import Data.List ((\\))
 
 -- $usage
diff --git a/ResizableTile.hs b/ResizableTile.hs
index d0f45a6..c41f225 100644
--- a/ResizableTile.hs
+++ b/ResizableTile.hs
@@ -22,8 +22,8 @@ module XMonadContrib.ResizableTile (
                                    ) where
 
 import XMonad
-import Layouts (Resize(..), IncMasterN(..))
-import qualified StackSet as W
+import XMonad.Layouts (Resize(..), IncMasterN(..))
+import qualified XMonad.StackSet as W
 import Graphics.X11.Xlib
 import Control.Monad.State
 import Control.Monad
diff --git a/Roledex.hs b/Roledex.hs
index 7b61af7..66c58ba 100644
--- a/Roledex.hs
+++ b/Roledex.hs
@@ -21,8 +21,8 @@ module XMonadContrib.Roledex (
     Roledex(Roledex)) where
 
 import XMonad
-import Layouts
-import qualified StackSet as W
+import XMonad.Layouts
+import qualified XMonad.StackSet as W
 import Graphics.X11.Xlib
 import Data.Ratio
 
diff --git a/RotSlaves.hs b/RotSlaves.hs
index 91df10f..b5406b0 100644
--- a/RotSlaves.hs
+++ b/RotSlaves.hs
@@ -17,8 +17,8 @@ module XMonadContrib.RotSlaves (
 	rotAll', rotAllUp, rotAllDown
 	) where
 
-import StackSet
-import Operations
+import XMonad.StackSet
+import XMonad.Operations
 import XMonad
 
 -- $usage
diff --git a/RotView.hs b/RotView.hs
index a68f9b0..304eba2 100644
--- a/RotView.hs
+++ b/RotView.hs
@@ -24,8 +24,8 @@ import Data.Maybe ( isJust )
 import Data.Ord ( comparing )
 
 import XMonad
-import StackSet hiding (filter)
-import Operations
+import XMonad.StackSet hiding (filter)
+import XMonad.Operations
 
 -- $usage
 -- You can use this module with the following in your Config.hs file:
diff --git a/SinkAll.hs b/SinkAll.hs
index 04794cc..9ba9915 100644
--- a/SinkAll.hs
+++ b/SinkAll.hs
@@ -14,9 +14,9 @@ module XMonadContrib.SinkAll (
     -- $usage
     sinkAll) where
 
-import Operations
+import XMonad.Operations
 import XMonad
-import StackSet
+import XMonad.StackSet
 
 import Graphics.X11.Xlib
 
diff --git a/Spiral.hs b/Spiral.hs
index dc6fc81..0aba738 100644
--- a/Spiral.hs
+++ b/Spiral.hs
@@ -24,11 +24,11 @@ module XMonadContrib.Spiral (
                             ) where
 
 import Graphics.X11.Xlib
-import Operations
+import XMonad.Operations
 import Data.Ratio
 import XMonad
-import Layouts
-import StackSet ( integrate )
+import XMonad.Layouts
+import XMonad.StackSet ( integrate )
 
 -- $usage
 -- You can use this module with the following in your Config.hs file:
diff --git a/Square.hs b/Square.hs
index 42de974..46ad2e7 100644
--- a/Square.hs
+++ b/Square.hs
@@ -26,7 +26,7 @@ module XMonadContrib.Square (
 
 import XMonad
 import Graphics.X11.Xlib
-import StackSet ( integrate )
+import XMonad.StackSet ( integrate )
 
 -- $usage
 -- You can use this module with the following in your Config.hs file:
diff --git a/Submap.hs b/Submap.hs
index b0f0a68..a9a2749 100644
--- a/Submap.hs
+++ b/Submap.hs
@@ -21,7 +21,7 @@ module XMonadContrib.Submap (
 import Control.Monad.Reader
 
 import XMonad
-import Operations (cleanMask)
+import XMonad.Operations (cleanMask)
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
 import qualified Data.Map as M
diff --git a/SwapWorkspaces.hs b/SwapWorkspaces.hs
index dfcff81..735426f 100644
--- a/SwapWorkspaces.hs
+++ b/SwapWorkspaces.hs
@@ -20,7 +20,7 @@ module XMonadContrib.SwapWorkspaces (
                                      swapWorkspaces
                                     ) where
 
-import StackSet
+import XMonad.StackSet
 
 -- $usage
 -- Add this import to your Config.hs:
@@ -46,7 +46,7 @@ import StackSet
 swapWithCurrent :: Eq i => i -> StackSet i l a s sd -> StackSet i l a s sd
 swapWithCurrent t s = swapWorkspaces t (tag $ workspace $ current s) s
 
--- | Takes two workspace tags and an existing StackSet and returns a new
+-- | Takes two workspace tags and an existing XMonad.StackSet and returns a new
 --   one with the two corresponding workspaces' tags swapped.
 swapWorkspaces :: Eq i => i -> i -> StackSet i l a s sd -> StackSet i l a s sd
 swapWorkspaces t1 t2 = mapWorkspace swap
diff --git a/SwitchTrans.hs b/SwitchTrans.hs
index 413a5e2..3050924 100644
--- a/SwitchTrans.hs
+++ b/SwitchTrans.hs
@@ -76,7 +76,7 @@ module XMonadContrib.SwitchTrans (
 ) where
 
 import XMonad
-import Operations
+import XMonad.Operations
 
 import qualified Data.Map as M
 import Data.Map (Map)
diff --git a/Tabbed.hs b/Tabbed.hs
index dd84ef6..0b61cf3 100644
--- a/Tabbed.hs
+++ b/Tabbed.hs
@@ -32,8 +32,8 @@ import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
 
 import XMonad
-import Operations
-import qualified StackSet as W
+import XMonad.Operations
+import qualified XMonad.StackSet as W
 
 import XMonadContrib.NamedWindows
 import XMonadContrib.Invisible
diff --git a/TagWindows.hs b/TagWindows.hs
index 96ac209..e11b579 100644
--- a/TagWindows.hs
+++ b/TagWindows.hs
@@ -28,8 +28,8 @@ module XMonadContrib.TagWindows (
 import Data.List (nub,concat,sortBy)
 
 import Control.Monad.State
-import StackSet hiding (filter)
-import Operations (windows, withFocused)
+import XMonad.StackSet hiding (filter)
+import XMonad.Operations (windows, withFocused)
 
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
diff --git a/ThreeColumns.hs b/ThreeColumns.hs
index e466e74..9b10cc4 100644
--- a/ThreeColumns.hs
+++ b/ThreeColumns.hs
@@ -21,8 +21,8 @@ module XMonadContrib.ThreeColumns (
                              ) where
 
 import XMonad
-import qualified StackSet as W
-import Layouts ( Resize(..), IncMasterN(..), splitVertically, splitHorizontallyBy )
+import qualified XMonad.StackSet as W
+import XMonad.Layouts ( Resize(..), IncMasterN(..), splitVertically, splitHorizontallyBy )
 
 import Data.Ratio
 
diff --git a/TilePrime.hs b/TilePrime.hs
index c4e9f8c..c939d81 100644
--- a/TilePrime.hs
+++ b/TilePrime.hs
@@ -24,9 +24,9 @@ import Control.Monad (mplus)
 import Data.List (mapAccumL)
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras (getWMNormalHints)
-import Operations
+import XMonad.Operations
 import XMonad hiding (trace)
-import qualified StackSet as W
+import qualified XMonad.StackSet as W
 import {-#SOURCE#-} Config (borderWidth)
 
 -- $usage
diff --git a/TwoPane.hs b/TwoPane.hs
index c6d25cc..2dc266f 100644
--- a/TwoPane.hs
+++ b/TwoPane.hs
@@ -23,8 +23,8 @@ module XMonadContrib.TwoPane (
                              ) where
 
 import XMonad
-import Layouts ( Resize(..), splitHorizontallyBy )
-import StackSet ( focus, up, down)
+import XMonad.Layouts ( Resize(..), splitHorizontallyBy )
+import XMonad.StackSet ( focus, up, down)
 
 -- $usage
 --
diff --git a/Warp.hs b/Warp.hs
index adf679e..e53b82c 100644
--- a/Warp.hs
+++ b/Warp.hs
@@ -25,9 +25,9 @@ import Data.List
 import Control.Monad.RWS
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
-import Operations
+import XMonad.Operations
 import XMonad
-import StackSet as W
+import XMonad.StackSet as W
 
 {- $usage
 This can be used to make a keybinding that warps the pointer to a given
diff --git a/WindowBringer.hs b/WindowBringer.hs
index 087001c..b6020d2 100644
--- a/WindowBringer.hs
+++ b/WindowBringer.hs
@@ -25,8 +25,8 @@ import Data.Char (toLower)
 import qualified Data.Map as M
 import Graphics.X11.Xlib (Window())
 
-import Operations (windows)
-import qualified StackSet as W
+import XMonad.Operations (windows)
+import qualified XMonad.StackSet as W
 import XMonad (X)
 import qualified XMonad as X
 import XMonadContrib.Dmenu (dmenuMap)
diff --git a/WindowNavigation.hs b/WindowNavigation.hs
index 27303b4..05c3bb8 100644
--- a/WindowNavigation.hs
+++ b/WindowNavigation.hs
@@ -30,8 +30,8 @@ import Control.Monad.Reader ( ask )
 import Control.Monad.State ( gets )
 import Data.List ( nub, sortBy, (\\) )
 import XMonad
-import qualified StackSet as W
-import Operations ( windows, focus )
+import qualified XMonad.StackSet as W
+import XMonad.Operations ( windows, focus )
 import XMonadContrib.LayoutModifier
 import XMonadContrib.Invisible
 import XMonadContrib.XUtils
diff --git a/WindowPrompt.hs b/WindowPrompt.hs
index 93f79ae..5311f15 100644
--- a/WindowPrompt.hs
+++ b/WindowPrompt.hs
@@ -25,9 +25,9 @@ module XMonadContrib.WindowPrompt
 import qualified Data.Map as M
 import Data.List
 
-import qualified StackSet as W
+import qualified XMonad.StackSet as W
 import XMonad
-import Operations (windows)
+import XMonad.Operations (windows)
 import XMonadContrib.XPrompt
 import XMonadContrib.WindowBringer
 
diff --git a/WorkspaceDir.hs b/WorkspaceDir.hs
index 869e1d4..a967741 100644
--- a/WorkspaceDir.hs
+++ b/WorkspaceDir.hs
@@ -32,7 +32,7 @@ module XMonadContrib.WorkspaceDir (
 import System.Directory ( setCurrentDirectory )
 
 import XMonad
-import Operations ( sendMessage )
+import XMonad.Operations ( sendMessage )
 import XMonadContrib.Run ( runProcessWithInput )
 import XMonadContrib.XPrompt ( XPConfig )
 import XMonadContrib.DirectoryPrompt ( directoryPrompt )
diff --git a/WorkspacePrompt.hs b/WorkspacePrompt.hs
index bdb4805..1087cf0 100644
--- a/WorkspacePrompt.hs
+++ b/WorkspacePrompt.hs
@@ -22,7 +22,7 @@ import Control.Monad.State ( gets )
 import Data.List ( sort )
 import XMonad hiding ( workspaces )
 import XMonadContrib.XPrompt
-import StackSet ( workspaces, tag )
+import XMonad.StackSet ( workspaces, tag )
 
 -- $usage
 -- You can use this module with the following in your Config.hs file:
diff --git a/XPrompt.hs b/XPrompt.hs
index fb6e0fe..8df0d2f 100644
--- a/XPrompt.hs
+++ b/XPrompt.hs
@@ -44,8 +44,8 @@ module XMonadContrib.XPrompt (
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Extras
 import XMonad  hiding (config, io)
-import Operations (initColor)
-import qualified StackSet as W
+import XMonad.Operations (initColor)
+import qualified XMonad.StackSet as W
 import XMonadContrib.XUtils
 import XMonadContrib.XSelection (getSelection)
 
diff --git a/XUtils.hs b/XUtils.hs
index f828529..15c89b2 100644
--- a/XUtils.hs
+++ b/XUtils.hs
@@ -36,7 +36,7 @@ import Graphics.X11.Xlib.Extras
 import Control.Monad.Reader
 import Data.Maybe
 import XMonad
-import Operations
+import XMonad.Operations
 
 -- $usage
 -- See Tabbed or DragPane for usage examples