Hierarchify

Main.hs

@@ -14,8 +14,8 @@
 
 module Main (main) where
 
-import EventLoop (makeMain)
+import XMonad.EventLoop (makeMain)
-import DefaultConfig (defaultConfig)
+import XMonad.DefaultConfig (defaultConfig)
 
 import Control.Exception (handle)
 import System.IO

XMonad.hs

@@ -21,7 +21,7 @@ module XMonad (
     atom_WM_STATE, atom_WM_PROTOCOLS, atom_WM_DELETE_WINDOW
   ) where
 
-import StackSet
+import XMonad.StackSet
 
 import Prelude hiding ( catch )
 import Control.Exception (catch, throw, Exception(ExitException))

XMonad/DefaultConfig.hs

@@ -1,6 +1,6 @@
 -----------------------------------------------------------------------------
 -- |
--- Module      :  Config.hs
+-- Module      :  DefaultConfig.hs
 -- Copyright   :  (c) Spencer Janssen 2007
 -- License     :  BSD3-style (see LICENSE)
 --
@@ -14,7 +14,7 @@
 --
 ------------------------------------------------------------------------
 
-module DefaultConfig (defaultConfig) where
+module XMonad.DefaultConfig (defaultConfig) where
 
 --
 -- Useful imports
@@ -22,15 +22,14 @@ module DefaultConfig (defaultConfig) where
 import Control.Monad.Reader ( asks )
 import XMonad hiding (workspaces, manageHook, numlockMask)
 import qualified XMonad (workspaces, manageHook, numlockMask)
-import Layouts
+import XMonad.Layouts
-import Operations
+import XMonad.Operations
-import qualified StackSet as W
+import qualified XMonad.StackSet as W
 import Data.Ratio
 import Data.Bits ((.|.))
 import qualified Data.Map as M
 import System.Exit
 import Graphics.X11.Xlib
-import EventLoop
 
 -- % Extension-provided imports
 
@@ -245,8 +244,8 @@ defaultConfig = XConfig { borderWidth = 1 -- Width of the window border in pixel
                         , normalBorderColor = "#dddddd" -- Border color for unfocused windows.
                         , focusedBorderColor = "#ff0000" -- Border color for focused windows.
                         , XMonad.numlockMask = numlockMask
-                        , XMonad.keys = DefaultConfig.keys
+                        , XMonad.keys = XMonad.DefaultConfig.keys
-                        , XMonad.mouseBindings = DefaultConfig.mouseBindings
+                        , XMonad.mouseBindings = XMonad.DefaultConfig.mouseBindings
                         -- | Perform an arbitrary action on each internal state change or X event.
                         -- Examples include:
                         --      * do nothing

XMonad/EventLoop.hs

@@ -13,7 +13,7 @@
 --
 -----------------------------------------------------------------------------
 
-module EventLoop (makeMain) where
+module XMonad.EventLoop (makeMain) where
 
 import Data.Bits
 import qualified Data.Map as M
@@ -29,9 +29,9 @@ import Graphics.X11.Xlib.Extras
 import Graphics.X11.Xinerama    (getScreenInfo)
 
 import XMonad
-import StackSet (new, floating, member)
+import XMonad.StackSet (new, floating, member)
-import qualified StackSet as W
+import qualified XMonad.StackSet as W
-import Operations
+import XMonad.Operations
 
 import System.IO
 

XMonad/Layouts.hs

@@ -15,14 +15,14 @@
 --
 -----------------------------------------------------------------------------
 
-module Layouts (ChangeLayout(..), Choose, (|||), Resize(..), IncMasterN(..),
+module XMonad.Layouts (ChangeLayout(..), Choose, (|||), Resize(..), IncMasterN(..),
                 Full(..), Tall(..), Mirror(..), mirrorRect, splitVertically,
                 splitHorizontally, splitHorizontallyBy, splitVerticallyBy) where
 
 import XMonad
 
 import Graphics.X11 (Rectangle(..))
-import qualified StackSet as W
+import qualified XMonad.StackSet as W
 import Control.Arrow ((***), second)
 import Control.Monad
 import Data.Maybe (fromMaybe)

XMonad/Operations.hs

@@ -16,11 +16,11 @@
 --
 -----------------------------------------------------------------------------
 
-module Operations where
+module XMonad.Operations where
 
 import XMonad
-import Layouts (Full(..))
+import XMonad.Layouts (Full(..))
-import qualified StackSet as W
+import qualified XMonad.StackSet as W
 
 import Data.Maybe
 import Data.List            (nub, (\\), find)

XMonad/StackSet.hs

@@ -11,7 +11,7 @@
 -- Portability :  portable, Haskell 98
 --
 
-module StackSet (
+module XMonad.StackSet (
         -- * Introduction
         -- $intro
         StackSet(..), Workspace(..), Screen(..), Stack(..), RationalRect(..),

tests/Properties.hs

@@ -1,8 +1,8 @@
 {-# OPTIONS -fglasgow-exts #-}
 module Properties where
 
-import StackSet hiding (filter)
+import XMonad.StackSet hiding (filter)
-import qualified StackSet as S (filter)
+import qualified XMonad.StackSet as S (filter)
 
 import Debug.Trace
 import Data.Word

xmonad.cabal

@@ -19,11 +19,11 @@ author:             Spencer Janssen
 maintainer:         sjanssen@cse.unl.edu
 build-depends:      base>=2.0, mtl, unix, X11==1.3.0
 extra-source-files: README TODO tests/loc.hs tests/Properties.hs man/xmonad.1.in
-                    Config.hs-boot util/GenerateManpage.hs man/xmonad.1 man/xmonad.html
+                    util/GenerateManpage.hs man/xmonad.1 man/xmonad.html
 
 executable:         xmonad
 main-is:            Main.hs
-other-modules:      EventLoop Layouts Operations StackSet XMonad
+other-modules:      XMonad.EventLoop XMonad.Layouts XMonad.Operations XMonad.StackSet XMonad
 ghc-options:        -funbox-strict-fields -O2 -fasm -Wall -optl-Wl,-s
 ghc-prof-options:   -prof -auto-all
 extensions:         GeneralizedNewtypeDeriving