From 07ee2a19cd28ec966cff96120f3e82c955dbf7a0 Mon Sep 17 00:00:00 2001
From: Don Stewart <dons@cse.unsw.edu.au>
Date: Wed, 7 Mar 2007 02:23:32 +0000
Subject: [PATCH] Flatten module hierarchy

---
 Thunk/Wm.hs => Wm.hs                   | 2 +-
 Thunk/XlibExtras.hsc => XlibExtras.hsc | 2 +-
 thunk.cabal                            | 2 +-
 thunk.hs                               | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename Thunk/Wm.hs => Wm.hs (98%)
 rename Thunk/XlibExtras.hsc => XlibExtras.hsc (99%)

diff --git a/Thunk/Wm.hs b/Wm.hs
similarity index 98%
rename from Thunk/Wm.hs
rename to Wm.hs
index 69b1de1..542f66f 100644
--- a/Thunk/Wm.hs
+++ b/Wm.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -fglasgow-exts #-}
 
-module Thunk.Wm where
+module Wm where
 
 import Data.Sequence
 import Control.Monad.State
diff --git a/Thunk/XlibExtras.hsc b/XlibExtras.hsc
similarity index 99%
rename from Thunk/XlibExtras.hsc
rename to XlibExtras.hsc
index 4be16b3..103a149 100644
--- a/Thunk/XlibExtras.hsc
+++ b/XlibExtras.hsc
@@ -1,4 +1,4 @@
-module Thunk.XlibExtras where
+module XlibExtras where
 
 import Graphics.X11.Xlib
 import Graphics.X11.Xlib.Types
diff --git a/thunk.cabal b/thunk.cabal
index 42e3d4e..8d9b3b3 100644
--- a/thunk.cabal
+++ b/thunk.cabal
@@ -12,7 +12,7 @@ build-depends:  base >= 2.0, X11, unix, mtl
 executable:     thunk
 main-is:        thunk.hs
 extensions:     ForeignFunctionInterface
-other-modules:  Thunk.XlibExtras
+other-modules:  XlibExtras
 ghc-options:    -O
 include-dirs:   include
 -- OpenBSD:
diff --git a/thunk.hs b/thunk.hs
index 9b63116..3a8f92b 100644
--- a/thunk.hs
+++ b/thunk.hs
@@ -10,8 +10,9 @@ import System.IO
 import Graphics.X11.Xlib
 import System.Process (runCommand)
 import System.Exit
-import Thunk.Wm
-import Thunk.XlibExtras
+
+import Wm
+import XlibExtras
 
 handler :: Event -> Wm ()
 handler (MapRequestEvent {window = w}) = manage w