Use hierarchical module names from the core

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
 

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:

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
 --

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

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
 

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:

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:

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)
 

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
 

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

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
 

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
 --

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
 

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 )

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)

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
 

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
 -- 

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
 

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

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

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

Grid.hs

@@ -21,7 +21,7 @@ module XMonadContrib.Grid (
 ) where
 
 import XMonad
-import StackSet
+import XMonad.StackSet
 import Graphics.X11.Xlib.Types
 
 -- $usage

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

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)

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.

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
 

MagicFocus.hs

@@ -21,7 +21,7 @@ module XMonadContrib.MagicFocus
 
 import Graphics.X11.Xlib
 import XMonad
-import StackSet
+import XMonad.StackSet
 
 -- $usage
 -- > import XMonadContrib.MagicFocus

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

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)

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 )

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

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
 

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

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

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

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
 

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

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:

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
 

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:

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:

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

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

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)

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

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

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
 

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

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
 --

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

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)

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

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
 

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 )

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:

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)
 

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