Back to app/src, since it seems they're the default convention for stack

66 files changed, 3 insertions, 370 deletions

diff --git a/src/lib/Xmobar.hs b/src/Xmobar.hs
index b4543f6..b4543f6 100644
--- a/src/lib/Xmobar.hs
+++ b/src/Xmobar.hs
diff --git a/src/lib/Xmobar/Actions.hs b/src/Xmobar/Actions.hs
index 7901845..7901845 100644
--- a/src/lib/Xmobar/Actions.hs
+++ b/src/Xmobar/Actions.hs
diff --git a/src/lib/Xmobar/Config.hs b/src/Xmobar/Config.hs
index a07af9e..a07af9e 100644
--- a/src/lib/Xmobar/Config.hs
+++ b/src/Xmobar/Config.hs
diff --git a/src/lib/Xmobar/Plugins/BufferedPipeReader.hs b/src/Xmobar/Plugins/BufferedPipeReader.hs
index 65ecea2..65ecea2 100644
--- a/src/lib/Xmobar/Plugins/BufferedPipeReader.hs
+++ b/src/Xmobar/Plugins/BufferedPipeReader.hs
diff --git a/src/lib/Xmobar/Plugins/CommandReader.hs b/src/Xmobar/Plugins/CommandReader.hs
index 69c8e0c..69c8e0c 100644
--- a/src/lib/Xmobar/Plugins/CommandReader.hs
+++ b/src/Xmobar/Plugins/CommandReader.hs
diff --git a/src/lib/Xmobar/Plugins/Date.hs b/src/Xmobar/Plugins/Date.hs
index 62a4ee7..62a4ee7 100644
--- a/src/lib/Xmobar/Plugins/Date.hs
+++ b/src/Xmobar/Plugins/Date.hs
diff --git a/src/lib/Xmobar/Plugins/DateZone.hs b/src/Xmobar/Plugins/DateZone.hs
index 7215713..7215713 100644
--- a/src/lib/Xmobar/Plugins/DateZone.hs
+++ b/src/Xmobar/Plugins/DateZone.hs
diff --git a/src/lib/Xmobar/Plugins/EWMH.hs b/src/Xmobar/Plugins/EWMH.hs
index 4a443d6..4a443d6 100644
--- a/src/lib/Xmobar/Plugins/EWMH.hs
+++ b/src/Xmobar/Plugins/EWMH.hs
diff --git a/src/lib/Xmobar/Plugins/Kbd.hs b/src/Xmobar/Plugins/Kbd.hs
index f4dad36..f4dad36 100644
--- a/src/lib/Xmobar/Plugins/Kbd.hs
+++ b/src/Xmobar/Plugins/Kbd.hs
diff --git a/src/lib/Xmobar/Plugins/Locks.hs b/src/Xmobar/Plugins/Locks.hs
index 19bce20..19bce20 100644
--- a/src/lib/Xmobar/Plugins/Locks.hs
+++ b/src/Xmobar/Plugins/Locks.hs
diff --git a/src/lib/Xmobar/Plugins/MBox.hs b/src/Xmobar/Plugins/MBox.hs
index 4bd0ebd..4bd0ebd 100644
--- a/src/lib/Xmobar/Plugins/MBox.hs
+++ b/src/Xmobar/Plugins/MBox.hs
diff --git a/src/lib/Xmobar/Plugins/Mail.hs b/src/Xmobar/Plugins/Mail.hs
index d59e70d..d59e70d 100644
--- a/src/lib/Xmobar/Plugins/Mail.hs
+++ b/src/Xmobar/Plugins/Mail.hs
diff --git a/src/lib/Xmobar/Plugins/MarqueePipeReader.hs b/src/Xmobar/Plugins/MarqueePipeReader.hs
index a48e81c..a48e81c 100644
--- a/src/lib/Xmobar/Plugins/MarqueePipeReader.hs
+++ b/src/Xmobar/Plugins/MarqueePipeReader.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors.hs b/src/Xmobar/Plugins/Monitors.hs
index fe909d8..fe909d8 100644
--- a/src/lib/Xmobar/Plugins/Monitors.hs
+++ b/src/Xmobar/Plugins/Monitors.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Alsa.hs b/src/Xmobar/Plugins/Monitors/Alsa.hs
index 21a2786..21a2786 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Alsa.hs
+++ b/src/Xmobar/Plugins/Monitors/Alsa.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Batt.hs b/src/Xmobar/Plugins/Monitors/Batt.hs
index 80f4275..80f4275 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Batt.hs
+++ b/src/Xmobar/Plugins/Monitors/Batt.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Bright.hs b/src/Xmobar/Plugins/Monitors/Bright.hs
index fe72219..fe72219 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Bright.hs
+++ b/src/Xmobar/Plugins/Monitors/Bright.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/CatInt.hs b/src/Xmobar/Plugins/Monitors/CatInt.hs
index 781eded..781eded 100644
--- a/src/lib/Xmobar/Plugins/Monitors/CatInt.hs
+++ b/src/Xmobar/Plugins/Monitors/CatInt.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Common.hs b/src/Xmobar/Plugins/Monitors/Common.hs
index f683874..f683874 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Common.hs
+++ b/src/Xmobar/Plugins/Monitors/Common.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/CoreCommon.hs b/src/Xmobar/Plugins/Monitors/CoreCommon.hs
index a84198e..a84198e 100644
--- a/src/lib/Xmobar/Plugins/Monitors/CoreCommon.hs
+++ b/src/Xmobar/Plugins/Monitors/CoreCommon.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/CoreTemp.hs b/src/Xmobar/Plugins/Monitors/CoreTemp.hs
index 48fe428..48fe428 100644
--- a/src/lib/Xmobar/Plugins/Monitors/CoreTemp.hs
+++ b/src/Xmobar/Plugins/Monitors/CoreTemp.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Cpu.hs b/src/Xmobar/Plugins/Monitors/Cpu.hs
index 6befe7d..6befe7d 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Cpu.hs
+++ b/src/Xmobar/Plugins/Monitors/Cpu.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/CpuFreq.hs b/src/Xmobar/Plugins/Monitors/CpuFreq.hs
index 1afedfa..1afedfa 100644
--- a/src/lib/Xmobar/Plugins/Monitors/CpuFreq.hs
+++ b/src/Xmobar/Plugins/Monitors/CpuFreq.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Disk.hs b/src/Xmobar/Plugins/Monitors/Disk.hs
index 3f89629..3f89629 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Disk.hs
+++ b/src/Xmobar/Plugins/Monitors/Disk.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/MPD.hs b/src/Xmobar/Plugins/Monitors/MPD.hs
index 9525254..9525254 100644
--- a/src/lib/Xmobar/Plugins/Monitors/MPD.hs
+++ b/src/Xmobar/Plugins/Monitors/MPD.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Mem.hs b/src/Xmobar/Plugins/Monitors/Mem.hs
index d69921b..d69921b 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Mem.hs
+++ b/src/Xmobar/Plugins/Monitors/Mem.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Mpris.hs b/src/Xmobar/Plugins/Monitors/Mpris.hs
index 3556649..3556649 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Mpris.hs
+++ b/src/Xmobar/Plugins/Monitors/Mpris.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/MultiCpu.hs b/src/Xmobar/Plugins/Monitors/MultiCpu.hs
index 3db3b5f..3db3b5f 100644
--- a/src/lib/Xmobar/Plugins/Monitors/MultiCpu.hs
+++ b/src/Xmobar/Plugins/Monitors/MultiCpu.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Net.hs b/src/Xmobar/Plugins/Monitors/Net.hs
index 81a5f6b..81a5f6b 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Net.hs
+++ b/src/Xmobar/Plugins/Monitors/Net.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Swap.hs b/src/Xmobar/Plugins/Monitors/Swap.hs
index fcaab84..fcaab84 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Swap.hs
+++ b/src/Xmobar/Plugins/Monitors/Swap.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Thermal.hs b/src/Xmobar/Plugins/Monitors/Thermal.hs
index 320ae17..320ae17 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Thermal.hs
+++ b/src/Xmobar/Plugins/Monitors/Thermal.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/ThermalZone.hs b/src/Xmobar/Plugins/Monitors/ThermalZone.hs
index bc46b59..bc46b59 100644
--- a/src/lib/Xmobar/Plugins/Monitors/ThermalZone.hs
+++ b/src/Xmobar/Plugins/Monitors/ThermalZone.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Top.hs b/src/Xmobar/Plugins/Monitors/Top.hs
index d6df249..d6df249 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Top.hs
+++ b/src/Xmobar/Plugins/Monitors/Top.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/UVMeter.hs b/src/Xmobar/Plugins/Monitors/UVMeter.hs
index 079177f..079177f 100644
--- a/src/lib/Xmobar/Plugins/Monitors/UVMeter.hs
+++ b/src/Xmobar/Plugins/Monitors/UVMeter.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Uptime.hs b/src/Xmobar/Plugins/Monitors/Uptime.hs
index 235fc85..235fc85 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Uptime.hs
+++ b/src/Xmobar/Plugins/Monitors/Uptime.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Volume.hs b/src/Xmobar/Plugins/Monitors/Volume.hs
index 1d3281c..1d3281c 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Volume.hs
+++ b/src/Xmobar/Plugins/Monitors/Volume.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Weather.hs b/src/Xmobar/Plugins/Monitors/Weather.hs
index cb5bf07..cb5bf07 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Weather.hs
+++ b/src/Xmobar/Plugins/Monitors/Weather.hs
diff --git a/src/lib/Xmobar/Plugins/Monitors/Wireless.hs b/src/Xmobar/Plugins/Monitors/Wireless.hs
index 545f6bc..545f6bc 100644
--- a/src/lib/Xmobar/Plugins/Monitors/Wireless.hs
+++ b/src/Xmobar/Plugins/Monitors/Wireless.hs
diff --git a/src/lib/Xmobar/Plugins/PipeReader.hs b/src/Xmobar/Plugins/PipeReader.hs
index f18b9cb..f18b9cb 100644
--- a/src/lib/Xmobar/Plugins/PipeReader.hs
+++ b/src/Xmobar/Plugins/PipeReader.hs
diff --git a/src/lib/Xmobar/Plugins/StdinReader.hs b/src/Xmobar/Plugins/StdinReader.hs
index bed7f5c..bed7f5c 100644
--- a/src/lib/Xmobar/Plugins/StdinReader.hs
+++ b/src/Xmobar/Plugins/StdinReader.hs
diff --git a/src/lib/Xmobar/Plugins/XMonadLog.hs b/src/Xmobar/Plugins/XMonadLog.hs
index a4f17bb..a4f17bb 100644
--- a/src/lib/Xmobar/Plugins/XMonadLog.hs
+++ b/src/Xmobar/Plugins/XMonadLog.hs
diff --git a/src/lib/Xmobar/Run/Commands.hs b/src/Xmobar/Run/Commands.hs
index 198edee..198edee 100644
--- a/src/lib/Xmobar/Run/Commands.hs
+++ b/src/Xmobar/Run/Commands.hs
diff --git a/src/lib/Xmobar/Run/EventLoop.hs b/src/Xmobar/Run/EventLoop.hs
index a4385d1..a4385d1 100644
--- a/src/lib/Xmobar/Run/EventLoop.hs
+++ b/src/Xmobar/Run/EventLoop.hs
diff --git a/src/lib/Xmobar/Run/Runnable.hs b/src/Xmobar/Run/Runnable.hs
index 962166e..962166e 100644
--- a/src/lib/Xmobar/Run/Runnable.hs
+++ b/src/Xmobar/Run/Runnable.hs
diff --git a/src/lib/Xmobar/Run/Runnable.hs-boot b/src/Xmobar/Run/Runnable.hs-boot
index f272d81..f272d81 100644
--- a/src/lib/Xmobar/Run/Runnable.hs-boot
+++ b/src/Xmobar/Run/Runnable.hs-boot
diff --git a/src/lib/Xmobar/Run/Template.hs b/src/Xmobar/Run/Template.hs
index 5bada89..5bada89 100644
--- a/src/lib/Xmobar/Run/Template.hs
+++ b/src/Xmobar/Run/Template.hs
diff --git a/src/lib/Xmobar/Run/Types.hs b/src/Xmobar/Run/Types.hs
index 4fb526a..4fb526a 100644
--- a/src/lib/Xmobar/Run/Types.hs
+++ b/src/Xmobar/Run/Types.hs
diff --git a/src/lib/Xmobar/System/DBus.hs b/src/Xmobar/System/DBus.hs
index 103a5a9..103a5a9 100644
--- a/src/lib/Xmobar/System/DBus.hs
+++ b/src/Xmobar/System/DBus.hs
diff --git a/src/lib/Xmobar/System/Environment.hs b/src/Xmobar/System/Environment.hs
index 86197db..86197db 100644
--- a/src/lib/Xmobar/System/Environment.hs
+++ b/src/Xmobar/System/Environment.hs
diff --git a/src/lib/Xmobar/System/Kbd.hsc b/src/Xmobar/System/Kbd.hsc
index b9e1d57..b9e1d57 100644
--- a/src/lib/Xmobar/System/Kbd.hsc
+++ b/src/Xmobar/System/Kbd.hsc
diff --git a/src/lib/Xmobar/System/Localize.hsc b/src/Xmobar/System/Localize.hsc
index eec5e3b..eec5e3b 100644
--- a/src/lib/Xmobar/System/Localize.hsc
+++ b/src/Xmobar/System/Localize.hsc
diff --git a/src/lib/Xmobar/System/Signal.hs b/src/Xmobar/System/Signal.hs
index ce39e10..ce39e10 100644
--- a/src/lib/Xmobar/System/Signal.hs
+++ b/src/Xmobar/System/Signal.hs
diff --git a/src/lib/Xmobar/System/StatFS.hsc b/src/Xmobar/System/StatFS.hsc
index 529b16a..529b16a 100644
--- a/src/lib/Xmobar/System/StatFS.hsc
+++ b/src/Xmobar/System/StatFS.hsc
diff --git a/src/lib/Xmobar/Utils.hs b/src/Xmobar/Utils.hs
index a2da606..a2da606 100644
--- a/src/lib/Xmobar/Utils.hs
+++ b/src/Xmobar/Utils.hs
diff --git a/src/lib/Xmobar/X11/Bitmap.hs b/src/Xmobar/X11/Bitmap.hs
index c0dba14..c0dba14 100644
--- a/src/lib/Xmobar/X11/Bitmap.hs
+++ b/src/Xmobar/X11/Bitmap.hs
diff --git a/src/lib/Xmobar/X11/ColorCache.hs b/src/Xmobar/X11/ColorCache.hs
index 4d22e16..4d22e16 100644
--- a/src/lib/Xmobar/X11/ColorCache.hs
+++ b/src/Xmobar/X11/ColorCache.hs
diff --git a/src/lib/Xmobar/X11/Draw.hs b/src/Xmobar/X11/Draw.hs
index d0c78a8..d0c78a8 100644
--- a/src/lib/Xmobar/X11/Draw.hs
+++ b/src/Xmobar/X11/Draw.hs
diff --git a/src/lib/Xmobar/X11/MinXft.hsc b/src/Xmobar/X11/MinXft.hsc
index e593da0..e593da0 100644
--- a/src/lib/Xmobar/X11/MinXft.hsc
+++ b/src/Xmobar/X11/MinXft.hsc
diff --git a/src/lib/Xmobar/X11/Parsers.hs b/src/Xmobar/X11/Parsers.hs
index 8c1abac..8c1abac 100644
--- a/src/lib/Xmobar/X11/Parsers.hs
+++ b/src/Xmobar/X11/Parsers.hs
diff --git a/src/lib/Xmobar/X11/Types.hs b/src/Xmobar/X11/Types.hs
index c5c7ade..c5c7ade 100644
--- a/src/lib/Xmobar/X11/Types.hs
+++ b/src/Xmobar/X11/Types.hs
diff --git a/src/lib/Xmobar/X11/Window.hs b/src/Xmobar/X11/Window.hs
index 78f4b26..78f4b26 100644
--- a/src/lib/Xmobar/X11/Window.hs
+++ b/src/Xmobar/X11/Window.hs
diff --git a/src/lib/Xmobar/X11/XPMFile.hsc b/src/Xmobar/X11/XPMFile.hsc
index 2daffac..2daffac 100644
--- a/src/lib/Xmobar/X11/XPMFile.hsc
+++ b/src/Xmobar/X11/XPMFile.hsc
diff --git a/src/lib/Xmobar/X11/XUtil.hs b/src/Xmobar/X11/XUtil.hs
index 6e9eb2b..6e9eb2b 100644
--- a/src/lib/Xmobar/X11/XUtil.hs
+++ b/src/Xmobar/X11/XUtil.hs
diff --git a/src/app/Configuration.hs b/src/app/Configuration.hs
deleted file mode 100644
index 1cf3ebf..0000000
--- a/src/app/Configuration.hs
+++ /dev/null
@@ -1,197 +0,0 @@
-{-# LANGUAGE FlexibleContexts, CPP #-}
-
-------------------------------------------------------------------------------
--- |
--- Module: Configuration
--- Copyright: (c) 2018 Jose Antonio Ortega Ruiz
--- License: BSD3-style (see LICENSE)
---
--- Maintainer: jao@gnu.org
--- Stability: unstable
--- Portability: portable
--- Created: Wed Nov 21, 2018 23:13
---
---
--- Parsing configuration files
---
-------------------------------------------------------------------------------
-
-
-module Configuration (readConfig, readDefaultConfig) where
-
-import Text.ParserCombinators.Parsec
-import Text.ParserCombinators.Parsec.Number (int)
-import Text.ParserCombinators.Parsec.Perm ((<|?>), (<$?>), permute)
-import Control.Monad.IO.Class (liftIO)
-
-import System.Environment
-import System.Posix.Files (fileExist)
-
-import qualified Xmobar.Config as C
-
-#if defined XFT || defined UTF8
-import qualified System.IO as S (readFile,hGetLine)
-#endif
-
-readFileSafe :: FilePath -> IO String
-#if defined XFT || defined UTF8
-readFileSafe = S.readFile
-#else
-readFileSafe = readFile
-#endif
-
-stripComments :: String -> String
-stripComments =
-  unlines . map (drop 5 . strip False . (replicate 5 ' '++)) . lines
-    where strip m ('-':'-':xs) = if m then "--" ++ strip m xs else ""
-          strip m ('"':xs) = '"': strip (not m) xs
-          strip m (x:xs) = x : strip m xs
-          strip _ [] = []
-
--- | Parse the config, logging a list of fields that were missing and replaced
--- by the default definition.
-parseConfig :: String -> Either ParseError (C.Config,[String])
-parseConfig = runParser parseConf fields "Config" . stripComments
-    where
-      parseConf = do
-        many space
-        sepEndSpc ["Config","{"]
-        x <- perms
-        eof
-        s <- getState
-        return (x,s)
-
-      perms = permute $ C.Config
-              <$?> pFont <|?> pFontList <|?> pWmClass <|?> pWmName
-              <|?> pBgColor <|?> pFgColor
-              <|?> pPosition <|?> pTextOffset <|?> pTextOffsets
-              <|?> pIconOffset <|?> pBorder
-              <|?> pBdColor <|?> pBdWidth <|?> pAlpha <|?> pHideOnStart
-              <|?> pAllDesktops <|?> pOverrideRedirect <|?> pPickBroadest
-              <|?> pLowerOnStart <|?> pPersistent <|?> pIconRoot
-              <|?> pCommands <|?> pSepChar <|?> pAlignSep <|?> pTemplate
-
-
-      fields    = [ "font", "additionalFonts","bgColor", "fgColor"
-                  , "wmClass", "wmName", "sepChar"
-                  , "alignSep" , "border", "borderColor" ,"template"
-                  , "position" , "textOffset", "textOffsets", "iconOffset"
-                  , "allDesktops", "overrideRedirect", "pickBroadest"
-                  , "hideOnStart", "lowerOnStart", "persistent", "iconRoot"
-                  , "alpha", "commands"
-                  ]
-
-      pFont = strField C.font "font"
-      pFontList = strListField C.additionalFonts "additionalFonts"
-      pWmClass = strField C.wmClass "wmClass"
-      pWmName = strField C.wmName "wmName"
-      pBgColor = strField C.bgColor "bgColor"
-      pFgColor = strField C.fgColor "fgColor"
-      pBdColor = strField C.borderColor "borderColor"
-      pSepChar = strField C.sepChar "sepChar"
-      pAlignSep = strField C.alignSep "alignSep"
-      pTemplate = strField C.template "template"
-
-      pTextOffset = readField C.textOffset "textOffset"
-      pTextOffsets = readIntList C.textOffsets "textOffsets"
-      pIconOffset = readField C.iconOffset "iconOffset"
-      pPosition = readField C.position "position"
-      pHideOnStart = readField C.hideOnStart "hideOnStart"
-      pLowerOnStart = readField C.lowerOnStart "lowerOnStart"
-      pPersistent = readField C.persistent "persistent"
-      pBorder = readField C.border "border"
-      pBdWidth = readField C.borderWidth "borderWidth"
-      pAllDesktops = readField C.allDesktops "allDesktops"
-      pOverrideRedirect = readField C.overrideRedirect "overrideRedirect"
-      pPickBroadest = readField C.pickBroadest "pickBroadest"
-      pIconRoot = readField C.iconRoot "iconRoot"
-      pAlpha = readField C.alpha "alpha"
-
-      pCommands = field C.commands "commands" readCommands
-
-      staticPos = do string "Static"
-                     wrapSkip (string "{")
-                     p <- many (noneOf "}")
-                     wrapSkip (string "}")
-                     string ","
-                     return ("Static {"  ++ p  ++ "}")
-      tillFieldEnd = staticPos <|> many (noneOf ",}\n\r")
-
-      commandsEnd  = wrapSkip (string "]") >> (string "}" <|> notNextRun)
-      notNextRun = do {string ","
-                      ; notFollowedBy $ wrapSkip $ string "Run"
-                      ; return ","
-                      }
-      readCommands = manyTill anyChar (try commandsEnd) >>=
-                        read' commandsErr . flip (++) "]"
-      strField e n = field e n strMulti
-
-      strMulti = scan '"'
-          where
-            scan lead = do
-                spaces
-                char lead
-                s <- manyTill anyChar (rowCont <|> unescQuote)
-                (char '"' >> return s) <|> fmap (s ++) (scan '\\')
-            rowCont    = try $ char '\\' >> string "\n"
-            unescQuote = lookAhead (noneOf "\\") >> lookAhead (string "\"")
-
-      strListField e n = field e n strList
-      strList = do
-        spaces
-        char '['
-        list <- sepBy (strMulti >>= \x -> spaces >> return x) (char ',')
-        spaces
-        char ']'
-        return list
-
-      wrapSkip   x = many space >> x >>= \r -> many space >> return r
-      sepEndSpc    = mapM_ (wrapSkip . try . string)
-      fieldEnd     = many $ space <|> oneOf ",}"
-      field  e n c = (,) (e C.defaultConfig) $
-                     updateState (filter (/= n)) >> sepEndSpc [n,"="] >>
-                     wrapSkip c >>= \r -> fieldEnd >> return r
-      readField a n = field a n $ tillFieldEnd >>= read' n
-
-      readIntList d n = field d n intList
-      intList = do
-        spaces
-        char '['
-        list <- sepBy (spaces >> int >>= \x-> spaces >> return x) (char ',')
-        spaces
-        char ']'
-        return list
-
-      read' d s = case reads s of
-                    [(x, _)] -> return x
-                    _ -> fail $ "error reading the " ++ d ++ " field: " ++ s
-
-commandsErr :: String
-commandsErr = "commands: this usually means that a command could not" ++
-              "\nbe parsed." ++
-              "\nThe error could be located at the begining of the command" ++
-              "\nwhich follows the offending one."
-
--- | Reads the configuration files or quits with an error
-readConfig :: FilePath -> String -> IO (C.Config,[String])
-readConfig f usage = do
-  file <- liftIO $ fileExist f
-  s <- liftIO $ if file then readFileSafe f else error $
-                  f ++ ": file not found!\n" ++ usage
-  either (\err -> error $ f ++
-                    ": configuration file contains errors at:\n" ++ show err)
-         return $ parseConfig s
-
--- | Read default configuration file or load the default config
-readDefaultConfig :: String -> IO (C.Config,[String])
-readDefaultConfig usage = do
-  xdgConfigFile <- C.getXdgConfigFile
-  xdgConfigFileExists <- liftIO $ fileExist xdgConfigFile
-  home <- liftIO $ getEnv "HOME"
-  let defaultConfigFile = home ++ "/.xmobarrc"
-  defaultConfigFileExists <- liftIO $ fileExist defaultConfigFile
-  if xdgConfigFileExists
-    then readConfig xdgConfigFile usage
-    else if defaultConfigFileExists
-         then readConfig defaultConfigFile usage
-         else return (C.defaultConfig,[])
diff --git a/src/app/Main.hs b/src/app/Main.hs
deleted file mode 100644
index 0760d16..0000000
--- a/src/app/Main.hs
+++ /dev/null
@@ -1,170 +0,0 @@
-{-# LANGUAGE FlexibleContexts #-}
------------------------------------------------------------------------------
--- |
--- Module      :  Xmobar.Main
--- Copyright   :  (c) Andrea Rossato
--- License     :  BSD-style (see LICENSE)
---
--- Maintainer  :  Jose A. Ortega Ruiz <jao@gnu.org>
--- Stability   :  unstable
--- Portability :  unportable
---
--- The main module of Xmobar, a text based status bar
---
------------------------------------------------------------------------------
-
-module Main (main) where
-
-import Data.List (intercalate)
-
-import Data.Version (showVersion)
-import System.Console.GetOpt
-import System.Exit
-import System.Environment (getArgs)
-import Control.Monad (unless)
-import Text.Read (readMaybe)
-
-import Xmobar (xmobar)
-import Xmobar.Config
-
-import Paths_xmobar (version)
-import Configuration (readConfig, readDefaultConfig)
-
--- $main
-
--- | The main entry point
-main :: IO ()
-main = do
-  (o,file) <- getArgs >>= getOpts
-  (c,defaultings) <- case file of
-                       [cfgfile] -> readConfig cfgfile usage
-                       _ -> readDefaultConfig usage
-  unless (null defaultings) $ putStrLn $
-    "Fields missing from config defaulted: " ++ intercalate "," defaultings
-  doOpts c o >>= xmobar
-
-data Opts = Help
-          | Version
-          | Font       String
-          | BgColor    String
-          | FgColor    String
-          | Alpha      String
-          | T
-          | B
-          | D
-          | AlignSep   String
-          | Commands   String
-          | AddCommand String
-          | SepChar    String
-          | Template   String
-          | OnScr      String
-          | IconRoot   String
-          | Position   String
-          | WmClass    String
-          | WmName     String
-       deriving Show
-
-options :: [OptDescr Opts]
-options =
-    [ Option "h?" ["help"] (NoArg Help) "This help"
-    , Option "V" ["version"] (NoArg Version) "Show version information"
-    , Option "f" ["font"] (ReqArg Font "font name") "The font name"
-    , Option "w" ["wmclass"] (ReqArg WmClass "class") "X11 WM_CLASS property"
-    , Option "n" ["wmname"] (ReqArg WmName "name") "X11 WM_NAME property"
-    , Option "B" ["bgcolor"] (ReqArg BgColor "bg color" )
-      "The background color. Default black"
-    , Option "F" ["fgcolor"] (ReqArg FgColor "fg color")
-      "The foreground color. Default grey"
-    , Option "i" ["iconroot"] (ReqArg IconRoot "path")
-      "Root directory for icon pattern paths. Default '.'"
-    , Option "A" ["alpha"] (ReqArg Alpha "alpha")
-      "The transparency: 0 is transparent, 255 is opaque. Default: 255"
-    , Option "o" ["top"] (NoArg T) "Place xmobar at the top of the screen"
-    , Option "b" ["bottom"] (NoArg B)
-      "Place xmobar at the bottom of the screen"
-    , Option "d" ["dock"] (NoArg D)
-      "Don't override redirect from WM and function as a dock"
-    , Option "a" ["alignsep"] (ReqArg AlignSep "alignsep")
-      "Separators for left, center and right text\nalignment. Default: '}{'"
-    , Option "s" ["sepchar"] (ReqArg SepChar "char")
-      ("The character used to separate commands in" ++
-       "\nthe output template. Default '%'")
-    , Option "t" ["template"] (ReqArg Template "template")
-      "The output template"
-    , Option "c" ["commands"] (ReqArg Commands "commands")
-      "The list of commands to be executed"
-    , Option "C" ["add-command"] (ReqArg AddCommand "command")
-      "Add to the list of commands to be executed"
-    , Option "x" ["screen"] (ReqArg OnScr "screen")
-      "On which X screen number to start"
-    , Option "p" ["position"] (ReqArg Position "position")
-      "Specify position of xmobar. Same syntax as in config file"
-    ]
-
-getOpts :: [String] -> IO ([Opts], [String])
-getOpts argv =
-    case getOpt Permute options argv of
-      (o,n,[])   -> return (o,n)
-      (_,_,errs) -> error (concat errs ++ usage)
-
-usage :: String
-usage = usageInfo header options ++ footer
-    where header = "Usage: xmobar [OPTION...] [FILE]\nOptions:"
-          footer = "\nMail bug reports and suggestions to " ++ mail ++ "\n"
-
-info :: String
-info = "xmobar " ++ showVersion version
-        ++ "\n (C) 2007 - 2010 Andrea Rossato "
-        ++ "\n (C) 2010 - 2018 Jose A Ortega Ruiz\n "
-        ++ mail ++ "\n" ++ license
-
-mail :: String
-mail = "<mail@jao.io>"
-
-license :: String
-license = "\nThis program is distributed in the hope that it will be useful," ++
-          "\nbut WITHOUT ANY WARRANTY; without even the implied warranty of" ++
-          "\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++
-          "\nSee the License for more details."
-
-doOpts :: Config -> [Opts] -> IO Config
-doOpts conf [] =
-  return (conf {lowerOnStart = lowerOnStart conf && overrideRedirect conf})
-doOpts conf (o:oo) =
-  case o of
-    Help -> putStr   usage >> exitSuccess
-    Version -> putStrLn info  >> exitSuccess
-    Font s -> doOpts' (conf {font = s})
-    WmClass s -> doOpts' (conf {wmClass = s})
-    WmName s -> doOpts' (conf {wmName = s})
-    BgColor s -> doOpts' (conf {bgColor = s})
-    FgColor s -> doOpts' (conf {fgColor = s})
-    Alpha n -> doOpts' (conf {alpha = read n})
-    T -> doOpts' (conf {position = Top})
-    B -> doOpts' (conf {position = Bottom})
-    D -> doOpts' (conf {overrideRedirect = False})
-    AlignSep s -> doOpts' (conf {alignSep = s})
-    SepChar s -> doOpts' (conf {sepChar = s})
-    Template s -> doOpts' (conf {template = s})
-    IconRoot s -> doOpts' (conf {iconRoot = s})
-    OnScr n -> doOpts' (conf {position = OnScreen (read n) $ position conf})
-    Commands s -> case readCom 'c' s of
-                    Right x -> doOpts' (conf {commands = x})
-                    Left e -> putStr (e ++ usage) >> exitWith (ExitFailure 1)
-    AddCommand s -> case readCom 'C' s of
-                      Right x -> doOpts' (conf {commands = commands conf ++ x})
-                      Left e -> putStr (e ++ usage) >> exitWith (ExitFailure 1)
-    Position s -> readPosition s
-  where readCom c str =
-          case readStr str of
-            [x] -> Right x
-            _  -> Left ("xmobar: cannot read list of commands " ++
-                        "specified with the -" ++ c:" option\n")
-        readStr str = [x | (x,t) <- reads str, ("","") <- lex t]
-        doOpts' opts = doOpts opts oo
-        readPosition string =
-            case readMaybe string of
-                Just x  -> doOpts' (conf { position = x })
-                Nothing -> do
-                    putStrLn "Can't parse position option, ignoring"
-                    doOpts' conf
diff --git a/xmobar.cabal b/xmobar.cabal
index aff3dcf..7f82725 100644
--- a/xmobar.cabal
+++ b/xmobar.cabal
@@ -92,7 +92,7 @@ flag with_conduit
   default: False
 
 library
-    hs-source-dirs:  src/lib
+    hs-source-dirs:  src
 
     exposed-modules: Xmobar,
                      Xmobar.Config,
@@ -249,7 +249,7 @@ library
        cpp-options: -DUVMETER
 
 executable xmobar
-    hs-source-dirs:     src/app
+    hs-source-dirs:     app
     main-is:            Main.hs
     other-modules:      Paths_xmobar, Configuration
     build-depends:      base,
@@ -277,7 +277,7 @@ executable xmobar
 
 test-suite XmobarTest
   type:           exitcode-stdio-1.0
-  hs-source-dirs: src/lib, test
+  hs-source-dirs: src, test
   main-is:        Spec.hs
   build-depends: base,
                  containers,